[Parse] Fix nested ifConfig compiler checks #74415
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
kabiroberai
requested review from
ahoppen,
bnbarham,
CodaFi,
DougGregor,
hamishknight and
rintaro
as code owners
|
I'm unsure if this fix needs to be ported to SwiftSyntax as well — I couldn't find the "skip parsing unmatched compiler checks" logic there. If it exists, could someone please point me to it? |
kabiroberai
changed the title
|
The change looks good to me. Thanks! @kabiroberai Could you squash the change and add relevant commit message? Or I if you write it here, I can squash and add the comment when merging. |
|
@rintaro feel free to use the issue title: "[Parse] Fix nested ifConfig compiler checks". Thanks! |
|
@swift-ci Please smoke test |
|
OK, but I hope to put more explanation in the comment. |
rintaro
approved these changes
Jun 15, 2024
meg-gupta
pushed a commit
to meg-gupta/swift
that referenced
this pull request
Jun 20, 2024
The parser is supposed to avoid looking inside unmatched `#if` compiler (et al) blocks. This usually means that the following code builds fine #if compiler(>=100) foo bar #endif however, a logical bug meant that if the check was nested inside an already-inactive `#if` block, it would not adhere to this evaluation-skipping behavior #if false #if compiler(>=100) foo bar // error! #endif #endif This PR fixes this specific case.
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 parser is supposed to avoid looking inside unmatched
#if compiler(et al) blocks. This usually means that the following code builds finehowever, a logical bug meant that if the check was nested inside an already-inactive
#ifblock, it would not adhere to this evaluation-skipping behaviorThis PR fixes this specific case.