fix <rdar://problem/27650521> Fixits for escaping closure parameters are inserted into wrong location

Author: lattner

lib/Sema/MiscDiagnostics.cpp

@@ -472,7 +472,8 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,
       if (paramDecl && !isAutoClosure) {
         TC.diagnose(paramDecl->getStartLoc(), diag::noescape_parameter,
                     paramDecl->getName())
-            .fixItInsert(paramDecl->getTypeLoc().getLoc(), "@escaping ");
+            .fixItInsert(paramDecl->getTypeLoc().getSourceRange().Start,
+                         "@escaping ");
       } else if (isAutoClosure)
         // TODO: add in a fixit for autoclosure
         TC.diagnose(DRE->getDecl()->getLoc(), diag::noescape_autoclosure,

lib/Sema/TypeCheckCaptures.cpp

@@ -165,7 +165,8 @@ class FindCapturedVars : public ASTWalker {
       if (paramDecl && !isAutoClosure) {
         TC.diagnose(paramDecl->getStartLoc(), diag::noescape_parameter,
                     paramDecl->getName())
-            .fixItInsert(paramDecl->getTypeLoc().getLoc(), "@escaping ");
+            .fixItInsert(paramDecl->getTypeLoc().getSourceRange().Start,
+                         "@escaping ");
       } else if (isAutoClosure) {
         // TODO: add in a fixit for autoclosure
         TC.diagnose(VD->getLoc(), diag::noescape_autoclosure, VD->getName());

test/attr/attr_noescape.swift

@@ -10,9 +10,9 @@ func takesGenericClosure<T>(_ a : Int, _ fn : @noescape () -> T) {}
 
 
 func takesNoEscapeClosure(_ fn : () -> Int) {
-  // expected-note@-1{{parameter 'fn' is implicitly non-escaping}}
-  // expected-note@-2{{parameter 'fn' is implicitly non-escaping}}
-  // expected-note@-3{{parameter 'fn' is implicitly non-escaping}}
+  // expected-note@-1{{parameter 'fn' is implicitly non-escaping}} {{34-34=@escaping }}
+  // expected-note@-2{{parameter 'fn' is implicitly non-escaping}} {{34-34=@escaping }}
+  // expected-note@-3{{parameter 'fn' is implicitly non-escaping}} {{34-34=@escaping }}
   takesNoEscapeClosure { 4 }  // ok
 
   _ = fn()  // ok