Skip to content

Commit 80bb497

Browse files
gottesmmgottesmm
authored
Merge pull request #66833 from gottesmm/pr-e19b18739384c4a73467c39d7034ec6efcb6f466
[move-only] Ban resilient noncopyable types.
2 parents 3ef125b + d0938a9 commit 80bb497

13 files changed

+135
-15
lines changed

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7304,6 +7304,11 @@ ERROR(noimplicitcopy_attr_invalid_in_generic_context,
73047304
none, "'@_noImplicitCopy' attribute cannot be applied to entities in generic contexts", ())
73057305
ERROR(noimplicitcopy_attr_not_allowed_on_moveonlytype,none,
73067306
"'@_noImplicitCopy' has no effect when applied to a noncopyable type", ())
7307+
ERROR(noncopyable_types_cannot_be_resilient, none,
7308+
"noncopyable %0 %1 must be @frozen in library evolution mode; "
7309+
"non-@frozen public and @usableFromInline noncopyable types are not "
7310+
"supported",
7311+
(DescriptiveDeclKind, Identifier))
73077312

73087313
//------------------------------------------------------------------------------
73097314
// MARK: Runtime discoverable attributes (@runtimeMetadata)

‎include/swift/Basic/Features.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ EXPERIMENTAL_FEATURE(NoImplicitCopy, true)
133133
EXPERIMENTAL_FEATURE(OldOwnershipOperatorSpellings, true)
134134
EXPERIMENTAL_FEATURE(MoveOnlyEnumDeinits, true)
135135
EXPERIMENTAL_FEATURE(MoveOnlyTuples, true)
136+
EXPERIMENTAL_FEATURE(MoveOnlyResilientTypes, true)
136137

137138
EXPERIMENTAL_FEATURE(OneWayClosureParameters, false)
138139
EXPERIMENTAL_FEATURE(TypeWitnessSystemInference, false)

‎lib/AST/ASTPrinter.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3304,6 +3304,12 @@ static bool usesFeatureMoveOnlyEnumDeinits(Decl *decl) {
33043304
return false;
33053305
}
33063306

3307+
static bool usesFeatureMoveOnlyResilientTypes(Decl *decl) {
3308+
if (auto *nomDecl = dyn_cast<NominalTypeDecl>(decl))
3309+
return nomDecl->isResilient() && usesFeatureMoveOnly(decl);
3310+
return false;
3311+
}
3312+
33073313
static bool usesFeatureOneWayClosureParameters(Decl *decl) {
33083314
return false;
33093315
}

‎lib/Sema/TypeCheckDeclPrimary.cpp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2681,7 +2681,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
26812681

26822682
// If our enum is marked as move only, it cannot be indirect or have any
26832683
// indirect cases.
2684-
if (ED->getAttrs().hasAttribute<MoveOnlyAttr>()) {
2684+
if (ED->isMoveOnly()) {
26852685
if (ED->isIndirect())
26862686
ED->diagnose(diag::noncopyable_enums_do_not_support_indirect,
26872687
ED->getBaseIdentifier());
@@ -2691,6 +2691,13 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
26912691
ED->getBaseIdentifier());
26922692
}
26932693
}
2694+
2695+
if (!ED->getASTContext().LangOpts.hasFeature(
2696+
Feature::MoveOnlyResilientTypes) &&
2697+
ED->isResilient()) {
2698+
ED->diagnose(diag::noncopyable_types_cannot_be_resilient,
2699+
ED->getDescriptiveKind(), ED->getBaseIdentifier());
2700+
}
26942701
}
26952702
}
26962703

@@ -2731,6 +2738,13 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
27312738
diagnoseCopyableTypeContainingMoveOnlyType(SD);
27322739

27332740
diagnoseIncompatibleProtocolsForMoveOnlyType(SD);
2741+
2742+
if (!SD->getASTContext().LangOpts.hasFeature(
2743+
Feature::MoveOnlyResilientTypes) &&
2744+
SD->isResilient() && SD->isMoveOnly()) {
2745+
SD->diagnose(diag::noncopyable_types_cannot_be_resilient,
2746+
SD->getDescriptiveKind(), SD->getBaseIdentifier());
2747+
}
27342748
}
27352749

27362750
/// Check whether the given properties can be @NSManaged in this class.

