[Macros] Create type refinement context for MacroExpansionDecl #65959
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
|
@swift-ci Please smoke test |
DougGregor
approved these changes
May 16, 2023
lib/AST/TypeRefinementContext.cpp
Outdated
| @@ -53,6 +53,13 @@ TypeRefinementContext::createRoot(SourceFile *SF, | |||
| if (auto parentExpansion = SF->getMacroExpansion()) { | |||
| if (auto parentTRC = | |||
| SF->getEnclosingSourceFile()->getTypeRefinementContext()) { | |||
| // FIXME: Skip `MacroExpansionDecl` context? | |||
There was a problem hiding this comment.
I think you don't need this.
rintaro
commented
May 16, 2023
| @@ -1482,7 +1482,7 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*, | |||
|
|
|||
| bool shouldSkip(Decl *D) { | |||
| if (!Walker.shouldWalkMacroArgumentsAndExpansion().second && | |||
| D->isInMacroExpansionInContext()) | |||
| D->isInMacroExpansionInContext() && !Walker.Parent.isNull()) | |||
There was a problem hiding this comment.
TypeRefinementContextBuilder doesn't walk into expansions, but It does decl->walk(builder) on the top level decls of the synthesized buffer. In such cases, I think the caller explicitly want to walk to it regardless of the macro walk mode.
rintaro
commented
May 16, 2023
Comment on lines
61
to
69
| public struct FuncWithClosureMacro: DeclarationMacro { | ||
| public static func expansion( | ||
| of node: some FreestandingMacroExpansionSyntax, | ||
| in context: some MacroExpansionContext | ||
| ) throws -> [DeclSyntax] { | ||
|
|
||
| return ["func LocalFunc() {}", "var LocalVar: Int { 1 }"] | ||
| } | ||
| } |
There was a problem hiding this comment.
Unrelated. Will remove this
Comment on lines
+139
to
+129
| @available(macOS 99, *) | ||
| #funcFromClosureMacro(APIFrom99()) { |
There was a problem hiding this comment.
Add test case without this attribute. to check if it's diagnosed properly
rintaro
force-pushed
the
macros-typerefinement-context
branch
from
2d81379 to
d49acf9
Compare
rintaro
force-pushed
the
macros-typerefinement-context
branch
from
d49acf9 to
7c2a73e
Compare
rintaro
requested review from
tshortli,
hborla,
slavapestov and
xedin
as code owners
|
@swift-ci Please smoke test |
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.
rdar://107386648