Update some tests

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -7778,7 +7778,7 @@ void ConstraintSystem::addExplicitConversionConstraint(
 
   auto locatorPtr = getConstraintLocator(locator);
   auto coerceLocator = [&]() {
-    if (addCoercionPathElt) {
+    if (addCoercionPathElt && shouldAttemptFixes()) {
       if (auto *expr = dyn_cast_or_null<CoerceExpr>(locator.getAnchor())) {
         // Only adding this path for explicty coercions e.g _ = a as Int
         // and also only for left-side is a DeclRefExpr or a

test/Constraints/bridging.swift

@@ -292,7 +292,7 @@ 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{{cannot convert value of type 'NSString?' to expected argument type 'String?'}}{{21-21= as String?}}
-  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 {{casting expression to 'String' doesn't change the type}} {{34-44=}}
 
   let s3: NSString? = "str" as String? // expected-error {{cannot convert value of type 'String?' to specified type 'NSString?'}}{{39-39= as NSString?}}
 
@@ -346,7 +346,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 {{casting expression to 'AnyObject' doesn't change the type}} {{9-22=}}
   z = h as AnyObject
 
   z = a // expected-error{{does not conform to 'AnyObject'}}

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 {{casting expression to 'Float' doesn't change the type}} {{32-41=}}
 var f2: (B) -> Bool = { $0 is D }
 
 func metatype_casts<T, U>(_ b: B.Type, t:T.Type, u: U.Type) {

test/Constraints/construction.swift

@@ -92,15 +92,15 @@ _ = 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 {{casting expression to 'Int' doesn't change the type}} {{7-14=}}
 Z(z) // expected-error{{cannot invoke initializer for type 'Z' with an argument list of type '(Z)'}}
 // expected-note @-1 {{overloads for 'Z' exist with these partially matching parameter lists: (String), (UnicodeScalar)}}
 
 Z.init(z)  // expected-error {{cannot invoke 'Z.Type.init' with an argument list of type '(Z)'}}
 // expected-note @-1 {{overloads for 'Z.Type.init' exist with these partially matching parameter lists: (String), (UnicodeScalar)}}
 
 
-_ = z as Z
+_ = z as Z // expected-warning {{casting expression to 'Z' doesn't change the type}} {{7-12=}}
 
 // Construction from inouts.
 struct FooRef { }

test/Constraints/diagnostics.swift

@@ -297,7 +297,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 {{casting expression to '(Double, Double)' doesn't change the type}} {{56-75=}}
 }
 
 // <rdar://problem/21829141> BOGUS: unexpected trailing closure

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> {
   func foo(_ x: T) {
-    _ = x as T // expected-warning {{casting expression to 'T' doesn't change the type}} {{11-16}}
+    _ = x as T // expected-warning {{casting expression to 'T' doesn't change the type}} {{11-16=}}
   }
 
   static func bar(_ x: T) {
-    _ = x as T // expected-warning {{casting expression to 'T' doesn't change the type}} {{11-16}}
+    _ = x as T // expected-warning {{casting expression to 'T' doesn't change the type}} {{11-16=}}
   }
 }