[cs] use anchor instead of locator, etc

Author: Suyash Srijan

lib/Sema/CSDiagnostics.cpp

@@ -591,9 +591,10 @@ bool MissingOptionalUnwrapFailure::diagnoseAsError() {
 
   auto *tryExpr = dyn_cast<OptionalTryExpr>(unwrapped);
   if (!tryExpr) {
-    auto resolvedBaseTy = BaseType ? resolveType(BaseType) : BaseType;
+    auto resolvedBaseTy =
+        resolveType(BaseType)->reconstituteSugar(/*recursive=*/true);
     auto resolvedUnwrappedTy =
-        UnwrappedType ? resolveType(UnwrappedType) : UnwrappedType;
+        resolveType(UnwrappedType)->reconstituteSugar(/*recursive=*/true);
     return diagnoseUnwrap(getConstraintSystem(), unwrapped, resolvedBaseTy,
                           resolvedUnwrappedTy);
   }

lib/Sema/CSSimplify.cpp

@@ -5409,7 +5409,12 @@ bool ConstraintSystem::recordFix(ConstraintFix *fix) {
     // This situation might happen when the same fix kind is applicable to
     // different overload choices.
     auto *loc = fix->getLocator();
+    auto *anchor = loc->getAnchor();
     auto existingFix = llvm::find_if(Fixes, [&](const ConstraintFix *e) {
+      if (e->getKind() == FixKind::ForceOptional &&
+          e->getLocator()->getAnchor() == anchor) {
+        return true;
+      }
       // If we already have a fix like this recorded, let's not do it again,
       return e->getKind() == fix->getKind() && e->getLocator() == loc;
     });

test/ClangImporter/cfuncs_parse.swift

@@ -17,7 +17,7 @@ func test_cfunc2(_ i: Int) {
 
 func test_cfunc3_a() {
   let b = cfunc3( { (a : Double, b : Double) -> Double in a + b } )
-  _ = b(1.5, 2.5) as Double // expected-error{{value of optional type 'Optional<double_bin_op_block>' (aka 'Optional<(Double, Double) -> Double>') must be unwrapped to a value of type 'double_bin_op_block' (aka '(Double, Double) -> Double')}}
+  _ = b(1.5, 2.5) as Double // expected-error{{value of optional type 'double_bin_op_block?' (aka 'Optional<(Double, Double) -> Double>') must be unwrapped to a value of type 'double_bin_op_block' (aka '(Double, Double) -> Double')}}
   // expected-note@-1{{coalesce}}
   // expected-note@-2{{force-unwrap}}
   _ = b!(1.5, 2.5) as Double
@@ -26,7 +26,7 @@ func test_cfunc3_a() {
 
 func test_cfunc3_b() {
   let b = cfunc3( { a, b in a + b } )
-  _ = b(1.5, 2.5) as Double // expected-error{{value of optional type 'Optional<double_bin_op_block>' (aka 'Optional<(Double, Double) -> Double>') must be unwrapped to a value of type 'double_bin_op_block' (aka '(Double, Double) -> Double')}}
+  _ = b(1.5, 2.5) as Double // expected-error{{value of optional type 'double_bin_op_block?' (aka 'Optional<(Double, Double) -> Double>') must be unwrapped to a value of type 'double_bin_op_block' (aka '(Double, Double) -> Double')}}
   // expected-note@-1{{coalesce}}
   // expected-note@-2{{force-unwrap}}
   _ = b!(1.5, 2.5) as Double
@@ -35,7 +35,7 @@ func test_cfunc3_b() {
 
 func test_cfunc3_c() {
   let b = cfunc3({ $0 + $1 })
-  _ = b(1.5, 2.5) as Double // expected-error{{value of optional type 'Optional<double_bin_op_block>' (aka 'Optional<(Double, Double) -> Double>') must be unwrapped to a value of type 'double_bin_op_block' (aka '(Double, Double) -> Double')}}
+  _ = b(1.5, 2.5) as Double // expected-error{{value of optional type 'double_bin_op_block?' (aka 'Optional<(Double, Double) -> Double>') must be unwrapped to a value of type 'double_bin_op_block' (aka '(Double, Double) -> Double')}}
   // expected-note@-1{{coalesce}}
   // expected-note@-2{{force-unwrap}}
   _ = b!(1.5, 2.5) as Double

test/ClangImporter/objc_parse.swift

@@ -290,7 +290,7 @@ extension Wobbler2 : NSMaybeInitWobble { // expected-error{{type 'Wobbler2' does
 
 func optionalMemberAccess(_ w: NSWobbling) {
   w.wobble()
-  w.wibble() // expected-error{{value of optional type 'Optional<() -> Void>' must be unwrapped to a value of type '() -> Void'}}
+  w.wibble() // expected-error{{value of optional type '(() -> Void)?' must be unwrapped to a value of type '() -> Void'}}
   // expected-note@-1{{coalesce}}
   // expected-note@-2{{force-unwrap}}
   let x = w[5]!!

test/Constraints/fixes.swift

@@ -93,7 +93,7 @@ func extraCall() {
   var i = 7
   i = i() // expected-error{{cannot call value of non-function type 'Int'}}{{8-10=}}
 
-  maybeFn()(5) // expected-error{{value of optional type 'Optional<((Int) -> Int)>' must be unwrapped to a value of type '(Int) -> Int'}}
+  maybeFn()(5) // expected-error{{value of optional type '((Int) -> Int)?' must be unwrapped to a value of type '(Int) -> Int'}}
   // expected-note@-1{{coalesce using '??' to provide a default when the optional value contains 'nil'}}
   // expected-note@-2{{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
 }

test/expr/delayed-ident/static_var.swift

@@ -46,7 +46,7 @@ struct HasClosure {
 var _: HasClosure = .factoryNormal(0)
 var _: HasClosure = .factoryReturnOpt(1)!
 var _: HasClosure = .factoryIUO(2)
-var _: HasClosure = .factoryOpt(3) // expected-error {{value of optional type 'Optional<((Int) -> HasClosure)>' must be unwrapped to a value of type '(Int) -> HasClosure'}}
+var _: HasClosure = .factoryOpt(3) // expected-error {{value of optional type '((Int) -> HasClosure)?' must be unwrapped to a value of type '(Int) -> HasClosure'}}
                                   // expected-note@-1{{coalesce}}
                                  // expected-note@-2{{force-unwrap}}
 var _: HasClosure = .factoryOpt!(4) // expected-error {{type of expression is ambiguous without more context}}