Fixing warning UnnecessaryCoercion tests

LucianoPAlmeida · LucianoPAlmeida · commit 86ca3454d6e5 · 2019-10-21T23:11:21.000-03:00
diff --git a/test/ClangImporter/Darwin_test.swift b/test/ClangImporter/Darwin_test.swift
@@ -9,7 +9,8 @@ _ = nil as Fract? // expected-error{{use of undeclared type 'Fract'}}
 _ = nil as Darwin.Fract? // okay
 
 _ = 0 as OSErr
-_ = noErr as OSStatus // noErr is from the overlay
+// noErr is from the overlay
+_ = noErr as OSStatus // expected-warning {{redundant cast to 'OSStatus' (aka 'Int32') has no effect}} {{11-23=}}
 _ = 0 as UniChar
 
 _ = ProcessSerialNumber()
diff --git a/test/ClangImporter/MixedSource/mixed-target-using-header.swift b/test/ClangImporter/MixedSource/mixed-target-using-header.swift
@@ -53,12 +53,13 @@ func testSuppressed() {
 #endif
 
 func testMacro() {
-  _ = CONSTANT as CInt
+  _ = CONSTANT as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{16-24=}}
 }
 
 func testFoundationOverlay() {
   _ = NSUTF8StringEncoding // no ambiguity
-  _ = NSUTF8StringEncoding as UInt // and we should get the overlay version
+  // and we should get the overlay version
+  _ = NSUTF8StringEncoding as UInt // expected-warning {{redundant cast to 'UInt' has no effect}} {{28-36=}}
 }
 
 #if !SILGEN
diff --git a/test/ClangImporter/Security_test.swift b/test/ClangImporter/Security_test.swift
@@ -4,8 +4,8 @@
 
 import Security
 
