averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimizer: move DiagnoseStaticExclusivity after MandatoryAllocBoxToStack

Browse Source 
This is needed because MandatoryAllocBoxToStack can convert dynamic accesses to static accesses.
Also, it improves diagnostics for closure captures.
This commit is contained in:
Erik Eckstein
2025-08-29 11:18:04 +02:00
parent a80ba340db
commit 667de83339
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/SILOptimizer/PassManager/PassPipeline.cpp
View File

@@ -117,7 +117,6 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
P.startPipeline("Mandatory Diagnostic Passes + Enabling Optimization Passes"); P.startPipeline("Mandatory Diagnostic Passes + Enabling Optimization Passes");
P.addDiagnoseInvalidEscapingCaptures(); P.addDiagnoseInvalidEscapingCaptures();
P.addReferenceBindingTransform(); P.addReferenceBindingTransform();
P.addDiagnoseStaticExclusivity();
P.addNestedSemanticFunctionCheck(); P.addNestedSemanticFunctionCheck();
P.addCapturePromotion(); P.addCapturePromotion();
@@ -130,6 +129,10 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
#else #else
P.addLegacyAllocBoxToStack(); P.addLegacyAllocBoxToStack();
#endif #endif
// Needs to run after MandatoryAllocBoxToStack, because MandatoryAllocBoxToStack
// can convert dynamic accesses to static accesses.
P.addDiagnoseStaticExclusivity();
P.addNoReturnFolding(); P.addNoReturnFolding();
P.addBooleanLiteralFolding(); P.addBooleanLiteralFolding();
addDefiniteInitialization(P); addDefiniteInitialization(P);

4
test/SILGen/moveonly_escaping_closure.swift
View File

@@ -143,7 +143,7 @@ func testLocalLetClosureCaptureVar() {
consumeVal(x) // expected-note {{consumed here}} consumeVal(x) // expected-note {{consumed here}}
// expected-note @-1 {{consumed again here}} // expected-note @-1 {{consumed again here}}
borrowConsumeVal(x, x) borrowConsumeVal(x, x)
// expected-error @-1 {{overlapping accesses, but deinitialization requires exclusive access}} // expected-error @-1 {{overlapping accesses to 'x', but deinitialization requires exclusive access}}
// expected-note @-2 {{conflicting access is here}} // expected-note @-2 {{conflicting access is here}}
// expected-note @-3 {{used here}} // expected-note @-3 {{used here}}
// expected-note @-4 {{used here}} // expected-note @-4 {{used here}}
@@ -975,7 +975,7 @@ func testLocalLetClosureCaptureConsuming(_ x: consuming SingleElt) {
consumeVal(x) // expected-note {{consumed here}} consumeVal(x) // expected-note {{consumed here}}
// expected-note @-1 {{consumed again here}} // expected-note @-1 {{consumed again here}}
borrowConsumeVal(x, x) // expected-note {{used here}} borrowConsumeVal(x, x) // expected-note {{used here}}
// expected-error @-1 {{overlapping accesses, but deinitialization requires exclusive access}} // expected-error @-1 {{overlapping accesses to 'x', but deinitialization requires exclusive access}}
// expected-note @-2 {{conflicting access is here}} // expected-note @-2 {{conflicting access is here}}
// expected-note @-3 {{consumed here}} // expected-note @-3 {{consumed here}}
// expected-note @-4 {{used here}} // expected-note @-4 {{used here}}

7
test/SILOptimizer/exclusivity_static_diagnostics.swift
View File

@@ -263,12 +263,9 @@ func callsClosureLiteralImmediately() {
func callsStoredClosureLiteral() { func callsStoredClosureLiteral() {
var i = 7; var i = 7;
let c = { (p: inout Int) in i} let c = { (p: inout Int) in i} // expected-note {{conflicting access is here}}
// Closure literals that are stored and later called are treated as escaping _ = c(&i) // expected-error {{overlapping accesses to 'i', but modification requires exclusive access; consider copying to a local variable}}
// We don't expect a static exclusivity diagnostic here, but the issue
// will be caught at run time
_ = c(&i) // no-error
} }