Merge pull request #30809 from slavapestov/curry-thunk-source-range-fix

Sema: Fix source range for curry thunks

Author: slavapestov

lib/SIL/IR/SILProfiler.cpp

@@ -68,12 +68,6 @@ static bool isUnmapped(ASTNode N) {
         LLVM_DEBUG(llvm::dbgs() << "Skipping ASTNode: implicit closure expr\n");
         return true;
       }
-
-      if (isa<AutoClosureExpr>(CE) &&
-          cast<AutoClosureExpr>(CE)->getThunkKind() != AutoClosureExpr::Kind::None) {
-        LLVM_DEBUG(llvm::dbgs() << "Skipping ASTNode: curry thunk expr\n");
-        return true;
-      }
     }
 
     // Map all other kinds of expressions.

lib/Sema/CSApply.cpp

@@ -927,20 +927,31 @@ namespace {
       }
 
       // (Self) -> ...
-      auto *selfCall =
-        CallExpr::createImplicit(context, ref, selfOpenedRef, { },
-                                 [&](const Expr *E) { return cs.getType(E); });
-      selfCall->setType(refTy->getResult());
-      cs.cacheType(selfCall->getArg());
-      cs.cacheType(selfCall);
-
-      // FIXME: This is a holdover from the old tuple-based function call
-      // representation.
-      auto selfArgTy = ParenType::get(context,
-                                      selfParam.getPlainType(),
-                                      selfParam.getParameterFlags());
-      selfCall->getArg()->setType(selfArgTy);
-      cs.cacheType(selfCall->getArg());
+      ApplyExpr *selfCall;
+
+      // We build either a CallExpr or a DotSyntaxCallExpr depending on whether
+      // the base is implicit or not. This helps maintain some invariants around
+      // source ranges.
+      if (selfParamRef->isImplicit()) {
+          selfCall =
+            CallExpr::createImplicit(context, ref, selfOpenedRef, { },
+                                     [&](const Expr *E) { return cs.getType(E); });
+        selfCall->setType(refTy->getResult());
+        cs.cacheType(selfCall);
+
+        // FIXME: This is a holdover from the old tuple-based function call
+        // representation.
+        auto selfArgTy = ParenType::get(context,
+                                        selfParam.getPlainType(),
+                                        selfParam.getParameterFlags());
+        selfCall->getArg()->setType(selfArgTy);
+        cs.cacheType(selfCall->getArg());
+      } else {
+        selfCall = new (context) DotSyntaxCallExpr(ref, SourceLoc(), selfOpenedRef);
+        selfCall->setImplicit(false);
+        selfCall->setType(refTy->getResult());
+        cs.cacheType(selfCall);
+      }
 
       if (selfParamRef->isSuperExpr())
         selfCall->setIsSuper(true);

validation-test/compiler_crashers_2_fixed/sr12496.swift

@@ -0,0 +1,6 @@
+// RUN: %target-swift-emit-silgen %s
+
+class Foo {
+  init(f: @escaping () -> String = String.init) {
+  }
+}