Derive the SILDebugScope for a variable declaration from its owning ASTScope. #65783
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
Contributor
Author
|
@swift-ci test |
adrian-prantl
force-pushed
the
108940570-5.9
branch
from
8ae7d5e to
a3bf1f8
Compare
Contributor
Author
|
@swift-ci test |
Contributor
Author
|
@swift-ci test |
1 similar comment
Contributor
Author
|
@swift-ci test |
adrian-prantl
force-pushed
the
108940570-5.9
branch
from
6945902 to
b3052f4
Compare
adrian-prantl
changed the title
Contributor
Author
|
@swift-ci test |
Contributor
Author
|
test with swiftlang/llvm-project#6827 |
adrian-prantl
force-pushed
the
108940570-5.9
branch
from
b3052f4 to
8af6917
Compare
Contributor
Author
|
test with swiftlang/llvm-project#6827 |
2 similar comments
Contributor
Author
|
test with swiftlang/llvm-project#6827 |
Contributor
Author
|
test with swiftlang/llvm-project#6827 |
slavapestov
approved these changes
May 10, 2023
lib/SILGen/SILGenFunction.cpp
Outdated
Contributor
There was a problem hiding this comment.
Should this be a multi-map in case the VarDecl appears in more than one scope?
lib/SILGen/SILGenFunction.cpp
Outdated
Contributor
There was a problem hiding this comment.
Maybe assert here that we didn't have a duplicate?
Contributor
Author
There was a problem hiding this comment.
Done. (And fixed a few missed caching opportunities along the way).
…STScope. The previous code made the assumption that the ASTScope for a variable declaration should be the one of the declaration's source location. That is not necessarily the case, in some cases it should be an ancestor scope. This patch introduces a map from ValueDecl -> ASTScope that is derived from querying each ASTScope for its locals, which matches also what happens in name lookup. This patch also fixes the nesting of SILDebugScopes created for guard statement bodies, which are incorrectly nested in the ASTScope hierarchy. rdar://108940570
Contributor
Author
|
test with swiftlang/llvm-project#6827 |
adrian-prantl
force-pushed
the
108940570-5.9
branch
from
8af6917 to
07b60f1
Compare
Contributor
Author
|
(pushed to the wrong branch previously) |
Contributor
Author
|
test with swiftlang/llvm-project#6827 |
fredriss
approved these changes
May 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
rdar://108940570