Merge pull request #25573 from aschwaighofer/runtime_avail_rework

Rework getRuntimeFn runtime availability

Author: aschwaighofer

include/swift/Runtime/RuntimeFnWrappersGen.h

@@ -38,7 +38,6 @@ llvm::Constant *getRuntimeFn(llvm::Module &Module,
                       char const *name,
                       llvm::CallingConv::ID cc,
                       RuntimeAvailability availability,
-                      ASTContext *context,
                       llvm::ArrayRef<llvm::Type*> retTypes,
                       llvm::ArrayRef<llvm::Type*> argTypes,
                       llvm::ArrayRef<llvm::Attribute::AttrKind> attrs);

include/swift/Runtime/RuntimeFunctions.def

@@ -638,7 +638,7 @@ FUNCTION(GetGenericMetadata, swift_getGenericMetadata,
 //                                     const OpaqueTypeDescriptor *descriptor,
 //                                     uintptr_t index);
 FUNCTION(GetOpaqueTypeMetadata, swift_getOpaqueTypeMetadata,
-         SwiftCC, ConditionallyAvailable,
+         SwiftCC, OpaqueTypeAvailability,
          RETURNS(TypeMetadataResponseTy),
          ARGS(SizeTy, Int8PtrTy, OpaqueTypeDescriptorPtrTy, SizeTy),
          ATTRS(NoUnwind, ReadOnly))
@@ -647,7 +647,7 @@ FUNCTION(GetOpaqueTypeMetadata, swift_getOpaqueTypeMetadata,
 //                                     const OpaqueTypeDescriptor *descriptor,
 //                                     uintptr_t index);
 FUNCTION(GetOpaqueTypeConformance, swift_getOpaqueTypeConformance,
-         SwiftCC, ConditionallyAvailable,
+         SwiftCC, OpaqueTypeAvailability,
          RETURNS(WitnessTablePtrTy),
          ARGS(Int8PtrTy, OpaqueTypeDescriptorPtrTy, SizeTy),
          ATTRS(NoUnwind, ReadOnly))
@@ -1226,13 +1226,13 @@ FUNCTION(EndAccess, swift_endAccess, C_CC, AlwaysAvailable,
          ATTRS(NoUnwind))
 
 FUNCTION(GetOrigOfReplaceable, swift_getOrigOfReplaceable, C_CC,
-         AvailableByCompatibilityLibrary,
+         DynamicReplacementAvailability,
          RETURNS(FunctionPtrTy),
          ARGS(FunctionPtrTy->getPointerTo()),
          ATTRS(NoUnwind))
 
 FUNCTION(GetReplacement, swift_getFunctionReplacement, C_CC,
-         AvailableByCompatibilityLibrary,
+         DynamicReplacementAvailability,
          RETURNS(FunctionPtrTy),
          ARGS(FunctionPtrTy->getPointerTo(), FunctionPtrTy),
          ATTRS(NoUnwind))

lib/IRGen/IRGenModule.cpp

@@ -540,11 +540,33 @@ namespace RuntimeConstants {
   const auto ZExt = llvm::Attribute::ZExt;
   const auto FirstParamReturned = llvm::Attribute::Returned;
 
-  const auto AlwaysAvailable = RuntimeAvailability::AlwaysAvailable;
-  const auto AvailableByCompatibilityLibrary =
-      RuntimeAvailability::AvailableByCompatibilityLibrary;
-  const auto ConditionallyAvailable =
-      RuntimeAvailability::ConditionallyAvailable;
+  RuntimeAvailability AlwaysAvailable(ASTContext &Context) {
+    return RuntimeAvailability::AlwaysAvailable;
+  }
+
+  bool
+  isDeploymentAvailabilityContainedIn(ASTContext &Context,
+                                      AvailabilityContext featureAvailability) {
+    auto deploymentAvailability =
+      AvailabilityContext::forDeploymentTarget(Context);
+    return deploymentAvailability.isContainedIn(featureAvailability);
+  }
+
+  RuntimeAvailability OpaqueTypeAvailability(ASTContext &Context) {
+    auto featureAvailability = Context.getOpaqueTypeAvailability();
+    if (!isDeploymentAvailabilityContainedIn(Context, featureAvailability)) {
+      return RuntimeAvailability::ConditionallyAvailable;
+    }
+    return RuntimeAvailability::AlwaysAvailable;
+  }
+
+  RuntimeAvailability DynamicReplacementAvailability(ASTContext &Context) {
+    auto featureAvailability = Context.getSwift51Availability();
+    if (!isDeploymentAvailabilityContainedIn(Context, featureAvailability)) {
+      return RuntimeAvailability::AvailableByCompatibilityLibrary;
+    }
+    return RuntimeAvailability::AlwaysAvailable;
+  }
 } // namespace RuntimeConstants
 
 // We don't use enough attributes to justify generalizing the
@@ -589,7 +611,6 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
                       const char *name,
                       llvm::CallingConv::ID cc,
                       RuntimeAvailability availability,
-                      ASTContext *context,
                       llvm::ArrayRef<llvm::Type*> retTypes,
                       llvm::ArrayRef<llvm::Type*> argTypes,
                       ArrayRef<Attribute::AttrKind> attrs) {
@@ -600,24 +621,16 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
   bool isWeakLinked = false;
   std::string functionName(name);
 
-  auto isFeatureAvailable = [&]() -> bool {
-    auto deploymentAvailability =
-        AvailabilityContext::forDeploymentTarget(*context);
-    auto featureAvailability = context->getSwift51Availability();
-    return deploymentAvailability.isContainedIn(featureAvailability);
-  };
-
   switch (availability) {
   case RuntimeAvailability::AlwaysAvailable:
     // Nothing to do.
     break;
   case RuntimeAvailability::ConditionallyAvailable: {
-    isWeakLinked = !isFeatureAvailable();
+    isWeakLinked = true;
     break;
   }
   case RuntimeAvailability::AvailableByCompatibilityLibrary: {
-    if (!isFeatureAvailable())
-      functionName.append("50");
+    functionName.append("50");
     break;
   }
   }
@@ -688,7 +701,7 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
   llvm::Constant *IRGenModule::get##ID##Fn() {                                 \
     using namespace RuntimeConstants;                                          \
     return getRuntimeFn(Module, ID##Fn, #NAME, CC,                             \
-                        AVAILABILITY, &this->Context,                          \
+                        AVAILABILITY(this->Context),                          \
                         RETURNS, ARGS, ATTRS);                                 \
   }
 

lib/LLVMPasses/ARCEntryPointBuilder.h

@@ -220,7 +220,7 @@ class ARCEntryPointBuilder {
     Retain = getRuntimeFn(
         getModule(), cache,
         isNonAtomic(OrigI) ? "swift_nonatomic_retain" : "swift_retain",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr, {ObjectPtrTy},
+        DefaultCC, RuntimeAvailability::AlwaysAvailable, {ObjectPtrTy},
         {ObjectPtrTy}, {NoUnwind, FirstParamReturned});
 
     return Retain.get();
@@ -238,7 +238,7 @@ class ARCEntryPointBuilder {
                            isNonAtomic(OrigI) ? "swift_nonatomic_release"
                                               : "swift_release",
                            DefaultCC, RuntimeAvailability::AlwaysAvailable,
-                           nullptr, {VoidTy}, {ObjectPtrTy}, {NoUnwind});
+                           {VoidTy}, {ObjectPtrTy}, {NoUnwind});
 
     return Release.get();
   }
