[6.0] [Macros] Put the insertion location for freestanding macros at the beginning #74927
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
…ginning When building the ASTScope tree, we set the insertion location for the macro expansion just before the end of the macro use. This is the right approach for attached macros, because we need to put the entities after the macro. However, for freestanding macros, which can have trailing closures, this location is a problem, because the scope for the macro expansion ends up inside the scope for the trailing closure. Use the start location of the freestanding macro instead. Fixes rdar://130923190.
|
@swift-ci please test |
bnbarham
approved these changes
Jul 3, 2024
|
@swift-ci please 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.
Explanation: Fixes an ASTScope-construction problem that resulted in incorrect resolution of catch nodes within freestanding macro expansions that involve trailing closures. In the issue, it manifest as an incorrect diagnostic about a thrown error type mismatch, but it could manifest in a number of other bugs with freestanding macro expansions.
Scope: Affects only freestanding macro expansions.
Risk: Low
Testing: Added a new test case
Issue: rdar://130923190
Main branch PR: #74925