Skip to content

Rework getRuntimeFn runtime availability #25573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2019
Merged

Rework getRuntimeFn runtime availability #25573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/swift/Runtime/RuntimeFnWrappersGen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions include/swift/Runtime/RuntimeFunctions.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand Down Expand Up @@ -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))
Expand Down
47 changes: 30 additions & 17 deletions lib/IRGen/IRGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
}
}
Expand Down Expand Up @@ -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); \
}

Expand Down
26 changes: 13 additions & 13 deletions lib/LLVMPasses/ARCEntryPointBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
}
Expand Down Expand Up @@ -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();
Expand All @@ -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();
}
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
}

Expand All @@ -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();
}
Expand Down