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

[Diagnostics] Improve diagnostic message for extraneous &

Browse Source 
Resolves: https://github.com/apple/swift/issues/58389
This commit is contained in:
Pavel Yaskevich
2022-04-25 15:08:01 -07:00
parent 565ed69c80
commit a0d132582e
11 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/AST/DiagnosticsSema.def
View File

@@ -1206,7 +1206,7 @@ ERROR(missing_address_of_yield,none,
"yielding mutable value of type %0 requires explicit '&'",
(Type))
ERROR(extraneous_address_of,none,
"use of extraneous '&'",
"'&' may only be used to pass an argument to inout parameter",
())
ERROR(extra_address_of,none,
"'&' used with non-inout argument of type %0",

2
test/Constraints/diagnostics.swift
View File

@@ -453,7 +453,7 @@ func testTypeSugar(_ a : Int) {
// <rdar://problem/21974772> SegFault in FailureDiagnosis::visitInOutExpr
func r21974772(_ y : Int) {
let x = &(1.0 + y) // expected-error {{use of extraneous '&'}}
let x = &(1.0 + y) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
}
// <rdar://problem/22020088> QoI: missing member diagnostic on optional gives worse error message than existential/bound generic/etc

16
test/Constraints/lvalues.swift
View File

@@ -159,8 +159,8 @@ func testInOut(_ arg: inout Int) {
}
// Don't infer inout types.
var ir = &i // expected-error {{use of extraneous '&'}}
var ir2 = ((&i)) // expected-error {{use of extraneous '&'}}
var ir = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
var ir2 = ((&i)) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
// <rdar://problem/17133089>
func takeArrayRef(_ x: inout Array<String>) { }
@@ -279,10 +279,10 @@ func look_through_parens_when_checking_inout() {
func modifyPoint(source: inout Point) {}
var point = Point(x: 0, y: 0)
modifyPoint((&point)) // expected-error {{use of extraneous '&}} {{16-17=(}} {{15-16=&}}
modifyPoint(((&point))) // expected-error {{use of extraneous '&}} {{17-18=(}} {{15-16=&}}
modifyPoint(source: (&point)) // expected-error {{use of extraneous '&}} {{24-25=(}} {{23-24=&}}
modifyPoint(source: ((&point))) // expected-error {{use of extraneous '&}} {{25-26=(}} {{23-24=&}}
modifyPoint((&point), 0) // expected-error {{use of extraneous '&}} {{16-17=(}} {{15-16=&}}
modifyPoint((&point), msg: "") // expected-error {{use of extraneous '&}} {{16-17=(}} {{15-16=&}}
modifyPoint((&point)) // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{16-17=(}} {{15-16=&}}
modifyPoint(((&point))) // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{17-18=(}} {{15-16=&}}
modifyPoint(source: (&point)) // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{24-25=(}} {{23-24=&}}
modifyPoint(source: ((&point))) // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{25-26=(}} {{23-24=&}}
modifyPoint((&point), 0) // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{16-17=(}} {{15-16=&}}
modifyPoint((&point), msg: "") // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{16-17=(}} {{15-16=&}}
}

6
test/Constraints/optional.swift
View File

@@ -470,17 +470,17 @@ func rdar75146811() {
var arr: [Double]! = []
test(&arr) // expected-error {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test((&arr)) // expected-error {{use of extraneous '&'}}
test((&arr)) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
// expected-error@-1 {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test(&(arr)) // expected-error {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test_tuple(&arr, x: 0) // expected-error {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test_tuple((&arr), x: 0) // expected-error {{use of extraneous '&'}}
test_tuple((&arr), x: 0) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
// expected-error@-1 {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test_tuple(&(arr), x: 0) // expected-error {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test_named(x: &arr) // expected-error {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test_named(x: (&arr)) // expected-error {{use of extraneous '&'}}
test_named(x: (&arr)) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
// expected-error@-1 {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
test_named(x: &(arr)) // expected-error {{cannot convert value of type '[Double]?' to expected argument type 'Double'}}
}

18
test/Parse/pointer_conversion.swift.gyb
View File

@@ -65,8 +65,8 @@ func mutablePointerArguments(_ p: UnsafeMutablePointer<Int>,
takesMutableArrayPointer(&ii)
// We don't allow these conversions outside of function arguments.
var x: UnsafeMutablePointer<Int> = &i // expected-error {{use of extraneous '&'}}
x = &ii // expected-error {{use of extraneous '&'}}
var x: UnsafeMutablePointer<Int> = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
x = &ii // expected-error {{'&' may only be used to pass an argument to inout parameter}}
_ = x
}
@@ -97,9 +97,9 @@ func mutableVoidPointerArguments(_ p: UnsafeMutablePointer<Int>,
takesMutableVoidPointer(ff) // expected-error{{cannot convert value of type '[Int]' to expected argument type 'UnsafeMutableRawPointer${diag_suffix}'}}
// We don't allow these conversions outside of function arguments.
var x: UnsafeMutableRawPointer = &i // expected-error {{use of extraneous '&'}}
var x: UnsafeMutableRawPointer = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
x = p // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Int>' to type 'UnsafeMutableRawPointer'}}
x = &ii // expected-error {{use of extraneous '&'}}
x = &ii // expected-error {{'&' may only be used to pass an argument to inout parameter}}
_ = x
}
@@ -132,9 +132,9 @@ func mutableRawPointerArguments(_ p: UnsafeMutablePointer<Int>,
takesMutableRawPointer(ff) // expected-error{{cannot convert value of type '[Int]' to expected argument type 'UnsafeMutableRawPointer${diag_suffix}'}}
// We don't allow these conversions outside of function arguments.
var x: UnsafeMutableRawPointer = &i // expected-error {{use of extraneous '&'}}
var x: UnsafeMutableRawPointer = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
x = p // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Int>' to type 'UnsafeMutableRawPointer'}}
x = &ii //expected-error {{use of extraneous '&'}}
x = &ii //expected-error {{'&' may only be used to pass an argument to inout parameter}}
_ = x
}
@@ -167,7 +167,7 @@ func constPointerArguments(_ p: UnsafeMutablePointer<Int>,
// expected-error@-1 3 {{cannot convert value of type 'Double' to expected element type 'Int'}}
// We don't allow these conversions outside of function arguments.
var x: UnsafePointer<Int> = &i // expected-error {{use of extraneous '&'}}
var x: UnsafePointer<Int> = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
x = ii // expected-error{{cannot assign value of type '[Int]' to type 'UnsafePointer<Int>'}}
x = p // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Int>' to type 'UnsafePointer<Int>'}}
}
@@ -201,7 +201,7 @@ func constVoidPointerArguments(_ p: UnsafeMutablePointer<Int>,
takesConstVoidPointer([0.0, 1.0, 2.0])
// We don't allow these conversions outside of function arguments.
var x: UnsafeRawPointer = &i // expected-error {{use of extraneous '&'}}
var x: UnsafeRawPointer = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
x = ii // expected-error{{cannot assign value of type '[Int]' to type 'UnsafeRawPointer'}}
x = p // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Int>' to type 'UnsafeRawPointer'}}
x = fp // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Float>' to type 'UnsafeRawPointer'}}
@@ -241,7 +241,7 @@ func constRawPointerArguments(_ p: UnsafeMutablePointer<Int>,
takesConstRawPointer([0.0, 1.0, 2.0])
// We don't allow these conversions outside of function arguments.
var x: UnsafeRawPointer = &i // expected-error {{use of extraneous '&'}}
var x: UnsafeRawPointer = &i // expected-error {{'&' may only be used to pass an argument to inout parameter}}
x = ii // expected-error{{cannot assign value of type '[Int]' to type 'UnsafeRawPointer'}}
x = p // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Int>' to type 'UnsafeRawPointer'}}
x = fp // expected-error{{cannot assign value of type 'UnsafeMutablePointer<Float>' to type 'UnsafeRawPointer'}}

2
test/Parse/pointer_conversion_objc.swift.gyb
View File

@@ -72,5 +72,5 @@ func autoreleasingPointerArguments(p: UnsafeMutablePointer<Int>,
// expected-note@-1 {{arguments to generic parameter 'Pointee' ('[C]' and 'C') are expected to be equal}}
takesAutoreleasingPointer(&dd) // expected-error{{cannot convert value of type 'AutoreleasingUnsafeMutablePointer<[D]>' to expected argument type 'AutoreleasingUnsafeMutablePointer<C>'}}
// expected-note@-1 {{arguments to generic parameter 'Pointee' ('[D]' and 'C') are expected to be equal}}
let _: AutoreleasingUnsafeMutablePointer<C> = &c // expected-error {{use of extraneous '&'}}
let _: AutoreleasingUnsafeMutablePointer<C> = &c // expected-error {{'&' may only be used to pass an argument to inout parameter}}
}

2
test/Parse/recovery.swift
View File

@@ -816,7 +816,7 @@ func test23550816(ss: [String], s: String) {
// <rdar://problem/23719432> [practicalswift] Compiler crashes on &(Int:_)
func test23719432() {
var x = 42
&(Int:x) // expected-error {{use of extraneous '&'}}
&(Int:x) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
}
// <rdar://problem/19911096> QoI: terrible recovery when using '·' for an operator

2
test/Sema/diag_invalid_interpolation_4_2.swift
View File

@@ -10,6 +10,6 @@ _ = "\(y: &x)"
// expected-note@-3 {{remove 'y' label to keep current behavior}}
_ = "\(x, y: &x)"
// expected-error@-1 {{use of extraneous '&'}}
// expected-error@-1 {{'&' may only be used to pass an argument to inout parameter}}
// expected-warning@-2 {{interpolating multiple values will not form a tuple in Swift 5}}
// expected-note@-3 {{insert parentheses to keep current behavior}}

2
test/TypeCoercion/overload_noncall.swift
View File

@@ -52,7 +52,7 @@ func test_inout() {
x = accept_XY(&xy);
x = xy
x = &xy; // expected-error {{use of extraneous '&'}}
x = &xy; // expected-error {{'&' may only be used to pass an argument to inout parameter}}
accept_Z(&xy); // expected-error{{cannot convert value of type 'X' to expected argument type 'Z'}}
}

4
test/decl/func/default-values.swift
View File

@@ -132,10 +132,10 @@ func inoutFuncWithDefaultArg1(x: inout Int = 1) {} // expected-error {{cannot pr
func inoutFuncWithDefaultArg2(x: inout Int = bLiteral) {} // expected-error {{cannot provide default value to inout parameter 'x'}}
func inoutFuncWithDefaultArg3(x: inout Int = aLiteral) {} // expected-error {{cannot provide default value to inout parameter 'x'}}
func inoutFuncWithDefaultArg4(x: inout Int = &aLiteral) {} // expected-error {{cannot provide default value to inout parameter 'x'}}
// expected-error@-1 {{use of extraneous '&'}}
// expected-error@-1 {{'&' may only be used to pass an argument to inout parameter}}
func inoutFuncWithDefaultArg5(x: inout Int = &bLiteral) {} // expected-error {{cannot provide default value to inout parameter 'x'}}
// expected-error@-1 {{use of extraneous '&'}}
// expected-error@-1 {{'&' may only be used to pass an argument to inout parameter}}
func inoutFuncWithDefaultArg6(x: inout Int = #file) {} // expected-error {{cannot provide default value to inout parameter 'x'}}
// expected-error@-1 {{default argument value of type 'String' cannot be converted to type 'Int'}}

24
test/expr/expressions.swift
View File

@@ -542,8 +542,8 @@ func testInOut(_ arg: inout Int) {
takesExplicitInt(x) // expected-error{{passing value of type 'Int' to an inout parameter requires explicit '&'}} {{20-20=&}}
takesExplicitInt(&x)
takesInt(&x) // expected-error{{'&' used with non-inout argument of type 'Int'}}
var y = &x //expected-error {{use of extraneous '&'}}
var z = &arg //expected-error {{use of extraneous '&'}}
var y = &x //expected-error {{'&' may only be used to pass an argument to inout parameter}}
var z = &arg //expected-error {{'&' may only be used to pass an argument to inout parameter}}
takesExplicitInt(5) // expected-error {{cannot pass immutable value as inout argument: literals are not mutable}}
}
@@ -701,8 +701,8 @@ func test() {
let y = Foo()
// rdar://15708430
(&x).method() // expected-error {{use of extraneous '&'}}
(&x).mutatingMethod() // expected-error {{use of extraneous '&'}}
(&x).method() // expected-error {{'&' may only be used to pass an argument to inout parameter}}
(&x).mutatingMethod() // expected-error {{'&' may only be used to pass an argument to inout parameter}}
}
@@ -832,20 +832,20 @@ public struct TestPropMethodOverloadGroup {
// <rdar://problem/18496742> Passing ternary operator expression as inout crashes Swift compiler
func inoutTests(_ arr: inout Int) {
var x = 1, y = 2
(true ? &x : &y) // expected-error {{use of extraneous '&'}}
let a = (true ? &x : &y) // expected-error {{use of extraneous '&'}}
(true ? &x : &y) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
let a = (true ? &x : &y) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
inoutTests(true ? &x : &y) // expected-error {{use of extraneous '&'}}
inoutTests(true ? &x : &y) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
&_ // expected-error {{use of extraneous '&'}}
&_ // expected-error {{'&' may only be used to pass an argument to inout parameter}}
inoutTests((&x, 24).0) // expected-error {{use of extraneous '&'}}
inoutTests((&x, 24).0) // expected-error {{'&' may only be used to pass an argument to inout parameter}}
inoutTests((&x)) // expected-error {{use of extraneous '&'}} {{15-16=(}} {{14-15=&}}
inoutTests((&x)) // expected-error {{'&' may only be used to pass an argument to inout parameter}} {{15-16=(}} {{14-15=&}}
inoutTests(&x)
// <rdar://problem/17489894> inout not rejected as operand to assignment operator
&x += y // expected-error {{use of extraneous '&'}}
&x += y // expected-error {{'&' may only be used to pass an argument to inout parameter}}
// <rdar://problem/23249098>
func takeAny(_ x: Any) {}
@@ -861,7 +861,7 @@ func inoutTests(_ arr: inout Int) {
// <rdar://problem/20802757> Compiler crash in default argument & inout expr
var g20802757 = 2
func r20802757(_ z: inout Int = &g20802757) { // expected-error {{cannot provide default value to inout parameter 'z'}}
// expected-error@-1 {{use of extraneous '&'}}
// expected-error@-1 {{'&' may only be used to pass an argument to inout parameter}}
print(z)
}