Skip to content

[IRGen] Prevent CVW from being emitted for non-copyable types #77126

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
Oct 21, 2024
Merged

[IRGen] Prevent CVW from being emitted for non-copyable types #77126

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
9 changes: 6 additions & 3 deletions lib/IRGen/GenMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3391,15 +3391,18 @@ static void emitInitializeValueMetadata(IRGenFunction &IGF,
MetadataDependencyCollector *collector) {
auto &IGM = IGF.IGM;
auto loweredTy = IGM.getLoweredType(nominalDecl->getDeclaredTypeInContext());
auto &concreteTI = IGM.getTypeInfo(loweredTy);

bool useLayoutStrings =
layoutStringsEnabled(IGM) &&
IGM.Context.LangOpts.hasFeature(
Feature::LayoutStringValueWitnessesInstantiation) &&
IGM.getOptions().EnableLayoutStringValueWitnessesInstantiation;
IGM.getOptions().EnableLayoutStringValueWitnessesInstantiation &&
concreteTI.isCopyable(ResilienceExpansion::Maximal);

if (auto sd = dyn_cast<StructDecl>(nominalDecl)) {
auto &fixedTI = IGM.getTypeInfo(loweredTy);
if (isa<FixedTypeInfo>(fixedTI)) return;
if (isa<FixedTypeInfo>(concreteTI))
return;

// Use a different runtime function to initialize the value witness table
// if the struct has a raw layout. The existing swift_initStructMetadata
Expand Down
24 changes: 16 additions & 8 deletions lib/IRGen/GenValueWitness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
return addFunction(getNoOpVoidFunction(IGM));
} else if (concreteTI.isSingleSwiftRetainablePointer(ResilienceExpansion::Maximal)) {
return addFunction(getDestroyStrongFunction(IGM));
} else if (layoutStringsEnabled(IGM)) {
} else if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics ? boundGenericCharacteristics->concreteType : concreteType;
auto &typeInfo = boundGenericCharacteristics ? *boundGenericCharacteristics->TI : concreteTI;
if (auto *typeLayoutEntry =
Expand All @@ -1083,7 +1084,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
}
}

if (layoutStringsEnabled(IGM)) {
if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics
? boundGenericCharacteristics->concreteType
: concreteType;
Expand All @@ -1106,7 +1108,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
case ValueWitness::InitializeWithTake:
if (concreteTI.isBitwiseTakable(ResilienceExpansion::Maximal)) {
return addFunction(getMemCpyFunction(IGM, concreteTI));
} else if (layoutStringsEnabled(IGM)) {
} else if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics ? boundGenericCharacteristics->concreteType : concreteType;
auto &typeInfo = boundGenericCharacteristics ? *boundGenericCharacteristics->TI : concreteTI;
if (auto *typeLayoutEntry =
Expand All @@ -1126,7 +1129,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
return addFunction(getMemCpyFunction(IGM, concreteTI));
} else if (concreteTI.isSingleSwiftRetainablePointer(ResilienceExpansion::Maximal)) {
return addFunction(getAssignWithCopyStrongFunction(IGM));
} else if (layoutStringsEnabled(IGM)) {
} else if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics ? boundGenericCharacteristics->concreteType : concreteType;
auto &typeInfo = boundGenericCharacteristics ? *boundGenericCharacteristics->TI : concreteTI;
if (auto *typeLayoutEntry =
Expand All @@ -1146,7 +1150,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
return addFunction(getMemCpyFunction(IGM, concreteTI));
} else if (concreteTI.isSingleSwiftRetainablePointer(ResilienceExpansion::Maximal)) {
return addFunction(getAssignWithTakeStrongFunction(IGM));
} else if (layoutStringsEnabled(IGM)) {
} else if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics ? boundGenericCharacteristics->concreteType : concreteType;
auto &typeInfo = boundGenericCharacteristics ? *boundGenericCharacteristics->TI : concreteTI;
if (auto *typeLayoutEntry =
Expand All @@ -1166,7 +1171,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
return addFunction(getMemCpyFunction(IGM, concreteTI));
} else if (concreteTI.isSingleSwiftRetainablePointer(ResilienceExpansion::Maximal)) {
return addFunction(getInitWithCopyStrongFunction(IGM));
} else if (layoutStringsEnabled(IGM)) {
} else if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics ? boundGenericCharacteristics->concreteType : concreteType;
auto &typeInfo = boundGenericCharacteristics ? *boundGenericCharacteristics->TI : concreteTI;
if (auto *typeLayoutEntry =
Expand Down Expand Up @@ -1233,7 +1239,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
case ValueWitness::GetEnumTag: {
assert(concreteType.getEnumOrBoundGenericEnum());

if (layoutStringsEnabled(IGM)) {
if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics
? boundGenericCharacteristics->concreteType
: concreteType;
Expand All @@ -1255,7 +1262,8 @@ static void addValueWitness(IRGenModule &IGM, ConstantStructBuilder &B,
}
case ValueWitness::DestructiveInjectEnumTag: {
assert(concreteType.getEnumOrBoundGenericEnum());
if (layoutStringsEnabled(IGM)) {
if (layoutStringsEnabled(IGM) &&
concreteTI.isCopyable(ResilienceExpansion::Maximal)) {
auto ty = boundGenericCharacteristics
? boundGenericCharacteristics->concreteType
: concreteType;
Expand Down
31 changes: 31 additions & 0 deletions test/IRGen/layout_string_witnesses_noncopyable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// RUN: %target-swift-frontend -enable-experimental-feature LayoutStringValueWitnesses -enable-experimental-feature LayoutStringValueWitnessesInstantiation -enable-layout-string-value-witnesses -enable-layout-string-value-witnesses-instantiation -emit-ir -module-name Foo %s | %FileCheck %s

// CHECK-NOT: @"$s3Foo7GenericVWV" = {{.*}}ptr @swift_generic{{.*$}}
struct Generic<T: ~Copyable>: ~Copyable {
let x: T
let y: Int
}

// CHECK-NOT: @"$s3Foo13SinglePayloadOWV" = {{.*}}ptr @swift_generic{{.*$}}
enum SinglePayload: ~Copyable {
case x(AnyObject)
case y
}

// CHECK-NOT: @"$s3Foo12MultiPayloadOWV" = {{.*}}ptr @swift_generic{{.*$}}
enum MultiPayload: ~Copyable {
case x(AnyObject)
case y(AnyObject)
}

// CHECK-NOT: @"$s3Foo20SinglePayloadGenericOWV" = {{.*}}ptr @swift_generic{{.*$}}
enum SinglePayloadGeneric<T>: ~Copyable {
case x(T)
case y
}

// CHECK-NOT: @"$s3Foo19MultiPayloadGenericOWV" = {{.*}}ptr @swift_generic{{.*$}}
enum MultiPayloadGeneric<T>: ~Copyable {
case x(T)
case y(T)
}