Fix the serialization of Builtin.Executor

Author: rjmccall

include/swift/Strings.h

@@ -124,7 +124,7 @@ constexpr static BuiltinNameStringLiteral BUILTIN_TYPE_NAME_JOB = {
     "Builtin.Job"};
 /// The name of the Builtin type for ExecutorRef
 constexpr static BuiltinNameStringLiteral BUILTIN_TYPE_NAME_EXECUTOR = {
-    "Builtin.ExecutorRef"};
+    "Builtin.Executor"};
 /// The name of the Builtin type for DefaultActorStorage
 constexpr static BuiltinNameStringLiteral BUILTIN_TYPE_NAME_DEFAULTACTORSTORAGE = {
     "Builtin.DefaultActorStorage"};

lib/AST/Builtins.cpp

@@ -85,6 +85,8 @@ Type swift::getBuiltinType(ASTContext &Context, StringRef Name) {
     return Context.TheJobType;
   if (Name == "DefaultActorStorage")
     return Context.TheDefaultActorStorageType;
+  if (Name == "Executor")
+    return Context.TheExecutorType;
   if (Name == "NativeObject")
     return Context.TheNativeObjectType;
   if (Name == "BridgeObject")

test/Serialization/Inputs/def_concurrency.sil

@@ -8,18 +8,28 @@ actor Act { }
 @_transparent public func serialize_all() {
 }
 
-// CHECK-LABEL: sil public_external [transparent] [serialized] @test_hop_to_executor
-sil [transparent] [serialized] @test_hop_to_executor : $@convention(thin) (@guaranteed Act) -> () {
+// CHECK-LABEL: sil public_external [transparent] [serialized] @test_hop_to_executor_actor
+sil [transparent] [serialized] @test_hop_to_executor_actor : $@convention(thin) (@guaranteed Act) -> () {
 bb0(%0 : $Act):
   // CHECK: hop_to_executor %0 : $Act
   hop_to_executor %0 : $Act
   %2 = tuple ()
   return %2 : $()
 }
 
+// CHECK-LABEL: sil public_external [transparent] [serialized] @test_hop_to_executor_builtin
+sil [transparent] [serialized] @test_hop_to_executor_builtin : $@convention(thin) (@guaranteed Builtin.Executor) -> () {
+bb0(%0 : $Builtin.Executor):
+  // CHECK: hop_to_executor %0 : $Builtin.Executor
+  hop_to_executor %0 : $Builtin.Executor
+  %2 = tuple ()
+  return %2 : $()
+}
+
 sil [transparent] [serialized] @$s15def_concurrency13serialize_allyyF : $@convention(thin) () -> () {
 bb0:
-  %91 = function_ref @test_hop_to_executor : $@convention(thin) (@guaranteed Act) -> ()
+  %0 = function_ref @test_hop_to_executor_actor : $@convention(thin) (@guaranteed Act) -> ()
+  %1 = function_ref @test_hop_to_executor_builtin : $@convention(thin) (@guaranteed Builtin.Executor) -> ()
 
   %r = tuple ()
   return %r : $()