Use CloseQuoteBegin

Author: David Ungar

lib/Parse/ParseExpr.cpp

@@ -2039,10 +2039,8 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
     // Return an error, but include an empty InterpolatedStringLiteralExpr
     // so that parseDeclPoundDiagnostic() can figure out why this string
     // literal was bad.
-    return makeParserErrorResult(
-        new (Context) InterpolatedStringLiteralExpr(Loc,
-                                                    EndLoc.getAdvancedLoc(-1),
-                                                    0, 0, nullptr));
+    return makeParserErrorResult(new (Context) InterpolatedStringLiteralExpr(
+        Loc, Loc.getAdvancedLoc(CloseQuoteBegin), 0, 0, nullptr));
   }
 
   unsigned LiteralCapacity = 0;
@@ -2095,7 +2093,7 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
   }
 
   return makeParserResult(Status, new (Context) InterpolatedStringLiteralExpr(
-                                      Loc, EndLoc.getAdvancedLoc(-1),
+                                      Loc, Loc.getAdvancedLoc(CloseQuoteBegin),
                                       LiteralCapacity, InterpolationCount,
                                       AppendingExpr));
 }