Merge pull request swiftlang#36301 from adrian-prantl/75012612

Support local variables in virtual async backtraces.

Author: adrian-prantl

lib/IRGen/IRGenDebugInfo.cpp

@@ -2457,7 +2457,7 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
     // limited, so using a dbg.addr instead of a dbg.declare would be more
     // appropriate.
     DBuilder.insertDeclare(Storage, Var, Expr, DL, BB);
-  } else if (InCoroContext && (Var->getArg() || Var->isArtificial())) {
+  } else if (InCoroContext) {
     // Function arguments in async functions are emitted without a shadow copy
     // (that would interfer with coroutine splitting) but with a dbg.declare to
     // give CoroSplit.cpp license to emit a shadow copy for them pointing inside

lib/IRGen/IRGenSIL.cpp

@@ -962,8 +962,7 @@ class IRGenSILFunction :
           if (ValueVariables.insert(Value).second)
             ValueDomPoints.push_back({Value, getActiveDominancePoint()});
     if (IGM.IRGen.Opts.DisableDebuggerShadowCopies ||
-        IGM.IRGen.Opts.shouldOptimize() || IsAnonymous ||
-        (CurSILFn->isAsync() && VarInfo.ArgNo) ||
+        IGM.IRGen.Opts.shouldOptimize() || IsAnonymous || CurSILFn->isAsync() ||
         isa<llvm::AllocaInst>(Storage) || isa<llvm::UndefValue>(Storage) ||
         !needsShadowCopy(Storage))
       return Storage;
@@ -991,7 +990,7 @@ class IRGenSILFunction :
     // Only do this at -O0.
     if (IGM.IRGen.Opts.DisableDebuggerShadowCopies ||
         IGM.IRGen.Opts.shouldOptimize() || IsAnonymous ||
-        (CurSILFn->isAsync() && VarInfo.ArgNo)) {
+        (CurSILFn->isAsync())) {
       auto vals = e.claimAll();
       copy.append(vals.begin(), vals.end());
 
@@ -4566,13 +4565,14 @@ void IRGenSILFunction::visitDebugValueInst(DebugValueInst *i) {
     return;
 
   IndirectionKind Indirection = DirectValue;
-  if (CurSILFn->isAsync() && VarInfo->ArgNo &&
+  if (CurSILFn->isAsync() &&
       !i->getDebugScope()->InlinedCallSite) {
-    for (auto &Val : Copy) {
-      Val = getDirectCoroutineArgument(Val);
-      assert(IGM.DebugInfo->verifyCoroutineArgument(Val) &&
-             "arg expected to be load from inside %swift.context");
-    }
+    if (VarInfo->ArgNo)
+      for (auto &Val : Copy) {
+        Val = getDirectCoroutineArgument(Val);
+        assert(IGM.DebugInfo->verifyCoroutineArgument(Val) &&
+               "arg expected to be load from inside %swift.context");
+      }
     Indirection = CoroDirectValue;
   }
 
@@ -4602,9 +4602,8 @@ void IRGenSILFunction::visitDebugValueAddrInst(DebugValueAddrInst *i) {
   auto *Addr = getLoweredAddress(SILVal).getAddress();
   SILType SILTy = SILVal->getType();
   auto RealType = SILTy.getASTType();
-  if (CurSILFn->isAsync() && VarInfo->ArgNo &&
-      !i->getDebugScope()->InlinedCallSite) {
-    if (IGM.DebugInfo)
+  if (CurSILFn->isAsync() && !i->getDebugScope()->InlinedCallSite) {
+    if (IGM.DebugInfo && VarInfo->ArgNo)
       assert(IGM.DebugInfo->verifyCoroutineArgument(Addr) &&
              "arg expected to be load from inside %swift.context");
     Indirection = CoroIndirectValue;

test/DebugInfo/async-lifetime-extension.swift

@@ -10,15 +10,15 @@
 
 // CHECK-LABEL: define {{.*}} void @"$s1a4fiboyS2iYF.resume.0"
 // CHECK-NEXT: entryresume.0:
+// CHECK-NEXT: call void @llvm.dbg.declare(metadata {{.*}}%2, metadata ![[RHS:[0-9]+]], {{.*}}!DIExpression(DW_OP
 // CHECK-NEXT: call void @llvm.dbg.declare(metadata {{.*}}%2, metadata ![[R:[0-9]+]], {{.*}}!DIExpression(DW_OP
 // CHECK-NEXT: call void @llvm.dbg.declare(metadata {{.*}}%2, metadata ![[LHS:[0-9]+]], {{.*}}!DIExpression(DW_OP
-// CHECK-NEXT: call void @llvm.dbg.declare(metadata {{.*}}%2, metadata ![[RHS:[0-9]+]], {{.*}}!DIExpression(DW_OP
 // CHECK-NEXT: call void @llvm.dbg.declare(metadata {{.*}}%2, metadata ![[N:[0-9]+]], {{.*}}!DIExpression(DW_OP
 // CHECK-NOT: {{ ret }}
 // CHECK: call void asm sideeffect ""
+// CHECK: ![[RHS]] = !DILocalVariable(name: "rhs"
 // CHECK: ![[R]] = !DILocalVariable(name: "retval"
 // CHECK: ![[LHS]] = !DILocalVariable(name: "lhs"
-// CHECK: ![[RHS]] = !DILocalVariable(name: "rhs"
 // CHECK: ![[N]] = !DILocalVariable(name: "n"
 public func fibo(_ n: Int) async -> Int {
   var retval = n

test/DebugInfo/async-local-var.swift

@@ -0,0 +1,23 @@
+// RUN: %target-swift-frontend %s -emit-ir -g -o - \
+// RUN:    -module-name a -enable-experimental-concurrency \
+// RUN:    | %FileCheck %s --check-prefix=CHECK
+// REQUIRES: concurrency
+
+// UNSUPPORTED: CPU=arm64e
+
+func getString() async -> String {
+  return ""
+}
+
+func wait() async throws {}
+
+public func makeDinner() async throws -> String {
+  let local = await getString()
+  try await wait()
+// CHECK-LABEL: define {{.*}} void @"$s1a10makeDinnerSSyYKF.resume.0"
+// CHECK-NEXT: entryresume.0:
+// CHECK-NOT: {{ ret }}
+// CHECK: call void @llvm.dbg.declare(metadata {{.*}}%2, metadata ![[LOCAL:[0-9]+]], {{.*}}!DIExpression(DW_OP_deref
+// CHECK: ![[LOCAL]] = !DILocalVariable(name: "local"
+  return local
+}