-_ = kSecClass as CFString
-_ = kSecClassGenericPassword as CFString
+_ = kSecClass as CFString // expected-warning {{redundant cast to 'CFString' has no effect}} {{15-27=}}
+_ = kSecClassGenericPassword as CFString // expected-warning {{redundant cast to 'CFString' has no effect}} {{30-42=}}
 _ = kSecClassGenericPassword as CFDictionary // expected-error {{'CFString?' is not convertible to 'CFDictionary'}} {{30-32=as!}}
 
 func testIntegration() {
diff --git a/test/ClangImporter/attr-swift_private.swift b/test/ClangImporter/attr-swift_private.swift
@@ -102,7 +102,7 @@ public func testTopLevel() {
 
 _ = __PrivAnonymousA
 _ = __E0PrivA
-_ = __PrivE1A as __PrivE1
+_ = __PrivE1A as __PrivE1 // expected-warning {{redundant cast to '__PrivE1' has no effect}} {{15-27=}}
 _ = NSEnum.__privA
 _ = NSEnum.B
 _ = NSOptions.__privA
diff --git a/test/ClangImporter/cf.swift b/test/ClangImporter/cf.swift
@@ -90,9 +90,9 @@ func testTollFree1(_ ccmduct: CCMutableDuct) {
 }
 
 func testChainedAliases(_ fridge: CCRefrigerator) {
-  _ = fridge as CCRefrigerator
+  _ = fridge as CCRefrigerator // expected-warning {{redundant cast to 'CCRefrigerator' has no effect}} {{14-32=}}
 
-  _ = fridge as CCFridge
+  _ = fridge as CCFridge // expected-warning {{redundant cast to 'CCFridge' (aka 'CCRefrigerator') has no effect}} {{14-26=}}
   _ = fridge as CCFridgeRef // expected-error{{'CCFridgeRef' has been renamed to 'CCFridge'}} {{17-28=CCFridge}}
 }
 
diff --git a/test/ClangImporter/cfuncs_parse.swift b/test/ClangImporter/cfuncs_parse.swift
@@ -15,7 +15,7 @@ func test_cfunc2(_ i: Int) {
 #else
   let f = cfunc2(i, 17)
 #endif
-  _ = f as Float
+  _ = f as Float // expected-warning {{redundant cast to 'Float' has no effect}} {{9-18=}}
   cfunc2(b:17, a:i) // expected-error{{extraneous argument labels 'b:a:' in call}}
   // expected-error@-1 {{cannot convert value of type 'Int' to expected argument type 'Int32'}}
   cfunc2(17, i) // expected-error{{cannot convert value of type 'Int' to expected argument type 'Int32'}}
diff --git a/test/ClangImporter/ctypes_parse.swift b/test/ClangImporter/ctypes_parse.swift
@@ -47,7 +47,7 @@ func testAnonEnum() {
 func testAnonEnumSmall() {
   var a = AnonConstSmall1
   a = AnonConstSmall2
-  _ = a as Int
+  _ = a as Int // expected-warning {{redundant cast to 'Int' has no effect}} {{9-16=}}
 }
 
 func testPoint() -> Float {
@@ -141,14 +141,14 @@ func testImportStddefTypes() {
   let t2_unqual: Int = size_t_test
   let t3_unqual: Int = rsize_t_test
 
-  _ = t1_unqual as ctypes.ptrdiff_t
-  _ = t2_unqual as ctypes.size_t
-  _ = t3_unqual as ctypes.rsize_t
+  _ = t1_unqual as ctypes.ptrdiff_t // expected-warning {{redundant cast to 'ptrdiff_t' (aka 'Int') has no effect}} {{17-37=}}
+  _ = t2_unqual as ctypes.size_t // expected-warning {{redundant cast to 'size_t' (aka 'Int') has no effect}} {{17-34=}}
+  _ = t3_unqual as ctypes.rsize_t // expected-warning {{redundant cast to 'rsize_t' (aka 'Int') has no effect}} {{17-35=}}
 }
 
 func testImportSysTypesTypes() {
   let t1_unqual: Int = ssize_t_test
-  _ = t1_unqual as ctypes.ssize_t
+  _ = t1_unqual as ctypes.ssize_t // expected-warning {{redundant cast to 'ssize_t' (aka 'Int') has no effect}} {{17-35=}}
 }
 
 func testImportOSTypesTypes() {
@@ -198,7 +198,7 @@ func testFunctionPointers() {
   let fp = getFunctionPointer()
   useFunctionPointer(fp)
 
-  _ = fp as (@convention(c) (CInt) -> CInt)?
+  _ = fp as (@convention(c) (CInt) -> CInt)? // expected-warning {{redundant cast to '(@convention(c) (CInt) -> CInt)?' (aka 'Optional<@convention(c) (Int32) -> Int32>') has no effect}} {{10-46=}}
 
   let wrapper: FunctionPointerWrapper = FunctionPointerWrapper(a: nil, b: nil)
   _ = FunctionPointerWrapper(a: fp, b: fp)
diff --git a/test/ClangImporter/ctypes_parse_objc.swift b/test/ClangImporter/ctypes_parse_objc.swift
@@ -71,16 +71,16 @@ func testImportMacTypes() {
 
 func testImportCFTypes() {
   let t1_unqual: UInt = CFTypeID_test
-  _ = t1_unqual as CoreFoundation.CFTypeID
+  _ = t1_unqual as CoreFoundation.CFTypeID // expected-warning {{redundant cast to 'CFTypeID' (aka 'UInt') has no effect}} {{17-44=}}
 
   let t2_unqual: UInt = CFOptionFlags_test
-  _ = t2_unqual as CoreFoundation.CFOptionFlags
+  _ = t2_unqual as CoreFoundation.CFOptionFlags // expected-warning {{redundant cast to 'CFOptionFlags' (aka 'UInt') has no effect}} {{17-49=}}
 
   let t3_unqual: UInt = CFHashCode_test
-  _ = t3_unqual as CoreFoundation.CFHashCode
+  _ = t3_unqual as CoreFoundation.CFHashCode // expected-warning {{redundant cast to 'CFHashCode' (aka 'UInt') has no effect}} {{17-46=}}
 
   let t4_unqual: Int = CFIndex_test
-  _ = t4_unqual as CoreFoundation.CFIndex
+  _ = t4_unqual as CoreFoundation.CFIndex // expected-warning {{redundant cast to 'CFIndex' (aka 'Int') has no effect}} {{17-43=}}
 }
 
 func testImportSEL() {
diff --git a/test/ClangImporter/macros.swift b/test/ClangImporter/macros.swift
@@ -103,15 +103,15 @@ func testNil() {
 }
 
 func testBitwiseOps() {
-  _ = DISPATCH_TIME_FOREVER as CUnsignedLongLong
+  _ = DISPATCH_TIME_FOREVER as CUnsignedLongLong // expected-warning {{redundant cast to 'CUnsignedLongLong' (aka 'UInt64') has no effect}} {{29-50=}}
   _ = (BIT_SHIFT_1 | BIT_SHIFT_2) as CInt
-  _ = BIT_SHIFT_3 as CLongLong
-  _ = BIT_SHIFT_4 as CUnsignedInt
+  _ = BIT_SHIFT_3 as CLongLong // expected-warning {{redundant cast to 'CLongLong' (aka 'Int64') has no effect}} {{19-32=}}
+  _ = BIT_SHIFT_4 as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{19-35=}}
 
-  _ = RSHIFT_ONE as CUnsignedInt
+  _ = RSHIFT_ONE as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{18-34=}}
   _ = RSHIFT_INVALID // expected-error {{use of unresolved identifier 'RSHIFT_INVALID'}}
 
-  _ = XOR_HIGH as CUnsignedLongLong
+  _ = XOR_HIGH as CUnsignedLongLong // expected-warning {{redundant cast to 'CUnsignedLongLong' (aka 'UInt64') has no effect}} {{16-37=}}
 
   var attributes = 0 as CInt
   attributes |= ATTR_BOLD
@@ -121,30 +121,30 @@ func testBitwiseOps() {
 }
 
 func testIntegerArithmetic() {
-  _ = ADD_ZERO as CInt
-  _ = ADD_ONE as CInt
-  _ = ADD_TWO as CInt
-  _ = ADD_MINUS_TWO as CInt
-  _ = ADD_MIXED_WIDTH as CLongLong
-  _ = ADD_MIXED_SIGN as CLongLong
-  _ = ADD_UNDERFLOW as CUnsignedInt
-  _ = ADD_OVERFLOW as CUnsignedInt
-
-  _ = SUB_ONE as CInt
-  _ = SUB_ZERO as CInt
-  _ = SUB_MINUS_ONE as CInt
-  _ = SUB_MIXED_WIDTH as CLongLong
-  _ = SUB_MIXED_SIGN as CUnsignedInt
-  _ = SUB_UNDERFLOW as CUnsignedInt
-  _ = SUB_OVERFLOW as CUnsignedInt
-
-  _ = MULT_POS as CInt
-  _ = MULT_NEG as CInt
-  _ = MULT_MIXED_TYPES as CLongLong
-
-  _ = DIVIDE_INTEGRAL as CInt
-  _ = DIVIDE_NONINTEGRAL as CInt
-  _ = DIVIDE_MIXED_TYPES as CLongLong
+  _ = ADD_ZERO as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{16-24=}}
+  _ = ADD_ONE as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{15-23=}}
+  _ = ADD_TWO as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{15-23=}}
+  _ = ADD_MINUS_TWO as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{21-29=}}
+  _ = ADD_MIXED_WIDTH as CLongLong // expected-warning {{redundant cast to 'CLongLong' (aka 'Int64') has no effect}} {{23-36=}}
+  _ = ADD_MIXED_SIGN as CLongLong // expected-warning {{redundant cast to 'CLongLong' (aka 'Int64') has no effect}} {{22-35=}}
+  _ = ADD_UNDERFLOW as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{21-37=}}
+  _ = ADD_OVERFLOW as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{20-36=}}
+
+  _ = SUB_ONE as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{15-23=}}
+  _ = SUB_ZERO as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{16-24=}}
+  _ = SUB_MINUS_ONE as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{21-29=}}
+  _ = SUB_MIXED_WIDTH as CLongLong // expected-warning {{redundant cast to 'CLongLong' (aka 'Int64') has no effect}} {{23-36=}}
+  _ = SUB_MIXED_SIGN as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{22-38=}}
+  _ = SUB_UNDERFLOW as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{21-37=}}
+  _ = SUB_OVERFLOW as CUnsignedInt // expected-warning {{redundant cast to 'CUnsignedInt' (aka 'UInt32') has no effect}} {{20-36=}}
+
+  _ = MULT_POS as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{16-24=}}
+  _ = MULT_NEG as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{16-24=}}
+  _ = MULT_MIXED_TYPES as CLongLong // expected-warning {{redundant cast to 'CLongLong' (aka 'Int64') has no effect}} {{24-37=}}
+
+  _ = DIVIDE_INTEGRAL as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{23-31=}}
+  _ = DIVIDE_NONINTEGRAL as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{26-34=}}
+  _ = DIVIDE_MIXED_TYPES as CLongLong // expected-warning {{redundant cast to 'CLongLong' (aka 'Int64') has no effect}} {{26-39=}}
   _ = DIVIDE_INVALID // expected-error {{use of unresolved identifier 'DIVIDE_INVALID'}}
 }
 
