[5.9][Macros] Requestify MacroExpansionExpr expansion #65480
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NullterminatedStringRef is meant to be safe for reading 'data()' as a valid C-string. rdar://108215490 (cherry picked from commit 43eabf1)
Saves one memory copy. No need to create a temporary NullTerminatedStringRef. (cherry picked from commit a0eb32e)
The request returns the expanded buffer ID even if it failed to typecheck the expanded buffer. This makes refactoring 'Expand Macro' work regardless of the typechecking results. rdar://108530760 (cherry picked from commit 35db928)
|
@swift-ci Please test |
|
@swift-ci Please test |
|
@swift-ci Please test macOS |
DougGregor
approved these changes
May 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick #65453, #65519 (and depending #65263) into
release/5.9Explanation: Previously, macro expression expansion results used to be stored in the AST only if the expanded text succeeds to typecheck. Because of that, "Expand Macro" refactoring did't work when the macro expands to an erroneous source code. By requestifying the expansion and make it return the expanded buffer ID (as the same as
MacroExpansionDecl), expanded buffer ID is cached in the request evaluator, so that the refactoring works regardless.Also this includes a workaround not to expand macros inside macro arguments position that can cause extraneous, potentially harmful macro expansions and diagnostics
Scope: Macro expression expansion
Risk: Low
Testing: Added a refactoring test case
Issue: rdar://108530760, rdar://108622244
Reviewer: Alex Hoppen (@ahoppen), Doug Gregor (@DougGregor), Ben Barham (@bnbarham)