Merge pull request swiftlang#26544 from owenv/appendInterpolation_sou…

…rce_locs Assign a SourceLoc to implicit appendInterpolation calls for diagnostics
athas · Aug 19, 2019 · a2b8826 · a2b8826
2 parents 971fb0a + 686e4a6
commit a2b8826
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
@@ -1855,11 +1855,11 @@ parseStringSegments(SmallVectorImpl<Lexer::StringSegment> &Segments,
       TokReceiver->registerTokenKindChange(Tok.getLoc(),
                                            tok::string_interpolation_anchor);
 
-      auto callee = new (Context) UnresolvedDotExpr(InterpolationVarRef,
-                                                    /*dotloc=*/BackSlashLoc,
-                                                    appendInterpolation,
-                                                    /*nameloc=*/DeclNameLoc(),
-                                                    /*Implicit=*/true);
+      auto callee = new (Context)
+          UnresolvedDotExpr(InterpolationVarRef,
+                            /*dotloc=*/BackSlashLoc, appendInterpolation,
+                            /*nameloc=*/DeclNameLoc(Segment.Loc),
+                            /*Implicit=*/true);
       auto S = parseExprCallSuffix(makeParserResult(callee), true);
 
       // If we stopped parsing the expression before the expression segment is

diff --git a/test/Sema/diag_deprecated_string_interpolation.swift b/test/Sema/diag_deprecated_string_interpolation.swift
@@ -0,0 +1,24 @@
+// RUN: %target-swift-frontend -swift-version 5 -typecheck %s 2>&1 | %FileCheck %s
+
+extension DefaultStringInterpolation {
+    @available(*, deprecated) func appendInterpolation(deprecated: Int) {}
+}
+
+// Make sure diagnostics emitted via string interpolations have a reasonable source location
+
+_ = "\(deprecated: 42)"
+// CHECK: [[@LINE-1]]:7: warning: 'appendInterpolation(deprecated:)' is deprecated
+
+_ = "hello, world\(deprecated: 42)!!!"
+// CHECK: [[@LINE-1]]:19: warning: 'appendInterpolation(deprecated:)' is deprecated
+
+_ = "\(42)\(deprecated: 42)test\(deprecated: 42)"
+// CHECK: [[@LINE-1]]:12: warning: 'appendInterpolation(deprecated:)' is deprecated
+// CHECK: [[@LINE-2]]:33: warning: 'appendInterpolation(deprecated:)' is deprecated
+
+_ = """
+This is a multiline literal with a deprecated interpolation:
+
+\(deprecated: 42)
+"""
+// CHECK: [[@LINE-2]]:2: warning: 'appendInterpolation(deprecated:)' is deprecated