Merge pull request #77055 from tshortli/source-ranges-are-weird

Sema: Fix source ranges for string literals in TypeRefinementContext

Author: tshortli

lib/AST/TypeRefinementContext.cpp

@@ -526,6 +526,7 @@ verificationError(ASTContext &ctx, llvm::StringRef msg,
     auto context = std::get<1>(pair);
     llvm::errs() << label << ":\n";
     context->print(llvm::errs(), ctx.SourceMgr);
+    llvm::errs() << "\n";
   }
   abort();
 }
@@ -570,18 +571,20 @@ void TypeRefinementContext::verify(const TypeRefinementContext *parent,
   if (!SrcRange.isValid())
     verificationError(ctx, "invalid source range", {{"node", this}});
 
+  // Child nodes must be contained by their parents in all dimensions (source
+  // range, introduction version, etc).
   if (getReason() != Reason::Root) {
     auto parentRange = parent->SrcRange;
     if (parentRange.isValid() &&
         !(srcMgr.isAtOrBefore(parentRange.Start, SrcRange.Start) &&
           srcMgr.isAtOrBefore(SrcRange.End, parentRange.End)))
       verificationError(ctx, "child source range not contained",
-                        {{"child", this}, {"parent", this}});
+                        {{"child", this}, {"parent", parent}});
   }
 
   if (!AvailabilityInfo.isContainedIn(parent->AvailabilityInfo))
     verificationError(ctx, "child availability range not contained",
-                      {{"child", this}, {"parent", this}});
+                      {{"child", this}, {"parent", parent}});
 }
 
 void TypeRefinementContext::verify(ASTContext &ctx) {

lib/Sema/TypeCheckAvailability.cpp

@@ -782,10 +782,12 @@ class TypeRefinementContextBuilder : private ASTWalker {
     // it.
     assert(D->getSourceRange().isValid());
 
+    auto &Context = D->getASTContext();
+    SourceRange Range;
     if (auto *storageDecl = dyn_cast<AbstractStorageDecl>(D)) {
       // Use the declaration's availability for the context when checking
       // the bodies of its accessors.
-      SourceRange Range = storageDecl->getSourceRange();
+      Range = storageDecl->getSourceRange();
 
       // HACK: For synthesized trivial accessors we may have not a valid
       // location for the end of the braces, so in that case we will fall back
@@ -797,11 +799,12 @@ class TypeRefinementContextBuilder : private ASTWalker {
       if (BracesRange.isValid()) {
         Range.widen(BracesRange);
       }
-
-      return Range;
+    } else {
+      Range = D->getSourceRangeIncludingAttrs();
     }
 
-    return D->getSourceRangeIncludingAttrs();
+    Range.End = Lexer::getLocForEndOfToken(Context.SourceMgr, Range.End);
+    return Range;
   }
 
   // Creates an implicit decl TRC specifying the deployment
@@ -827,7 +830,7 @@ class TypeRefinementContextBuilder : private ASTWalker {
       if (auto bodyStmt = tlcd->getBody()) {
         pushDeclBodyContext(
             tlcd, {{bodyStmt, createImplicitDeclContextForDeploymentTarget(
-                                  tlcd, tlcd->getSourceRange())}});
+                                  tlcd, refinementSourceRangeForDecl(tlcd))}});
       }
       return;
     }

test/Sema/availability_refinement_contexts.swift

@@ -299,6 +299,18 @@ var someComputedGlobalVar: Int {
   set { }
 }
 
+// CHECK-NEXT: {{^}}  (decl_implicit version=50 decl=interpolated
+// CHECK-NEXT: {{^}}    (decl_implicit version=50 decl=string
+
+func testStringInterpolation() {
+  let interpolated = """
+    \([""].map {
+      let string = $0
+      return string
+    })
+    """
+}
+
 // CHECK-NEXT: {{^}}  (decl version=51 decl=FinalDecl
 
 @available(OSX 51, *)