Merge pull request #62646 from DougGregor/global-actor-formal-metatype

Author: DougGregor

lib/SILGen/SILGenPoly.cpp

@@ -521,7 +521,7 @@ ManagedValue Transform::transform(ManagedValue v,
       } else if (inputSubstType->isSet()) {
         fn = SGF.SGM.getSetUpCast(Loc);
       } else {
-        llvm_unreachable("unsupported collection upcast kind");
+        llvm::report_fatal_error("unsupported collection upcast kind");
       }
 
       return SGF.emitCollectionConversion(Loc, fn, inputSubstType,

lib/SILGen/SILGenProlog.cpp

@@ -897,13 +897,13 @@ SILValue SILGenFunction::emitLoadGlobalActorExecutor(Type globalActor) {
     ? MetatypeRepresentation::Thick
     : MetatypeRepresentation::Thin;
 
-  ManagedValue actorMetaType =
+  CanType actorMetaType = CanMetatypeType::get(actorType, metaRepr);
+  ManagedValue actorMetaTypeValue =
     ManagedValue::forUnmanaged(B.createMetatype(loc,
-      SILType::getPrimitiveObjectType(
-        CanMetatypeType::get(actorType, metaRepr))));
+      SILType::getPrimitiveObjectType(actorMetaType)));
 
-  RValue actorInstanceRV = emitRValueForStorageLoad(loc, actorMetaType,
-    actorType, /*isSuper*/ false, sharedInstanceDecl, PreparedArguments(),
+  RValue actorInstanceRV = emitRValueForStorageLoad(loc, actorMetaTypeValue,
+    actorMetaType, /*isSuper*/ false, sharedInstanceDecl, PreparedArguments(),
     subs, AccessSemantics::Ordinary, instanceType, SGFContext());
   ManagedValue actorInstance = std::move(actorInstanceRV).getScalarValue();
   return emitLoadActorExecutor(loc, actorInstance);

test/SILGen/Inputs/MeowActor.swift

@@ -1,7 +1,19 @@
 @available(SwiftStdlib 5.1, *)
 @globalActor public final class MeowActor {
   public static let shared = _Impl()
-  
+
+  public actor _Impl {
+    nonisolated
+    public func enqueue(_ job: UnownedJob) {
+      // DOES NOTHING! :)
+    }
+  }
+}
+
+@available(SwiftStdlib 5.1, *)
+@globalActor public struct HissActor {
+  public static let shared = _Impl()
+
   public actor _Impl {
     nonisolated
     public func enqueue(_ job: UnownedJob) {

test/SILGen/global-actor.swift

@@ -6,15 +6,21 @@ import MeowActor
 @available(SwiftStdlib 5.1, *)
 @MeowActor func doMeow() {}
 
+@available(SwiftStdlib 5.1, *)
+@HissActor func doHiss() {}
+
 // RUN: %target-swift-frontend  -disable-availability-checking -enable-library-evolution -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
 // RUN: %target-swift-frontend  -disable-availability-checking -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-RESILIENT %s
 // CHECK-RESILIENT: metatype $@thick MeowActor.Type
+// CHECK-RESILIENT: metatype $@thick HissActor.Type
 
 // RUN: %target-swift-frontend  -disable-availability-checking -emit-module -o %t/MeowActor.swiftmodule %S/Inputs/MeowActor.swift
 // RUN: %target-swift-frontend  -disable-availability-checking -emit-silgen %s -I %t | %FileCheck --check-prefix CHECK-FRAGILE %s
 // CHECK-FRAGILE: metatype $@thin MeowActor.Type
+// CHECK-FRAGILE: metatype $@thin HissActor.Type
 
 @available(SwiftStdlib 5.1, *)
 func someFunc() async {
   await doMeow()
-}
+  await doHiss()
+}