Merge pull request swiftlang#35995 from adrian-prantl/concurrent-prologue-locs

Author: swift-ci

lib/SILGen/SILGenProlog.cpp

@@ -468,7 +468,10 @@ void SILGenFunction::emitProlog(CaptureInfo captureInfo,
       case ActorIsolation::ActorInstance: {
         assert(selfParam && "no self parameter for ActorInstance isolation");
         ManagedValue selfArg = ManagedValue::forUnmanaged(F.getSelfArgument());
-        actor = selfArg.borrow(*this, F.getLocation()).getValue();
+        actor = selfArg
+                    .borrow(*this, RegularLocation::getAutoGeneratedLocation(
+                                       F.getLocation()))
+                    .getValue();
         break;
       }
 
@@ -492,7 +495,8 @@ void SILGenFunction::emitProlog(CaptureInfo captureInfo,
     }
   }
 
-  emitHopToCurrentExecutor(F.getLocation());
+  emitHopToCurrentExecutor(
+      RegularLocation::getAutoGeneratedLocation(F.getLocation()));
 }
 
 SILValue SILGenFunction::emitLoadActorExecutor(VarDecl *actorDecl) {
@@ -510,7 +514,7 @@ SILValue SILGenFunction::emitLoadGlobalActorExecutor(Type globalActor) {
   assert(sharedInstanceDecl && "no shared actor field in global actor");
   SubstitutionMap subs =
     actorType->getContextSubstitutionMap(SGM.SwiftModule, nominal);
-  SILLocation loc = F.getLocation();
+  SILLocation loc = RegularLocation::getAutoGeneratedLocation(F.getLocation());
   Type instanceType =
     actorType->getTypeOfMember(SGM.SwiftModule, sharedInstanceDecl);
 

test/SILGen/concurrent_prologue.swift

@@ -0,0 +1,21 @@
+// RUN: %target-swift-frontend -emit-silgen %s -module-name a -swift-version 5 -enable-experimental-concurrency -Xllvm -sil-print-debuginfo -emit-verbose-sil -parse-as-library | %FileCheck %s
+// REQUIRES: concurrency
+
+// Test that the async dispatch code in the prologue has auto-generated debug
+// locations.
+
+@MainActor func f() async -> Int {
+// CHECK: {{^sil .*}}@$s1a1fSiyYF
+// CHECK: %0 = metatype      {{.*}}loc "{{.*}}.swift":[[@LINE-2]]:17,{{.*}}:auto_gen
+// CHECK: %1 = function_ref  {{.*}}loc "{{.*}}.swift":[[@LINE-3]]:17,{{.*}}:auto_gen
+// CHECK: %2 = apply %1(%0)  {{.*}}loc "{{.*}}.swift":[[@LINE-4]]:17,{{.*}}:auto_gen
+// CHECK: begin_borrow       {{.*}}loc "{{.*}}.swift":[[@LINE-5]]:17,{{.*}}:auto_gen
+// CHECK: hop_to_executor    {{.*}}loc "{{.*}}.swift":[[@LINE-6]]:17,{{.*}}:auto_gen
+// CHECK: // end sil function '$s1a1fSiyYF'
+  return 23
+}
+@main struct Main {
+  static func main() async {
+    let x = await f();
+  }
+}