Merge pull request #36837 from DougGregor/demangle-concurrency-builtin-types

Author: swift-ci

include/swift/Runtime/BuiltinTypes.def

@@ -60,6 +60,11 @@ BUILTIN_TYPE(BB, "Builtin.UnsafeValueBuffer")
 // shaped like AnyObject (normal mangling yXl).
 BUILTIN_POINTER_TYPE(BO, "Builtin.UnknownObject")
 
+BUILTIN_POINTER_TYPE(Bc, "Builtin.RawUnsafeContinuation")
+BUILTIN_TYPE(BD, "Builtin.DefaultActorStorage")
+BUILTIN_TYPE(Be, "Builtin.Executor")
+BUILTIN_POINTER_TYPE(Bj, "Builtin.Job")
+
 // Int8 vector types
 BUILTIN_VECTOR_TYPE(Bi8_, Int8, 2)
 BUILTIN_VECTOR_TYPE(Bi8_, Int8, 3)

lib/Demangling/Demangler.cpp

@@ -1146,6 +1146,10 @@ NodePointer Demangler::demangleBuiltinType() {
       Ty = createNode(Node::Kind::BuiltinTypeName,
                               BUILTIN_TYPE_NAME_UNSAFEVALUEBUFFER);
       break;
+    case 'e':
+      Ty = createNode(Node::Kind::BuiltinTypeName,
+                              BUILTIN_TYPE_NAME_EXECUTOR);
+      break;
     case 'f': {
       int size = demangleIndex() - 1;
       if (size <= 0 || size > maxTypeSize)

lib/Demangling/Remangler.cpp

@@ -753,6 +753,8 @@ void Remangler::mangleBuiltinTypeName(Node *node) {
     Buffer << 'j';
   } else if (text == BUILTIN_TYPE_NAME_DEFAULTACTORSTORAGE) {
     Buffer << 'D';
+  } else if (text == BUILTIN_TYPE_NAME_EXECUTOR) {
+    Buffer << 'e';
   } else if (text == BUILTIN_TYPE_NAME_SILTOKEN) {
     Buffer << 't';
   } else if (text == BUILTIN_TYPE_NAME_INTLITERAL) {

lib/IRGen/MetadataRequest.cpp

@@ -1745,7 +1745,7 @@ namespace {
       llvm_unreachable("error type should not appear in IRGen");
     }
 
-    // These types are artificial types used for for internal purposes and
+    // These types are artificial types used for internal purposes and
     // should never appear in a metadata request.
 #define INTERNAL_ONLY_TYPE(ID)                                               \
     MetadataResponse visit##ID##Type(Can##ID##Type type,                     \

stdlib/public/runtime/KnownMetadata.cpp

@@ -22,6 +22,11 @@
 #include <cstring>
 #include <climits>
 
+namespace swift {
+class AsyncTask;
+class Job;
+}
+
 using namespace swift;
 using namespace metadataimpl;
 
@@ -80,6 +85,19 @@ namespace ctypes {
     /// with this, but the type isn't copyable, so most of the value
     /// operations are meaningless.
     using BB = ValueBuffer;
+
+    // Types that are defined in the _Concurrency library
+
+    // Default actor storage type.
+    struct alignas(2 * alignof(void*)) BD {
+      void *storage[NumWords_DefaultActor];
+    };
+
+    // ExecutorRef type.
+    struct Be {
+      HeapObject *Identity;
+      uintptr_t Implementation;
+    };
   }
 }
 
@@ -94,6 +112,12 @@ namespace pointer_types {
     /// The value-witness table for BridgeObject.
     using Bb = BridgeObjectBox;
 
+    // RawUnsafeContinuation type.
+    using Bc = RawPointerBox;
+
+    // Job type.
+    using Bj = RawPointerBox;
+
 #if SWIFT_OBJC_INTEROP
     /*** Objective-C pointers *************************************************/
 

test/Runtime/demangleToMetadata.swift

@@ -244,6 +244,11 @@ DemangleToMetadataTests.test("demangle built-in types") {
   expectEqual(Builtin.FPIEEE64.self, _typeByName("Bf64_")!)
 
   expectEqual(Builtin.Vec4xFPIEEE32.self, _typeByName("Bf32_Bv4_")!)
+
+  expectEqual(Builtin.RawUnsafeContinuation.self, _typeByName("Bc")!)
+  expectEqual(Builtin.Executor.self, _typeByName("Be")!)
+  expectNotNil(_typeByName("BD"))
+  expectEqual(Builtin.Job.self, _typeByName("Bj")!)
 }
 
 class CG4<T: P1, U: P2> {