Skip to content

[BitwiseCopyable] Verify only within module. #71491

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
Feb 9, 2024
Merged

[BitwiseCopyable] Verify only within module. #71491

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
22 changes: 20 additions & 2 deletions lib/SIL/IR/TypeLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3038,6 +3038,15 @@ void TypeConverter::verifyTrivialLowering(const TypeLowering &lowering,

auto conformance = M.checkConformance(substType, bitwiseCopyableProtocol);

if (auto *nominal = substType.getAnyNominal()) {
auto *module = nominal->getModuleContext();
if (module && module->isBuiltFromInterface()) {
// Don't verify for types in modules built from interfaces; the feature
// may not have been enabled in them.
return;
}
}

if (lowering.isTrivial() && !conformance) {
// A trivial type can lack a conformance in a few cases:
// (1) containing or being a resilient type
Expand All @@ -3054,6 +3063,7 @@ void TypeConverter::verifyTrivialLowering(const TypeLowering &lowering,
// struct S {
// unowned(unsafe) var o: AnyObject
// }
// (5) being defined in a different module
bool hasNoNonconformingNode = visitAggregateLeaves(
origType, substType, forExpansion,
/*isLeafAggregate=*/
Expand All @@ -3072,7 +3082,11 @@ void TypeConverter::verifyTrivialLowering(const TypeLowering &lowering,
}

// Resilient trivial types may not conform (case (1)).
return nominal->isResilient();
if (nominal->isResilient())
return true;

// Trivial types from other modules may not conform (case (5)).
return nominal->getModuleContext() != &M;
},
/*visit=*/
[&](auto ty, auto origTy, auto *field, auto index) -> bool {
Expand Down Expand Up @@ -3128,7 +3142,11 @@ void TypeConverter::verifyTrivialLowering(const TypeLowering &lowering,
}

// Resilient trivial types may not conform (case (1)).
return !nominal->isResilient();
if (nominal->isResilient())
return false;

// Trivial types from other modules may not conform (case (5)).
return nominal->getModuleContext() == &M;
});
if (hasNoNonconformingNode) {
llvm::errs() << "Trivial type without a BitwiseCopyable conformance!?:\n"
Expand Down
6 changes: 6 additions & 0 deletions test/IRGen/bitwise_copyable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
// RUN: -enable-builtin-module

// REQUIRES: asserts
// REQUIRES: objc_interop

// Force verification of TypeLowering's isTrivial.

import Foundation
import Builtin

struct Box<T : _BitwiseCopyable> : _BitwiseCopyable {
Expand All @@ -32,3 +34,7 @@ func nameBuiltinBridgeObject(_ b: Builtin.BridgeObject) {}
func nameBuiltinUnsafeValueBuffer(_ b: Builtin.UnsafeValueBuffer) {}
func nameBuiltinDefaultActorStorage(_ b: Builtin.DefaultActorStorage) {}
func nameBuiltinNonDefaultDistributedActorStorage(_ b: Builtin.NonDefaultDistributedActorStorage) {}

struct MyObjCBool {
var value: ObjCBool
}