‎test/IRGen/moveonly_split_module_source_deinit_library_evolution.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-build-swift-dylib(%t/%target-library-name(MoveOnlySplit)) -enable-library-evolution %S/Inputs/moveonly_split_module_source_input.swift -emit-module -emit-module-path %t/MoveOnlySplit.swiftmodule -module-name MoveOnlySplit -DTEST_LIBRARY_EVOLUTION
2+
// RUN: %target-build-swift-dylib(%t/%target-library-name(MoveOnlySplit)) -enable-library-evolution %S/Inputs/moveonly_split_module_source_input.swift -emit-module -emit-module-path %t/MoveOnlySplit.swiftmodule -module-name MoveOnlySplit -DTEST_LIBRARY_EVOLUTION -enable-experimental-feature MoveOnlyResilientTypes
33
// RUN: %target-codesign %t/%target-library-name(MoveOnlySplit)
44

5-
// RUN: %target-build-swift %s -lMoveOnlySplit -I %t -L %t -o %t/main %target-rpath(%t)
5+
// RUN: %target-build-swift %s -lMoveOnlySplit -I %t -L %t -o %t/main %target-rpath(%t) -enable-experimental-feature MoveOnlyResilientTypes
66
// RUN: %target-codesign %t/main
77
// RUN: %target-run %t/main %t/%target-library-name(MoveOnlySplit) | %FileCheck -check-prefix=CHECK-LIBRARY-EVOLUTION %s
88

‎test/ModuleInterface/discard_interface.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -verify
3-
// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t
2+
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -verify -enable-experimental-feature MoveOnlyResilientTypes
3+
// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t -enable-experimental-feature MoveOnlyResilientTypes
44
// RUN: %FileCheck %s < %t/Library.swiftinterface
55

66
// This test makes sure that discard and _forget are emitted correctly in the

‎test/ModuleInterface/moveonly_interface_flag.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library
3-
// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t
1+
7// RUN: %empty-directory(%t)
2+
// RUN: %target-swift-emit-module-interface(%t/Library.swiftinterface) %s -module-name Library -enable-experimental-feature MoveOnlyResilientTypes
3+
// RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t -enable-experimental-feature MoveOnlyResilientTypes
44
// RUN: %FileCheck %s < %t/Library.swiftinterface
55

66
// this test makes sure that decls containing a move-only type are guarded by the $MoveOnly feature flag

‎test/ModuleInterface/moveonly_user.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// RUN: %target-swift-frontend -emit-sil -sil-verify-all -I %t %s > /dev/null
66

77
// >> now again with library evolution; we expect the same result.
8-
// RUN: %target-swift-frontend -DSYNTHESIZE_ACCESSORS -enable-library-evolution -emit-module -o %t/Hello.swiftmodule %S/Inputs/moveonly_api.swift
9-
// RUN: %target-swift-frontend -emit-sil -sil-verify-all -I %t %s > /dev/null
8+
// RUN: %target-swift-frontend -DSYNTHESIZE_ACCESSORS -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes -emit-module -o %t/Hello.swiftmodule %S/Inputs/moveonly_api.swift
9+
// RUN: %target-swift-frontend -enable-experimental-feature MoveOnlyResilientTypes -emit-sil -sil-verify-all -I %t %s > /dev/null
1010

1111
// FIXME: ideally this would also try executing the program rather than just generating SIL
1212

‎test/SILGen/moveonly_library_evolution.swift

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-swift-emit-silgen -enable-experimental-feature NoImplicitCopy -enable-library-evolution %s | %FileCheck %s
2-
// RUN: %target-swift-emit-sil -O -sil-verify-all -enable-experimental-feature NoImplicitCopy -enable-library-evolution %s
1+
// RUN: %target-swift-emit-silgen -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyResilientTypes -enable-library-evolution %s | %FileCheck %s
2+
// RUN: %target-swift-emit-sil -O -sil-verify-all -enable-experimental-feature NoImplicitCopy -enable-experimental-feature MoveOnlyResilientTypes -enable-library-evolution %s
33

