[cs] use simplifyLocatorToAnchor and revert changes to some test diagnostic messages

Author: Suyash Srijan

lib/Sema/CSFix.cpp

@@ -73,8 +73,9 @@ bool ForceOptional::diagnose(Expr *root, bool asNote) const {
 ForceOptional *ForceOptional::create(ConstraintSystem &cs, Type baseType,
                                      Type unwrappedType,
                                      ConstraintLocator *locator) {
-  return new (cs.getAllocator())
-      ForceOptional(cs, baseType, unwrappedType, locator);
+  return new (cs.getAllocator()) ForceOptional(
+      cs, baseType, unwrappedType,
+      cs.getConstraintLocator(simplifyLocatorToAnchor(cs, locator)));
 }
 
 bool UnwrapOptionalBase::diagnose(Expr *root, bool asNote) const {

lib/Sema/CSSimplify.cpp

@@ -2394,7 +2394,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
       if (forceUnwrapPossible) {
         conversionsOrFixes.push_back(ForceOptional::create(
             *this, objectType1, objectType1->getOptionalObjectType(),
-            getConstraintLocator(locator.getAnchor())));
+            getConstraintLocator(locator)));
       }
     }
 
@@ -2744,7 +2744,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
         subflags);
     if (result == SolutionKind::Solved) {
       auto *fix = ForceOptional::create(*this, type, optionalObjectType,
-                                        getConstraintLocator(locator.getAnchor()));
+                                        getConstraintLocator(locator));
       if (recordFix(fix)) {
         return SolutionKind::Error;
       }
@@ -3042,7 +3042,7 @@ ConstraintSystem::simplifyFunctionComponentConstraint(
   if (unwrapCount > 0) {
     auto *fix = ForceOptional::create(*this, simplifiedCopy,
                                       simplifiedCopy->getOptionalObjectType(),
-                                      getConstraintLocator(locator.getAnchor()));
+                                      getConstraintLocator(locator));
     while (unwrapCount-- > 0) {
       if (recordFix(fix))
         return SolutionKind::Error;
@@ -4668,7 +4668,7 @@ ConstraintSystem::simplifyApplicableFnConstraint(
     // Record any fixes we attempted to get to the correct solution.
     auto *fix = ForceOptional::create(*this, origType2,
                                       origType2->getOptionalObjectType(),
-                                      getConstraintLocator(locator.getAnchor()));
+                                      getConstraintLocator(locator));
     while (unwrapCount-- > 0) {
       if (recordFix(fix))
         return SolutionKind::Error;
@@ -4693,7 +4693,7 @@ ConstraintSystem::simplifyApplicableFnConstraint(
     if (simplified == SolutionKind::Solved) {
       auto *fix = ForceOptional::create(*this, origType2,
                                         origType2->getOptionalObjectType(),
-                                        getConstraintLocator(locator.getAnchor()));
+                                        getConstraintLocator(locator));
       while (unwrapCount-- > 0) {
         if (recordFix(fix))
           return SolutionKind::Error;

test/Constraints/closures.swift

@@ -295,9 +295,9 @@ func simplified1069() {
     func genericallyNonOptional<T: AnyObject>(_ a: T, _ b: T, _ c: T) { }
 
     func f(_ a: C?, _ b: C?, _ c: C) {
-      genericallyNonOptional(a, b, c) // expected-error {{value of optional type 'C?' must be unwrapped to a value of type 'C'}}
-      // expected-note @-1 {{coalesce}}
-      // expected-note @-2 {{force-unwrap}}
+      genericallyNonOptional(a, b, c) // expected-error 2{{value of optional type 'C?' must be unwrapped to a value of type 'C'}}
+      // expected-note @-1 2{{coalesce}}
+      // expected-note @-2 2{{force-unwrap}}
     }
   }
 }

test/Constraints/fixes.swift

@@ -160,9 +160,7 @@ struct S1116 {
 }
 
 let a1116: [S1116] = []
-var s1116 = Set(1...10).subtracting(a1116.map({ $0.s })) // expected-error {{value of optional type 'Int?' must be unwrapped to a value of type 'Int'}}
-                                                        // expected-note@-1{{force-unwrap}}
-                                                       // expected-note@-2{{coalesce}}
+var s1116 = Set(1...10).subtracting(a1116.map({ $0.s })) // expected-error {{cannot convert value of type '[Int?]' to expected argument type 'Set<Int>'}}
 
 
 func moreComplexUnwrapFixes() {
@@ -204,16 +202,22 @@ func moreComplexUnwrapFixes() {
   // expected-note@-4{{force-unwrap using '!'}}{{17-17=!}}
 
   takeNon(os?.value) // expected-error{{value of optional type 'Int?' must be unwrapped to a value of type 'Int'}}
-  // expected-note@-1{{force-unwrap using '!'}}{{21-21=!}}
+  // expected-note@-1{{force-unwrap using '!'}}{{13-14=!}}
   // expected-note@-2{{coalesce}}
   takeNon(os?.optValue) // expected-error{{value of optional type 'Int?' must be unwrapped to a value of type 'Int'}}
-  // expected-note@-1{{force-unwrap using '!'}}{{24-24=!}}
+  // expected-note@-1{{force-unwrap using '!'}}{{11-11=(}} {{23-23=)!}}
   // expected-note@-2{{coalesce}}
 
   func sample(a: Int?, b: Int!) {
     let aa = a
+    // expected-note@-1{{short-circuit using 'guard'}}{{5-5=guard }} {{15-15= else \{ return \}}}
+    // expected-note@-2{{force-unwrap}}
+    // expected-note@-3{{coalesce}}
 
-    let bb = b
+    let bb = b // expected-note{{value inferred to be type 'Int?' when initialized with an implicitly unwrapped value}}
+    // expected-note@-1{{short-circuit using 'guard'}}{{5-5=guard }} {{15-15= else \{ return \}}}
+    // expected-note@-2{{force-unwrap}}
+    // expected-note@-3{{coalesce}}
 
     let cc = a
 
@@ -282,4 +286,4 @@ let _: Int = thing?.e?.a() // expected-error {{value of optional type 'Int?' mus
 // expected-note@-2{{force-unwrap}}
 let _: Int? = thing?.e?.b // expected-error {{value of optional type 'Int??' must be unwrapped to a value of type 'Int?'}}
 // expected-note@-1{{coalesce}}
-// expected-note@-2{{force-unwrap}}
+// expected-note@-2{{force-unwrap}}