codegen: manually restore ct->scope
when no exception handler is emitted
#56612
+24
−5
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.
This fixes a bug introduced by #55907, which was neglecting that it's possible for
EnterNode
to have nocatch
destination and still have a scope.This can especially happen if the compiler has decided that the body is
nothrow
and chooses to optimize away thecatch
destination, but also #55907 intended to make the scope-only form of:enter
legal (and not need an exception handler) even if the body is notnothrow
.This fixes all that up to restore the scope correctly on the happy path.
Needs tests - will add those soon