44
////////////////////////
55
// MARK: Declarations //
@@ -50,3 +50,60 @@ public struct DeinitTest : ~Copyable {
5050
public func callerArgumentSpillingTestArg(_ x: CopyableKlass) {
5151
borrowVal(x.letStruct.e)
5252
}
53+
54+
/////////////////////////////////////
55+
// MARK: UsableFromInline in Class //
56+
/////////////////////////////////////
57+
58+
public class CopyableKlass2 {
59+
public init() {}
60+
}
61+
62+
@frozen
63+
public struct E : ~Copyable {
64+
var x = CopyableKlass2()
65+
}
66+
67+
public class UsableFromInlineTestKlass {
68+
// Read accessor
69+
//
70+
// CHECK-LABEL: sil [ossa] @$s26moveonly_library_evolution25UsableFromInlineTestKlassC1eAA1EVvr : $@yield_once @convention(method) (@guaranteed UsableFromInlineTestKlass) -> @yields @guaranteed E {
71+
// CHECK: bb0([[ARG:%.*]] : @guaranteed
72+
// CHECK: [[FIELD:%.*]] = ref_element_addr [[ARG]]
73+
// CHECK: [[ACCESS:%.*]] = begin_access [read] [dynamic] [[FIELD]]
74+
// CHECK: [[MARK:%.*]] = mark_must_check [no_consume_or_assign] [[ACCESS]]
75+
// CHECK: [[LOAD:%.*]] = load [copy] [[MARK]]
76+
// CHECK: yield [[LOAD]]
77+
// CHECK: } // end sil function '$s26moveonly_library_evolution25UsableFromInlineTestKlassC1eAA1EVvr'
78+
79+
// Setter
80+
// CHECK-LABEL: sil [ossa] @$s26moveonly_library_evolution25UsableFromInlineTestKlassC1eAA1EVvs : $@convention(method) (@owned E, @guaranteed UsableFromInlineTestKlass) -> () {
81+
// CHECK: bb0([[NEW_VALUE:%.*]] : @owned $E, [[SELF:%.*]] : @guaranteed
82+
// CHECK: [[VALUE:%.*]] = alloc_box ${ let E }
83+
// CHECK: [[PROJECT:%.*]] = project_box [[VALUE]]
84+
// CHECK: store [[NEW_VALUE]] to [init] [[PROJECT]]
85+
// CHECK: [[MARK:%.*]] = mark_must_check [no_consume_or_assign] [[PROJECT]]
86+
// CHECK: [[LOAD:%.*]] = load [copy] [[MARK]]
87+
// CHECK: [[REF:%.*]] = ref_element_addr [[SELF]]
88+
// CHECK: [[ACCESS:%.*]] = begin_access [modify] [dynamic] [[REF]]
89+
// CHECK: [[MARK:%.*]] = mark_must_check [assignable_but_not_consumable] [[ACCESS]]
90+
// CHECK: assign [[LOAD]] to [[MARK]]
91+
// CHECK: } // end sil function '$s26moveonly_library_evolution25UsableFromInlineTestKlassC1eAA1EVvs'
92+
93+
// Modify
94+
// CHECK-LABEL: sil [ossa] @$s26moveonly_library_evolution25UsableFromInlineTestKlassC1eAA1EVvM : $@yield_once @convention(method) (@guaranteed UsableFromInlineTestKlass) -> @yields @inout E {
95+
// CHECK: bb0([[ARG:%.*]] : @guaranteed
96+
// CHECK: [[FIELD:%.*]] = ref_element_addr [[ARG]]
97+
// CHECK: [[ACCESS:%.*]] = begin_access [modify] [dynamic] [[FIELD]]
98+
// CHECK: [[MARK:%.*]] = mark_must_check [assignable_but_not_consumable] [[ACCESS]]
99+
// CHECK: yield [[MARK]]
100+
// CHECK: } // end sil function '$s26moveonly_library_evolution25UsableFromInlineTestKlassC1eAA1EVvM'
101+
@usableFromInline
102+
var e = E()
103+
}
104+
105+
106+
func useUsableFromInlineTestKlass() {
107+
let k = UsableFromInlineTestKlass()
108+
k.e = E()
109+
}

‎test/SILOptimizer/moveonly_addresschecker_diagnostics_library_evolution.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-sil -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution %s
1+
// RUN: %target-swift-emit-sil -enable-experimental-feature NoImplicitCopy -sil-verify-all -verify -enable-library-evolution -enable-experimental-feature MoveOnlyResilientTypes %s
22

33
// This test is used to validate that we properly handle library evolution code
44
// until we can get all of the normal moveonly_addresschecker_diagnostics test

0 commit comments

Comments
 (0)