[Macros] Always visit macro-produced decls as auxiliary decls #64071
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 test |
DougGregor
approved these changes
Mar 3, 2023
rxwei
force-pushed
the
macro-aux-decl
branch
2 times, most recently
from
cb83b40 to
1f1188c
Compare
rxwei
requested review from
ahoppen,
bnbarham,
CodaFi,
rintaro and
AnthonyLatsis
as code owners
rxwei
force-pushed
the
macro-aux-decl
branch
3 times, most recently
from
96e11df to
cb079cd
Compare
Always use `Decl::visitAuxiliaryDecls` to visit decls produced by macros, including peer macros and declaration macros. Use name-driven expansion for peer macros. Remove `MacroExpansionDecl::getRewritten()`. Also make `ExpandMacroExpansionDeclRequest` cache the buffer ID (similar to other macros) instead of an array of decls.
|
@swift-ci please smoke test |
rxwei
commented
Mar 5, 2023
| // RUN: %target-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath | ||
| // RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir -disable-availability-checking | ||
| // RUN: %target-swift-frontend -swift-version 5 -typecheck -load-plugin-library %t/%target-library-name(MacroDefinition) -I %swift-host-lib-dir %s -disable-availability-checking -dump-macro-expansions > %t/expansions-dump.txt 2>&1 | ||
| // RUN: %target-build-swift -swift-version 5 -I %swift-host-lib-dir -L %swift-host-lib-dir -emit-library -o %t/%target-library-name(MacroDefinition) -parse-as-library -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath |
There was a problem hiding this comment.
Note: Needed to add -parse-as-library to use @main.
| } | ||
| // Expand macros based on the name. | ||
| if (introducesArbitraryNames || allIntroducedNames.contains(name)) | ||
| member->visitAuxiliaryDecls([&](Decl *decl) { |
There was a problem hiding this comment.
Note: Since visitAuxiliaryDecls already expands all attached peer macros, I'm unconditionally adding all macro expansions to the lookup table without checking whether the expansion is from the macro that declared the name. A future improvement could be specifying which CustomAttr to expand as an argument to visitAuxiliaryDecls.
|
@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.
Always use
Decl::visitAuxiliaryDeclsto visit decls produced by macros, including peer macros and declaration macros. Use name-driven expansion for peer macros. RemoveMacroExpansionDecl::getRewritten().Also make
ExpandMacroExpansionDeclRequestcache the buffer ID (similar to other macros) instead of an array of decls.