[6.0] Consistently mark borrowing and consuming parameters for move-only checking when captured.
#73395
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
…y checking when captured. When a `borrowing` or `consuming` parameter is captured by a closure, we emit references to the binding within the closure as if it is non-implicitly copyable, but we didn't mark the bindings inside the closure for move-only checking to ensure the uses were correct, so improper consumes would go undiagnosed and lead to assertion failures, compiler crashes, and/or miscompiles. Fixes rdar://127382105
|
@swift-ci Please test |
tbkka
approved these changes
May 2, 2024
kavon
approved these changes
May 10, 2024
Comment on lines
-1992
to
+1994
| classUseMoveOnlyWithoutEscaping(x2) | ||
| classConsume(x2) | ||
| print(x2) | ||
| classUseMoveOnlyWithoutEscaping(copy x2) | ||
| classConsume(copy x2) | ||
| print(copy x2) |
kavon
reviewed
Aug 5, 2024
| @@ -645,7 +646,7 @@ struct LoadableSelfTest { | |||
| consuming func testCallEscapingClosure() { | |||
| var f: () -> () = {} | |||
| f = { | |||
| let _ = self | |||
| let _ = copy self | |||
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.
Explanation: Fixes a miscompile when a
borrowingorconsumingparameter is captured by a closure and incorrectly consumed or modified in the closure body, by diagnosing the error instead of letting it slip by.Scope: Fixes a miscompile
Issue: rdar://127382105
Original PR: #73380
Risk: Medium-low. This may cause existing code to be rejected, but the existing code would be getting miscompiled with previous compilers.
Testing: Swift CI, test case from bug report
Reviewer: @kavon