@@ -273,7 +273,7 @@ class ARCEntryPointBuilder {
     RetainN = getRuntimeFn(
         getModule(), cache,
         isNonAtomic(OrigI) ? "swift_nonatomic_retain_n" : "swift_retain_n",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr, {ObjectPtrTy},
+        DefaultCC, RuntimeAvailability::AlwaysAvailable, {ObjectPtrTy},
         {ObjectPtrTy, Int32Ty}, {NoUnwind, FirstParamReturned});
 
     return RetainN.get();
@@ -288,11 +288,11 @@ class ARCEntryPointBuilder {
     auto *VoidTy = Type::getVoidTy(getModule().getContext());
 
     llvm::Constant *cache = nullptr;
-    ReleaseN = getRuntimeFn(
-        getModule(), cache,
-        isNonAtomic(OrigI) ? "swift_nonatomic_release_n" : "swift_release_n",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr, {VoidTy},
-        {ObjectPtrTy, Int32Ty}, {NoUnwind});
+    ReleaseN = getRuntimeFn(getModule(), cache,
+                            isNonAtomic(OrigI) ? "swift_nonatomic_release_n"
+                                               : "swift_release_n",
+                            DefaultCC, RuntimeAvailability::AlwaysAvailable,
+                            {VoidTy}, {ObjectPtrTy, Int32Ty}, {NoUnwind});
 
     return ReleaseN.get();
   }
@@ -310,7 +310,7 @@ class ARCEntryPointBuilder {
         getModule(), cache,
         isNonAtomic(OrigI) ? "swift_nonatomic_unknownObjectRetain_n"
                            : "swift_unknownObjectRetain_n",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr, {ObjectPtrTy},
+        DefaultCC, RuntimeAvailability::AlwaysAvailable, {ObjectPtrTy},
         {ObjectPtrTy, Int32Ty}, {NoUnwind, FirstParamReturned});
 
     return UnknownObjectRetainN.get();
@@ -329,7 +329,7 @@ class ARCEntryPointBuilder {
         getModule(), cache,
         isNonAtomic(OrigI) ? "swift_nonatomic_unknownObjectRelease_n"
                            : "swift_unknownObjectRelease_n",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr, {VoidTy},
+        DefaultCC, RuntimeAvailability::AlwaysAvailable, {VoidTy},
         {ObjectPtrTy, Int32Ty}, {NoUnwind});
 
     return UnknownObjectReleaseN.get();
@@ -347,8 +347,8 @@ class ARCEntryPointBuilder {
         getModule(), cache,
         isNonAtomic(OrigI) ? "swift_nonatomic_bridgeObjectRetain_n"
                            : "swift_bridgeObjectRetain_n",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr,
-        {BridgeObjectPtrTy}, {BridgeObjectPtrTy, Int32Ty}, {NoUnwind});
+        DefaultCC, RuntimeAvailability::AlwaysAvailable, {BridgeObjectPtrTy},
+        {BridgeObjectPtrTy, Int32Ty}, {NoUnwind});
     return BridgeRetainN.get();
   }
 
@@ -366,7 +366,7 @@ class ARCEntryPointBuilder {
         getModule(), cache,
         isNonAtomic(OrigI) ? "swift_nonatomic_bridgeObjectRelease_n"
                            : "swift_bridgeObjectRelease_n",
-        DefaultCC, RuntimeAvailability::AlwaysAvailable, nullptr, {VoidTy},
+        DefaultCC, RuntimeAvailability::AlwaysAvailable, {VoidTy},
         {BridgeObjectPtrTy, Int32Ty}, {NoUnwind});
     return BridgeReleaseN.get();
   }