Skip to content

Commit 546e139

Browse files
kavonkavon
committed
specify "inout" for missing reinit error
rdar://109281444 (cherry picked from commit 616395c)
1 parent fb177b7 commit 546e139

7 files changed

+241
-241
lines changed

‎include/swift/AST/DiagnosticsSIL.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ ERROR(sil_moveonlychecker_guaranteed_value_captured_by_closure, none,
764764
ERROR(sil_moveonlychecker_capture_consumed_in_closure, none,
765765
"captured '%0' cannot be consumed within a closure", (StringRef))
766766
ERROR(sil_moveonlychecker_inout_not_reinitialized_before_end_of_function, none,
767-
"missing reinitialization of '%0' after consume", (StringRef))
767+
"missing reinitialization of inout parameter '%0' after consume", (StringRef))
768768
ERROR(sil_moveonlychecker_value_consumed_in_a_loop, none,
769769
"'%0' consumed by a use in a loop", (StringRef))
770770

‎test/SILOptimizer/moveonly_addresschecker_diagnostics.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ sil [ossa] @classSimpleChainArgTest : $@convention(thin) (@inout Klass) -> () {
304304
bb0(%0 : $*Klass):
305305
%1 = mark_must_check [consumable_and_assignable] %0 : $*Klass
306306
// expected-error @-1 {{'x2' consumed more than once}}
307-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
307+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
308308
debug_value %1 : $*Klass, var, name "x2", argno 1, expr op_deref
309309
%3 = alloc_stack [lexical] $Klass, var, name "y2"
310310
%4 = mark_must_check [consumable_and_assignable] %3 : $*Klass

‎test/SILOptimizer/moveonly_addresschecker_diagnostics.swift

Lines changed: 144 additions & 144 deletions
Large diffs are not rendered by default.

‎test/SILOptimizer/moveonly_nonescaping_closures.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func d(x: __owned M) { // expected-error {{captured 'x' cannot be consumed withi
8282
// expected-note @-1 {{consuming use here}}
8383
}
8484

85-
func d2(x: consuming M) { // expected-error {{missing reinitialization of 'x' after consume}}
85+
func d2(x: consuming M) { // expected-error {{missing reinitialization of inout parameter 'x' after consume}}
8686
clodger({ consume(x) })
8787
// expected-note @-1 {{consuming use here}}
8888
}
@@ -129,7 +129,7 @@ func k(x: borrowing M) {
129129
}
130130

131131

132-
func l(x: inout M) { // expected-error {{missing reinitialization of 'x' after consume}}
132+
func l(x: inout M) { // expected-error {{missing reinitialization of inout parameter 'x' after consume}}
133133
clodger({ consume(x) }) // expected-note {{consuming use here}}
134134
}
135135

‎test/SILOptimizer/moveonly_objectchecker_diagnostics.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2777,7 +2777,7 @@ public func closureLetCaptureClassUseAfterConsume(_ x: consuming Klass) {
27772777
public func closureLetCaptureClassUseAfterConsume1(_ x: borrowing Klass) { // expected-error {{'x' is borrowed and cannot be consumed}}
27782778
var x2 = x // expected-note {{consuming use here}}
27792779
// expected-error @-1 {{'x2' consumed more than once}}
2780-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
2780+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
27812781
x2 = x // expected-note {{consuming use here}}
27822782

27832783
let f = {
@@ -2802,7 +2802,7 @@ public func closureLetCaptureClassUseAfterConsume2(_ x2: inout Klass) {
28022802
// TODO: We are considering this to be an escaping use.
28032803
public func closureLetCaptureClassUseAfterConsume3(_ x2: inout Klass) {
28042804
// expected-error @-1 {{'x2' consumed more than once}}
2805-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
2805+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
28062806
func useClosure(_ x: () -> ()) {}
28072807

28082808
useClosure {
@@ -2852,7 +2852,7 @@ public func closureLetCaptureClassOwnedArgUseAfterConsume(_ x2: __owned Klass) {
28522852

28532853
public func closureLetCaptureClassOwnedArgUseAfterConsume2(_ x2: consuming Klass) {
28542854
// expected-error @-1 {{'x2' consumed more than once}}
2855-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
2855+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
28562856
let f = {
28572857
borrowVal(x2)
28582858
consumeVal(x2) // expected-note {{consuming use here}}
@@ -2878,7 +2878,7 @@ public func closureLetCaptureClassOwnedArgUseAfterConsume3(_ x2: __owned Klass)
28782878
public func closureLetCaptureClassOwnedArgUseAfterConsume4(_ x2: consuming Klass) {
28792879
// expected-error @-1 {{'x2' consumed more than once}}
28802880
// expected-error @-2 {{'x2' consumed more than once}}
2881-
// expected-error @-3 {{missing reinitialization of 'x2' after consume}}
2881+
// expected-error @-3 {{missing reinitialization of inout parameter 'x2' after consume}}
28822882
let f = {
28832883
borrowVal(x2)
28842884
consumeVal(x2) // expected-note {{consuming use here}}
@@ -2980,7 +2980,7 @@ public func closureVarCaptureClassUseAfterConsume3(_ x2: inout Klass) {
29802980

29812981
public func closureVarCaptureClassUseAfterConsume4(_ x2: inout Klass) {
29822982
// expected-error @-1 {{'x2' consumed more than once}}
2983-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
2983+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
29842984
func useClosure(_ x: () -> ()) {}
29852985

29862986
useClosure {
@@ -3115,7 +3115,7 @@ public func deferCaptureClassOwnedArgUseAfterConsume(_ x2: __owned Klass) {
31153115
}
31163116

31173117
public func deferCaptureClassOwnedArgUseAfterConsume2(_ x2: consuming Klass) {
3118-
// expected-error @-1 {{missing reinitialization of 'x2' after consume}}
3118+
// expected-error @-1 {{missing reinitialization of inout parameter 'x2' after consume}}
31193119
// expected-error @-2 {{'x2' consumed more than once}}
31203120
defer {
31213121
borrowVal(x2)
@@ -3138,7 +3138,7 @@ public func deferCaptureClassOwnedArgUseAfterConsume3(_ x2: __owned Klass) {
31383138
}
31393139

31403140
public func deferCaptureClassOwnedArgUseAfterConsume4(_ x2: consuming Klass) {
3141-
// expected-error @-1 {{missing reinitialization of 'x2' after consume}}
3141+
// expected-error @-1 {{missing reinitialization of inout parameter 'x2' after consume}}
31423142
// expected-error @-2 {{'x2' consumed more than once}}
31433143
// expected-error @-3 {{'x2' used after consume}}
31443144
defer { // expected-note {{non-consuming use here}}
@@ -3232,7 +3232,7 @@ public func closureLetAndDeferCaptureClassOwnedArgUseAfterConsume(_ x2: __owned
32323232
}
32333233

32343234
public func closureLetAndDeferCaptureClassOwnedArgUseAfterConsume2(_ x2: consuming Klass) {
3235-
// expected-error @-1 {{missing reinitialization of 'x2' after consume}}
3235+
// expected-error @-1 {{missing reinitialization of inout parameter 'x2' after consume}}
32363236
// expected-error @-2 {{'x2' consumed more than once}}
32373237
let f = {
32383238
defer {
@@ -3263,7 +3263,7 @@ public func closureLetAndDeferCaptureClassOwnedArgUseAfterConsume3(_ x2: __owned
32633263

32643264
public func closureLetAndDeferCaptureClassOwnedArgUseAfterConsume4(_ x2: consuming Klass) {
32653265
// expected-error @-1 {{'x2' consumed more than once}}
3266-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
3266+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
32673267
let f = {
32683268
defer {
32693269
borrowVal(x2)
@@ -3321,7 +3321,7 @@ public func closureLetAndClosureCaptureClassUseAfterConsume3(_ x: borrowing Klas
33213321
var x2 = x
33223322
// expected-note @-1 {{consuming use here}}
33233323
// expected-error @-2 {{'x2' consumed more than once}}
3324-
// expected-error @-3 {{missing reinitialization of 'x2' after consume}}
3324+
// expected-error @-3 {{missing reinitialization of inout parameter 'x2' after consume}}
33253325
// expected-error @-4 {{'x2' consumed more than once}}
33263326
x2 = x
33273327
// expected-note @-1 {{consuming use here}}
@@ -3372,7 +3372,7 @@ public func closureLetAndClosureCaptureClassOwnedArgUseAfterConsume(_ x2: __owne
33723372

33733373
public func closureLetAndClosureCaptureClassOwnedArgUseAfterConsume2(_ x2: consuming Klass) {
33743374
// expected-error @-1 {{'x2' consumed more than once}}
3375-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
3375+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
33763376
let f = {
33773377
let g = {
33783378
borrowVal(x2)
@@ -3401,7 +3401,7 @@ public func closureLetAndClosureCaptureClassOwnedArgUseAfterConsume3(_ x2: __own
34013401
}
34023402

34033403
public func closureLetAndClosureCaptureClassOwnedArgUseAfterConsume4(_ x2: consuming Klass) {
3404-
// expected-error @-1 {{missing reinitialization of 'x2' after consume}}
3404+
// expected-error @-1 {{missing reinitialization of inout parameter 'x2' after consume}}
34053405
// expected-error @-2 {{'x2' consumed more than once}}
34063406
let f = {
34073407
let g = {
@@ -3417,7 +3417,7 @@ public func closureLetAndClosureCaptureClassOwnedArgUseAfterConsume4(_ x2: consu
34173417
}
34183418

34193419
public func closureLetAndClosureCaptureClassOwnedArgUseAfterConsume5(_ x2: consuming Klass) {
3420-
// expected-error @-1 {{missing reinitialization of 'x2' after consume}}
3420+
// expected-error @-1 {{missing reinitialization of inout parameter 'x2' after consume}}
34213421
// expected-error @-2 {{'x2' consumed more than once}}
34223422
// expected-error @-3 {{'x2' used after consume}}
34233423
let f = {
@@ -3518,7 +3518,7 @@ public func closureVarAndDeferCaptureClassOwnedArgUseAfterConsume(_ x2: __owned
35183518
}
35193519

35203520
public func closureVarAndDeferCaptureClassOwnedArgUseAfterConsume2(_ x2: consuming Klass) {
3521-
// expected-error @-1 {{missing reinitialization of 'x2' after consume}}
3521+
// expected-error @-1 {{missing reinitialization of inout parameter 'x2' after consume}}
35223522
// expected-error @-2 {{'x2' consumed more than once}}
35233523
var f = {}
35243524
f = {
@@ -3551,7 +3551,7 @@ public func closureVarAndDeferCaptureClassOwnedArgUseAfterConsume3(_ x2: __owned
35513551

35523552
public func closureVarAndDeferCaptureClassOwnedArgUseAfterConsume4(_ x2: consuming Klass) {
35533553
// expected-error @-1 {{'x2' consumed more than once}}
3554-
// expected-error @-2 {{missing reinitialization of 'x2' after consume}}
3554+
// expected-error @-2 {{missing reinitialization of inout parameter 'x2' after consume}}
35553555
var f = {}
35563556
f = {
35573557
defer {

0 commit comments

Comments
 (0)