diff --git a/test/ClangImporter/objc_bridging.swift b/test/ClangImporter/objc_bridging.swift
@@ -26,20 +26,20 @@ extension Set {
 }
 
 func foo() {
-  _  = NSStringToNSString as (String?) -> String?
+  _  = NSStringToNSString as (String?) -> String? // expected-warning {{redundant cast to '(String?) -> String?' has no effect}} {{27-51=}}
   _ = DummyClass().nsstringProperty.onlyOnString() as String
 
-  _  = BOOLtoBOOL as (Bool) -> Bool
+  _  = BOOLtoBOOL as (Bool) -> Bool // expected-warning {{redundant cast to '(Bool) -> Bool' has no effect}} {{19-37=}}
   _  = DummyClass().boolProperty.onlyOnBool() as Bool
 
-  _  = arrayToArray as (Array<Any>?) -> (Array<Any>?)
+  _  = arrayToArray as (Array<Any>?) -> (Array<Any>?) // expected-warning {{redundant cast to '(Array<Any>?) -> (Array<Any>?)' has no effect}} {{21-55=}}
   DummyClass().arrayProperty.onlyOnArray()
 
-  _ = dictToDict as (Dictionary<AnyHashable, Any>?) -> Dictionary<AnyHashable, Any>?
+  _ = dictToDict as (Dictionary<AnyHashable, Any>?) -> Dictionary<AnyHashable, Any>? // expected-warning {{redundant cast to '(Dictionary<AnyHashable, Any>?) -> Dictionary<AnyHashable, Any>?' has no effect}} {{18-86=}}
 
   DummyClass().dictProperty.onlyOnDictionary()
 
-  _ = setToSet as (Set<AnyHashable>?) -> Set<AnyHashable>?
+  _ = setToSet as (Set<AnyHashable>?) -> Set<AnyHashable>? // expected-warning {{redundant cast to '(Set<AnyHashable>?) -> Set<AnyHashable>?' has no effect}} {{16-60=}}
   DummyClass().setProperty.onlyOnSet()
 }
 
