[Macros] Requestify MacroExpansionExpr expansion #65453
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
rintaro
requested review from
ahoppen,
bnbarham,
hborla,
xedin and
slavapestov
as code owners
|
@swift-ci Please smoke test |
rintaro
force-pushed
the
macros-expandexpr-request-rdar108530760
branch
from
73a82e6 to
c9fb369
Compare
|
@swift-ci Please smoke test |
bnbarham
reviewed
Apr 27, 2023
lib/Sema/TypeCheckMacros.cpp
Outdated
| ExpandMacroExpansionExprRequest::evaluate(Evaluator &evaluator, | ||
| MacroExpansionExpr *mee) const { | ||
| assert(mee->getMacroRef() && "MacroRef should be set before expansion"); | ||
| return expandMacroExpr(mee); |
There was a problem hiding this comment.
Can we remove expandMacroExpr and move its implementation into here? All callers should be using the request right?
There was a problem hiding this comment.
Right, but in this PR, I'd like to follow the scheme of ExpandMacroExpansionDeclRequest/expandFreestandingMacro().
| @@ -265,3 +269,6 @@ macro anonymousTypes(_: () -> String) = #externalMacro(module: "MacroDefinition" | |||
| // RUN: %sourcekitd-test -req=format -line=23 -length=1 %s | %FileCheck -check-prefix=FORMATTED %s | |||
| // FORMATTED: " var x: Int" | |||
|
|
|||
| //##-- Expansion on "fails to typecheck" macro expression | |||
| // RUN: %sourcekitd-test -req=refactoring.expand.macro -pos=61:2 %s -- ${COMPILER_ARGS[@]} | %FileCheck -check-prefix=ERRNEOUS_EXPAND %s | |||
rintaro
force-pushed
the
macros-expandexpr-request-rdar108530760
branch
from
c9fb369 to
f6bdd26
Compare
|
@swift-ci Please smoke test |
rintaro
force-pushed
the
macros-expandexpr-request-rdar108530760
branch
from
f6bdd26 to
ec07e83
Compare
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
rintaro
force-pushed
the
macros-expandexpr-request-rdar108530760
branch
from
ec07e83 to
35db928
Compare
|
@swift-ci Please smoke test |
ahoppen
approved these changes
Apr 28, 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.
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