[5.6] [ShrinkBorrowScope] Fixed assert. #40739
Merged
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.
Previously, it was asserted that hoisting over a terminator succeeded (because it is previously checked that it can be done). That was erroneously done by putting the call to hoist within an invocation of the assert macro. The result was that in release builds, the call was not made. Here, that is fixed by just calling the hoist function and, in debug builds, asserting its return.
rdar://86809882