Merge pull request #39076 from varungandhi-apple/vg-concurrency-mangling

[IRGen] Support back-deployment of concurrency-related function types.

Author: varungandhi-apple

lib/IRGen/GenReflection.cpp

@@ -191,6 +191,17 @@ swift::irgen::getRuntimeVersionThatSupportsDemanglingType(CanType type) {
     // guards, so we don't need to limit availability of mangled names
     // involving them.
   }
+
+  bool needsConcurrency = type.findIf([](CanType t) -> bool {
+    if (auto fn = dyn_cast<AnyFunctionType>(t)) {
+      return fn->isAsync() || fn->isSendable() || fn->hasGlobalActor();
+    }
+    return false;
+  });
+  if (needsConcurrency) {
+    return llvm::VersionTuple(5, 5);
+  }
+
   return None;
 }
 

test/Concurrency/Backdeploy/mangling.swift

@@ -0,0 +1,70 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend %s -target x86_64-apple-macosx12.0 -module-name main -emit-ir -o %t/new.ir
+// RUN: %FileCheck %s --check-prefix=NEW < %t/new.ir
+// RUN: %target-swift-frontend %s -target x86_64-apple-macosx10.15 -module-name main -emit-ir -o %t/old.ir -disable-availability-checking
+// RUN: %FileCheck %s --check-prefix=OLD < %t/old.ir
+
+// Check that we add extra type metadata accessors for new kinds of functions
+// when back-deploying. These are used instead of using demangling cache
+// variables since old runtimes cannot synthesize type metadata based on the
+// new mangling.
+
+// RUN: %target-build-swift -target x86_64-apple-macosx10.15 %s -o %t/test_mangling -Xfrontend -disable-availability-checking
+// RUN: %target-run %t/test_mangling
+
+// REQUIRES: OS=macosx
+// REQUIRES: executable_test
+
+protocol MyProtocol {
+  associatedtype AssocSendable
+  associatedtype AssocAsync
+  associatedtype AssocGlobalActor
+}
+
+typealias SendableFn = @Sendable () -> Void
+typealias AsyncFn = () async -> Void
+typealias GlobalActorFn = @MainActor () -> Void
+
+struct MyStruct: MyProtocol {
+  typealias AssocSendable = SendableFn
+  typealias AssocAsync = AsyncFn
+  typealias AssocGlobalActor = GlobalActorFn
+}
+
+func assocSendable<T: MyProtocol>(_: T.Type) -> Any.Type { return T.AssocSendable.self }
+func assocAsync<T: MyProtocol>(_: T.Type) -> Any.Type { return T.AssocAsync.self }
+func assocGlobalActor<T: MyProtocol>(_: T.Type) -> Any.Type { return T.AssocGlobalActor.self }
+
+assert(assocSendable(MyStruct.self) == SendableFn.self)
+assert(assocAsync(MyStruct.self) == AsyncFn.self)
+assert(assocGlobalActor(MyStruct.self) == GlobalActorFn.self)
+
+// type metadata accessor for @Sendable () -> ()
+// OLD: define linkonce_odr hidden swiftcc %swift.metadata_response @"$syyYbcMa"
+// NEW-NOT: define linkonce_odr hidden swiftcc %swift.metadata_response @"$syyYbcMa"
+
+// type metadata accessor for () async -> ()
+// OLD: define linkonce_odr hidden swiftcc %swift.metadata_response @"$syyYacMa"
+// NEW-NOT: define linkonce_odr hidden swiftcc %swift.metadata_response @"$syyYacMa"
+
+// type metadata accessor for @MainActor () -> ()
+// OLD: define linkonce_odr hidden swiftcc %swift.metadata_response @"$syyScMYccMa"
+// NEW-NOT: define linkonce_odr hidden swiftcc %swift.metadata_response @"$syyScMYccMa"
+
+// OLD: call swiftcc %swift.metadata_response @"$syyYbcMa"
+// OLD-NOT: call %swift.type* @__swift_instantiateConcreteTypeFromMangledName({ i32, i32 }* @"$syyYbcMD")
+
+// NEW-NOT: call swiftcc %swift.metadata_response @"$syyYbcMa"
+// NEW: call %swift.type* @__swift_instantiateConcreteTypeFromMangledName({ i32, i32 }* @"$syyYbcMD")
+
+// OLD: call swiftcc %swift.metadata_response @"$syyYacMa"
+// OLD-NOT: %swift.type* @__swift_instantiateConcreteTypeFromMangledName({ i32, i32 }* @"$syyYacMD")
+
+// NEW-NOT: call swiftcc %swift.metadata_response @"$syyYacMa"
+// NEW: call %swift.type* @__swift_instantiateConcreteTypeFromMangledName({ i32, i32 }* @"$syyYacMD")
+
+// OLD: call swiftcc %swift.metadata_response @"$syyScMYccMa"
+// OLD-NOT: call %swift.type* @__swift_instantiateConcreteTypeFromMangledName({ i32, i32 }* @"$syyScMYccMD")
+
+// NEW-NOT: call swiftcc %swift.metadata_response @"$syyScMYccMa"
+// NEW: call %swift.type* @__swift_instantiateConcreteTypeFromMangledName({ i32, i32 }* @"$syyScMYccMD")

test/Reflection/typeref_decoding_concurrency.swift

@@ -3,14 +3,19 @@
 // REQUIRES: concurrency
 // REQUIRES: libdispatch
 
+// REQUIRES: OS=macosx
+
 // rdar://76038845
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
 // RUN: %empty-directory(%t)
 
-// RUN: %target-build-swift -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcurrencyTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect)
-// RUN: %target-build-swift -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcurrencyTypes.swift %S/Inputs/main.swift -emit-module -emit-executable -module-name TypesToReflect -o %t/TypesToReflect
+// RUN: %target-build-swift -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcurrencyTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect) -target x86_64-apple-macosx12.0
+// RUN: %target-build-swift -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcurrencyTypes.swift %S/Inputs/main.swift -emit-module -emit-executable -module-name TypesToReflect -o %t/TypesToReflect -target x86_64-apple-macosx12.0
+
+// For macOS versions before 12.0, the mangling for concurrency-related
+// types cannot be used to create type metadata.
 
 // RUN: %target-swift-reflection-dump -binary-filename %t/%target-library-name(TypesToReflect) | %FileCheck %s
 // RUN: %target-swift-reflection-dump -binary-filename %t/TypesToReflect | %FileCheck %s