Skip to content

Conversation

@adrian-prantl
Copy link
Contributor

rdar://108940570

See #65783.

@adrian-prantl
Copy link
Contributor Author

@swift-ci test

2 similar comments
@adrian-prantl
Copy link
Contributor Author

@swift-ci test

@adrian-prantl
Copy link
Contributor Author

@swift-ci test

@adrian-prantl
Copy link
Contributor Author

@swift-ci test windows

@adrian-prantl
Copy link
Contributor Author

@swift-ci test

@adrian-prantl adrian-prantl changed the title Don't ignore ConditionalClauseInitializerScopes in the debug info. Derive the SILDebugScope for a variable declaration from its owning ASTScope. May 9, 2023
@adrian-prantl
Copy link
Contributor Author

test with swiftlang/llvm-project#6828
@swift-ci test

1 similar comment
@adrian-prantl
Copy link
Contributor Author

test with swiftlang/llvm-project#6828
@swift-ci test

@adrian-prantl
Copy link
Contributor Author

test with swiftlang/llvm-project#6828
@swift-ci test

@xedin xedin removed their request for review May 10, 2023 17:00
This reverts commit be845f1.
…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
@adrian-prantl
Copy link
Contributor Author

test with swiftlang/llvm-project#6828
@swift-ci smoke test

1 similar comment
@adrian-prantl
Copy link
Contributor Author

test with swiftlang/llvm-project#6828
@swift-ci smoke test

@adrian-prantl adrian-prantl merged commit 3e5347c into swiftlang:main May 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant