[6.2] Sema: Don't expand macros when binding extensions #82132
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
|
@swift-ci Please test |
slavapestov
force-pushed
the
bind-extensions-macro-6.2
branch
from
ece05c2 to
490fd98
Compare
Macro expansion can call typeCheckExpr(), which performs qualified lookups. So if we expand macros while binding extensions, these qualified lookups can fail because they cannot find members of extensions that have not been bound yet. To fix this, try binding extensions without performing macro expansion first. If any extensions remain at the end, we fall back to the old behavior, and try to bind them again, this time performing macro expansion. Fixes rdar://149798059.
slavapestov
force-pushed
the
bind-extensions-macro-6.2
branch
from
490fd98 to
a10cc92
Compare
|
@swift-ci Please test |
|
@swift-ci Please test source compatibility |
bnbarham
approved these changes
Jun 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
6.2 cherry-pick of #82129.
Description: Extension binding could trigger macro expansion, which could perform name lookups, which would fail if not all extensions have been bound yet. In the radar, this manifested as intermittent type checking failures that depended on source file order. Fix this by first attempting extension binding without macro expansion, and then finally doing a second pass with macro expansion to get anything that truly requires it.
Origination: This was always broken.
Risk: Low.
Tested: Added a test case that fails with an expression checker diagnostic previously.
Radar: Fixes rdar://149798059.
Reviewed by: @rjmccall