[tests] Fixing tests under test/Sema and test/decl

Author: LucianoPAlmeida

test/Sema/diag_unintended_optional_behavior.swift

@@ -212,7 +212,7 @@ func warnOptionalInStringInterpolationSegment(_ o : Int?) {
   // expected-note@-2 {{use 'String(describing:)' to silence this warning}} {{51-51=String(describing: }} {{67-67=)}} 
   // expected-note@-3 {{provide a default value to avoid this warning}} {{67-67= ?? <#default value#>}}
 
-  print("Always some, Always some, Always some: \(o as Int?)") // No warning
+  print("Always some, Always some, Always some: \(o as Int?)") // expected-warning {{redundant cast to 'Int?' has no effect}} {{53-60=}}
   print("Always some, Always some, Always some: \(o.debugDescription)") // No warning.
 
   let oST = Optional(SpecialType())

test/Sema/diag_unowned_immediate_deallocation.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -module-name ModuleName
+// RUN: %target-typecheck-verify-swift -module-name ModuleName -disable-redundant-coercion-warning
 
 protocol ClassProtocol : class {
   init()

test/Sema/suppress-argument-labels-in-types.swift

@@ -207,18 +207,18 @@ let _ = min(Int(3), Float(2.5)) // expected-error{{cannot convert value of type
 
 // SR-11429
 func testIntermediateCoercions() {
-  _ = (f1 as (Int, Int) -> Int)(a: 0, b: 1) // expected-error {{extraneous argument labels 'a:b:' in call}}
-  _ = (f1 as (Int, Int) -> Int)(0, 1)
+  _ = (f1 as (Int, Int) -> Int)(a: 0, b: 1) // expected-error {{extraneous argument labels 'a:b:' in call}} expected-warning {{redundant cast to '(Int, Int) -> Int' has no effect}}
+  _ = (f1 as (Int, Int) -> Int)(0, 1) // expected-warning {{redundant cast to '(Int, Int) -> Int' has no effect}}
 
   typealias Magic<T> = T
-  _ = (f1 as Magic)(a: 0, b: 1) // expected-error {{extraneous argument labels 'a:b:' in call}}
-  _ = (f1 as Magic)(0, 1)
+  _ = (f1 as Magic)(a: 0, b: 1) // expected-error {{extraneous argument labels 'a:b:' in call}} expected-warning {{redundant cast to 'Magic' has no effect}} {{11-19=}}
+  _ = (f1 as Magic)(0, 1) // expected-warning {{redundant cast to 'Magic' has no effect}} {{11-19=}}
 
   _ = (f4 as (Int, Int) -> Int)(0, 0)
   _ = (f4 as (Double, Double) -> Double)(0, 0)
 
   func iuoReturning() -> Int! {}
-  _ = (iuoReturning as () -> Int?)()
-  _ = (iuoReturning as Magic)()
+  _ = (iuoReturning as () -> Int?)() // expected-warning {{redundant cast to '() -> Int?' has no effect}}
+  _ = (iuoReturning as Magic)() // expected-warning {{redundant cast to 'Magic' has no effect}} {{21-29=}}
   _ = (iuoReturning as () -> Int)() // expected-error {{cannot convert value of type '() -> Int?' to type '() -> Int' in coercion}}
 }

test/decl/class/classes.swift

@@ -43,8 +43,8 @@ extension A {
 }
 func f() {
   let x = B()
-  _ = x.f() as ()
-  _ = x[10] as Int
+  _ = x.f() as () // expected-warning {{redundant cast to '()' has no effect}} {{13-19=}}
+  _ = x[10] as Int // expected-warning {{redundant cast to 'Int' has no effect}} {{13-20=}}
 }
 
 class C<T> {

test/decl/protocol/protocols.swift

@@ -118,7 +118,7 @@ struct Circle {
 func testCircular(_ circle: Circle) {
   // FIXME: It would be nice if this failure were suppressed because the protocols
   // have circular definitions.
-  _ = circle as CircleStart // expected-error{{'Circle' is not convertible to 'CircleStart'; did you mean to use 'as!' to force downcast?}} {{14-16=as!}}
+  _ = circle as CircleStart // expected-error{{value of type 'Circle' does not conform to 'CircleStart' in coercion}}
 }
 
 // <rdar://problem/14750346>
@@ -482,7 +482,7 @@ func f<T : C1>(_ x : T) {
 
 class C2 {}
 func g<T : C2>(_ x : T) {
-  x as P2 // expected-error{{'T' is not convertible to 'P2'; did you mean to use 'as!' to force downcast?}} {{5-7=as!}}
+  x as P2 // expected-error {{value of type 'T' does not conform to 'P2' in coercion}}
 }
 
 class C3 : P1 {} // expected-error{{type 'C3' does not conform to protocol 'P1'}}

test/decl/protocol/req/optional.swift

@@ -144,7 +144,7 @@ func optionalPropertyGeneric<T : P1>(_ t: T) {
 
   // ... and that we can use it
   let i = propertyRef!
-  _ = i as Int
+  _ = i as Int // expected-warning {{redundant cast to 'Int' has no effect}} {{9-16=}}
 }
 
 // Optional subscript references in generics.
@@ -157,7 +157,7 @@ func optionalSubscriptGeneric<T : P1>(_ t: T) {
 
   // ... and that we can use it
   let i = subscriptRef!
-  _ = i as ObjCClass?
+  _ = i as ObjCClass? // expected-warning {{redundant cast to 'ObjCClass?' has no effect}} {{9-23=}}
 }
 
 // Optional method references in existentials.
@@ -182,7 +182,7 @@ func optionalPropertyExistential(_ t: P1) {
 
   // ... and that we can use it
   let i = propertyRef!
-  _ = i as Int
+  _ = i as Int // expected-warning {{redundant cast to 'Int' has no effect}} {{9-16=}}
 }
 
 // Optional subscript references in existentials.
@@ -195,7 +195,7 @@ func optionalSubscriptExistential(_ t: P1) {
 
   // ... and that we can use it
   let i = subscriptRef!
-  _ = i as ObjCClass?
+  _ = i as ObjCClass? // expected-warning {{redundant cast to 'ObjCClass?' has no effect}} {{9-23=}}
 }
 
 // -----------------------------------------------------------------------

test/decl/var/variables.swift

@@ -67,7 +67,7 @@ var arrayOfEmptyTuples = [""].map { print($0) } // expected-warning {{variable '
 var maybeEmpty = Optional(arrayOfEmptyTuples) // expected-warning {{variable 'maybeEmpty' inferred to have type '[()]?'}} \
                                               // expected-note {{add an explicit type annotation to silence this warning}} {{15-15=: [()]?}}
 
-var shouldWarnWithoutSugar = (arrayOfEmptyTuples as Array<()>) // expected-warning {{variable 'shouldWarnWithoutSugar' inferred to have type 'Array<()>'}} \
+var shouldWarnWithoutSugar = (arrayOfEmptyTuples as Array<()>) // expected-warning {{redundant cast to 'Array<()>' has no effect}} {{50-62=}} expected-warning {{variable 'shouldWarnWithoutSugar' inferred to have type 'Array<()>'}} \
                                  // expected-note {{add an explicit type annotation to silence this warning}} {{27-27=: Array<()>}}
 
 class SomeClass {}