Fixes crash instrumenting generic func body nested in another func #78564
Conversation
This file contains 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
chrismiles
added
the
playground transform
|
@swift-ci Please smoke test |
chrismiles
changed the title
chrismiles
requested review from
hborla,
slavapestov and
xedin
as code owners
chrismiles
requested review from
abertelrud,
dbukowski,
xedin,
slavapestov and
hborla
and removed request for
xedin,
slavapestov and
hborla
abertelrud
approved these changes
Jan 13, 2025
xedin
reviewed
Jan 14, 2025
lib/Sema/InstrumenterSupport.cpp
Outdated
|
|
||
| BraceStmt *InstrumenterBase::transformBraceStmtWithLocalDeclContext( | ||
| BraceStmt *BS, DeclContext *localDC, const ParameterList *PL, | ||
| bool TopLevel) { |
There was a problem hiding this comment.
Instead of doing this you can use RAII llvm::SaveAndRestore in a few spots were you need it.
There was a problem hiding this comment.
Oh cool, that looks simpler, thanks! Will take a look.
There was a problem hiding this comment.
Updated to use llvm::SaveAndRestore, which simplified the changes. Thanks!
… func. The crash was caused by attempting to add logging expressions that capture generic variables while using the outer func decl context that was not the generic decl context of the inner (generic) func. The fix "pushes" the current func decl context while instrumenting the body. Rather than always using the top-level func decl context for all nested func bodies.
chrismiles
force-pushed
the
eng/chrismiles/playground-transform-crash-parsing-nested-generic-func
branch
from
4629e85 to
f2846ce
Compare
|
@swift-ci Please smoke test |
xedin
approved these changes
Jan 14, 2025
abertelrud
approved these changes
Jan 14, 2025
|
@swift-ci Please smoke test |
chrismiles
deleted the
eng/chrismiles/playground-transform-crash-parsing-nested-generic-func
branch
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 crash was caused by attempting to add logging expressions that capture generic variables while using the outer func decl context that was not the generic decl context of the inner (generic) func.
The fix "pushes" the current func decl context while instrumenting the body. Rather than always using the top-level func decl context for all nested func bodies.
rdar://127009854
rdar://127009134