diff --git a/test/ClangImporter/objc_failable_inits.swift b/test/ClangImporter/objc_failable_inits.swift
@@ -20,13 +20,13 @@ func testString() throws {
   // Implicitly unwrapped optional
   let stringIUO = NSString(path: "blah")
   if stringIUO == nil { }
-  _ = stringIUO as NSString?
+  _ = stringIUO as NSString? // expected-warning {{redundant cast to 'NSString?' has no effect}} {{17-30=}}
   let _: NSString = NSString(path: "blah")
 }
 
 func testHive() {
   let hiveIUO = Hive()
   if hiveIUO == nil { }
-  _ = hiveIUO as Hive?
+  _ = hiveIUO as Hive? // expected-warning {{redundant cast to 'Hive?' has no effect}} {{15-24=}}
   let _: Hive = Hive()
 }
diff --git a/test/Constraints/bridging.swift b/test/Constraints/bridging.swift
@@ -285,9 +285,9 @@ func rdar19836341(_ ns: NSString?, vns: NSString?) {
 
 // <rdar://problem/20029786> Swift compiler sometimes suggests changing "as!" to "as?!"
 func rdar20029786(_ ns: NSString?) {
-  var s: String = ns ?? "str" as String as String // expected-error{{'NSString' is not implicitly convertible to 'String'; did you mean to use 'as' to explicitly convert?}} {{19-19=(}} {{50-50=) as String}}
+  var s: String = ns ?? "str" as String as String // expected-error{{'NSString' is not implicitly convertible to 'String'; did you mean to use 'as' to explicitly convert?}} {{19-19=(}} {{50-50=) as String}} expected-warning {{redundant cast to 'String' has no effect}} {{41-51=}}
   // expected-error@-1 {{cannot convert value of type 'String' to expected argument type 'NSString'}} {{50-50= as NSString}}
-  var s2 = ns ?? "str" as String as String // expected-error {{cannot convert value of type 'String' to expected argument type 'NSString'}}{{43-43= as NSString}}
+  var s2 = ns ?? "str" as String as String // expected-error {{cannot convert value of type 'String' to expected argument type 'NSString'}}{{43-43= as NSString}} expected-warning {{redundant cast to 'String' has no effect}} {{34-44=}}
 
   let s3: NSString? = "str" as String? // expected-error {{cannot convert value of type 'String?' to specified type 'NSString?'}}{{39-39= as NSString?}}
 
@@ -341,7 +341,7 @@ func forceUniversalBridgeToAnyObject<T, U: KnownClassProtocol>(a: T, b: U, c: An
   z = d as AnyObject
   z = e as AnyObject
   z = f as AnyObject
-  z = g as AnyObject
+  z = g as AnyObject // expected-warning {{redundant cast to 'AnyObject' has no effect}} {{9-22=}}
   z = h as AnyObject
 
   z = a // expected-error{{does not conform to 'AnyObject'}}
diff --git a/test/Constraints/casts.swift b/test/Constraints/casts.swift
@@ -180,7 +180,7 @@ var c2f2: C2<[Float]>? = b as! C3
 
 
 // <rdar://problem/15633178>
-var f: (Float) -> Float = { $0 as Float }
+var f: (Float) -> Float = { $0 as Float } // expected-warning {{redundant cast to 'Float' has no effect}} {{32-41=}}
 var f2: (B) -> Bool = { $0 is D }
 
 func metatype_casts<T, U>(_ b: B.Type, t:T.Type, u: U.Type) {
diff --git a/test/Constraints/construction.swift b/test/Constraints/construction.swift
@@ -94,13 +94,12 @@ _ = b as! Derived
 // NOTE: Int and other integer-literal convertible types
 //  are special cased in the library.
 Int(i) // expected-warning{{unused}}
-_ = i as Int
+_ = i as Int // expected-warning {{redundant cast to 'Int' has no effect}} {{7-14=}}
 Z(z) // expected-error{{no exact matches in call to initializer}}
-
 Z.init(z)  // expected-error {{no exact matches in call to initializer}}
 
 
-_ = z as Z
+_ = z as Z // expected-warning {{redundant cast to 'Z' has no effect}} {{7-12=}}
 
 // Construction from inouts.
 struct FooRef { }
diff --git a/test/Constraints/diagnostics.swift b/test/Constraints/diagnostics.swift
@@ -303,7 +303,7 @@ _ = 4(1)  // expected-error {{cannot call value of non-function type 'Int'}}
 // <rdar://problem/21784170> Incongruous `unexpected trailing closure` error in `init` function which is cast and called without trailing closure.
 func rdar21784170() {
   let initial = (1.0 as Double, 2.0 as Double)
-  (Array.init as (Double...) -> Array<Double>)(initial as (Double, Double)) // expected-error {{cannot convert value of type '(Double, Double)' to expected argument type 'Double'}}
+  (Array.init as (Double...) -> Array<Double>)(initial as (Double, Double)) // expected-error {{cannot convert value of type '(Double, Double)' to expected argument type 'Double'}} // expected-warning {{redundant cast to '(Double, Double)' has no effect}} {{56-75=}}
 }
 
 // Diagnose passing an array in lieu of variadic parameters
diff --git a/test/Constraints/invalid_logicvalue_coercion.swift b/test/Constraints/invalid_logicvalue_coercion.swift
@@ -2,7 +2,7 @@
 
 class C {}
 var c = C()
-if c as C { // expected-error{{cannot convert value of type 'C' to expected condition type 'Bool'}}
+if c as C { // expected-error{{cannot convert value of type 'C' to expected condition type 'Bool'}} expected-warning {{redundant cast to 'C' has no effect}} {{6-11=}}
 }
 
 if ({1} as () -> Int) { // expected-error{{cannot convert value of type '() -> Int' to expected condition type 'Bool'}}
diff --git a/test/Generics/generic_types.swift b/test/Generics/generic_types.swift
@@ -191,11 +191,11 @@ var xarray : XArray = [1, 2, 3]
 // Type parameters can be referenced only via unqualified name lookup
 struct XParam<T> { // expected-note{{'XParam' declared here}}
   func foo(_ x: T) {
-    _ = x as T
+    _ = x as T // expected-warning {{redundant cast to 'T' has no effect}} {{11-16=}}
   }
 
   static func bar(_ x: T) {
-    _ = x as T
+    _ = x as T // expected-warning {{redundant cast to 'T' has no effect}} {{11-16=}}
   }
 }
 
diff --git a/test/Interpreter/SDK/misc_osx.swift b/test/Interpreter/SDK/misc_osx.swift
@@ -6,7 +6,8 @@ import CoreServices
 
 func testFSEventStreamRef(stream: FSEventStreamRef) {
   // FIXME: These should be distinct types, constructible from one another.
-  _ = stream as ConstFSEventStreamRef // works by coincidence because both are currently OpaquePointer
+  // works by coincidence because both are currently OpaquePointer 
+  _ = stream as ConstFSEventStreamRef // expected-warning {{redundant cast from 'FSEventStreamRef' (aka 'OpaquePointer') to 'ConstFSEventStreamRef' (aka 'OpaquePointer') has no effect}} {{14-39=}}
   _ = ConstFSEventStreamRef(stream) // expected-error {{cannot invoke initializer for type 'ConstFSEventStreamRef' with an argument list of type '(FSEventStreamRef)'}}
   // expected-note @-1 {{overloads for 'ConstFSEventStreamRef' exist with these partially matching parameter lists:}}
 
diff --git a/test/Sema/diag_unintended_optional_behavior.swift b/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())
diff --git a/test/Sema/suppress-argument-labels-in-types.swift b/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 '(Int, Int) -> Int' has no effect}}
+  _ = (f1 as Magic)(0, 1) // expected-warning {{redundant cast to '(Int, Int) -> Int' has no effect}}
 
   _ = (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 '() -> Int?' has no effect}}
   _ = (iuoReturning as () -> Int)() // expected-error {{cannot convert value of type '() -> Int?' to type '() -> Int' in coercion}}
 }
diff --git a/test/decl/protocol/req/optional.swift b/test/decl/protocol/req/optional.swift
diff --git a/test/expr/cast/array_downcast.swift b/test/expr/cast/array_downcast.swift
diff --git a/test/stdlib/StringDiagnostics.swift b/test/stdlib/StringDiagnostics.swift
diff --git a/test/type/subclass_composition.swift b/test/type/subclass_composition.swift

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,13 @@ func testSuppressed() {`
`53`	`53`	`#endif`
`54`	`54`
`55`	`55`	`func testMacro() {`
`56`		`- _ = CONSTANT as CInt`
	`56`	`+ _ = CONSTANT as CInt // expected-warning {{redundant cast to 'CInt' (aka 'Int32') has no effect}} {{16-24=}}`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func testFoundationOverlay() {`
`60`	`60`	`_ = NSUTF8StringEncoding // no ambiguity`
`61`		`- _ = NSUTF8StringEncoding as UInt // and we should get the overlay version`
	`61`	`+ // and we should get the overlay version`
	`62`	`+ _ = NSUTF8StringEncoding as UInt // expected-warning {{redundant cast to 'UInt' has no effect}} {{28-36=}}`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`#if !SILGEN`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,9 @@ func testTollFree1(_ ccmduct: CCMutableDuct) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func testChainedAliases(_ fridge: CCRefrigerator) {`
`93`		`- _ = fridge as CCRefrigerator`
	`93`	`+ _ = fridge as CCRefrigerator // expected-warning {{redundant cast to 'CCRefrigerator' has no effect}} {{14-32=}}`
`94`	`94`
`95`		`- _ = fridge as CCFridge`
	`95`	`+ _ = fridge as CCFridge // expected-warning {{redundant cast to 'CCFridge' (aka 'CCRefrigerator') has no effect}} {{14-26=}}`
`96`	`96`	`_ = fridge as CCFridgeRef // expected-error{{'CCFridgeRef' has been renamed to 'CCFridge'}} {{17-28=CCFridge}}`
`97`	`97`	`}`
`98`	`98`