[Exclusivity] fix diagnostics for conditional noescape closures. #18234
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
|
@shajrawi please review. |
|
@swift-ci test. |
|
@swift-ci test source compatibility. |
|
@swift-ci test. |
|
@swift-ci test source compatibility. |
|
Build failed |
|
Build failed |
|
@swift-ci test. |
|
@swift-ci test source compatibility. |
|
Build failed |
|
Build failed |
|
@shajrawi can I get a review? |
shajrawi
approved these changes
Jul 30, 2018
| return cast<SILPHIArgument>(getFalseBB()->getArgument( | ||
| operIdx - getFalseOperands().front().getOperandNumber())); | ||
| } | ||
| return nullptr; |
There was a problem hiding this comment.
In the doc comment:
/// Returns nullptr for an operand with no block argument
/// (i.e the branch condition).
There was a problem hiding this comment.
I missed it too. Thanks.
Allows a SIL pass to follow a def-use chain through phis. Other terminators can also propagate values through block arguments, but they always need special handling.
Add support to static diagnostics for tracking noescape closures through block arguments. Improve the noescape closure SIL verification logic to match. Cleanup noescape closure handling in both diagnostics and SIL verification to be more robust--they must perfectly match each other. Fixes <rdar://problem/42560459> [Exclusivity] Failure to statically diagnose a conflict when passing conditional noescape closures. Initially reported in [SR-8266] Compiler crash when checking exclusivity of inout alias. Example: struct S { var x: Int mutating func takeNoescapeClosure(_ f: ()->()) { f() } mutating func testNoescapePartialApplyPhiUse(z : Bool) { func f1() { x = 1 // expected-note {{conflicting access is here}} } func f2() { x = 1 // expected-note {{conflicting access is here}} } takeNoescapeClosure(z ? f1 : f2) // expected-error@-1 2 {{overlapping accesses to 'self', but modification requires exclusive access; consider copying to a local variable}} } }
|
@swift-ci smoke test and merge. |
1 similar comment
|
@swift-ci smoke test and merge. |
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.
Add support to static diagnostics for tracking noescape closures through block
arguments.
Improve the noescape closure SIL verification logic to match. Cleanup noescape
closure handling in both diagnostics and SIL verification to be more
robust--they must perfectly match each other.
Fixes rdar://problem/42560459 [Exclusivity] Failure to statically diagnose a
conflict when passing conditional noescape closures.
Initially reported in [SR-8266] Compiler crash when checking exclusivity of
inout alias.
Example:
struct S {
var x: Int
mutating func takeNoescapeClosure(_ f: ()->()) { f() }
mutating func testNoescapePartialApplyPhiUse(z : Bool) {
func f1() {
x = 1 // expected-note {{conflicting access is here}}
}
func f2() {
x = 1 // expected-note {{conflicting access is here}}
}
takeNoescapeClosure(z ? f1 : f2)
// expected-error@-1 2 {{overlapping accesses to 'self', but modification requires exclusive access; consider copying to a local variable}}
}
}