Skip to content

Commit 5581ab8

Browse files
committed
Remove the experimental LifetimeDependenceDiagnoseTrivial feature.
This was never used to generate a .swiftinterface, so can be safely removed. It was used to guard compiler fixes that might break older .swiftinterface files. Now, we guard the same fixes by checking the source file type.
1 parent d0f58b7 commit 5581ab8

37 files changed

+14
-91
lines changed

include/swift/Basic/Features.def

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,6 @@ EXPERIMENTAL_FEATURE(StructLetDestructuring, true)
362362
/// Enable returning non-escapable types from functions.
363363
EXPERIMENTAL_FEATURE(LifetimeDependence, true)
364364

365-
/// Enable LifetimeDependence diagnostics for trivial types.
366-
EXPERIMENTAL_FEATURE(LifetimeDependenceDiagnoseTrivial, false)
367-
368365
/// Enable the `@_staticExclusiveOnly` attribute.
369366
EXPERIMENTAL_FEATURE(StaticExclusiveOnly, true)
370367

lib/AST/FeatureSet.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@ static bool usesFeatureLifetimeDependence(Decl *decl) {
263263
->hasLifetimeDependencies();
264264
}
265265

266-
UNINTERESTING_FEATURE(LifetimeDependenceDiagnoseTrivial)
267-
268266
UNINTERESTING_FEATURE(DynamicActorIsolation)
269267
UNINTERESTING_FEATURE(NonfrozenEnumExhaustivity)
270268
UNINTERESTING_FEATURE(ClosureIsolation)

test/Generics/inverse_generics.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// RUN: %target-typecheck-verify-swift \
22
// RUN: -enable-experimental-feature LifetimeDependence \
3-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
43
// RUN: -enable-experimental-feature SuppressedAssociatedTypes
54

65
// REQUIRES: swift_feature_LifetimeDependence
7-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
86
// REQUIRES: swift_feature_SuppressedAssociatedTypes
97

108
// expected-note@+1 {{'T' has '~Copyable' constraint preventing implicit 'Copyable' conformance}}

test/SIL/Parser/basic2_noncopyable_generics.sil

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
// RUN: %target-sil-opt \
22
// RUN: %s \
33
// RUN: -enable-experimental-feature LifetimeDependence \
4-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
54
// RUN: | \
65
// RUN: %target-sil-opt \
76
// RUN: -enable-experimental-feature LifetimeDependence \
8-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
97
// RUN: | \
108
// RUN: %FileCheck %s
119

1210
// REQUIRES: swift_feature_LifetimeDependence
13-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
1411

1512
// For -enable-experimental-feature LifetimeDependence
1613

test/SIL/Parser/lifetime_dependence.sil

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// RUN: %target-sil-opt %s \
22
// RUN: -enable-experimental-feature LifetimeDependence \
3-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
43
// RUN: | %FileCheck %s
54

65
// REQUIRES: swift_feature_LifetimeDependence
7-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
86

97
sil_stage canonical
108

test/SIL/explicit_lifetime_dependence_specifiers.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
// RUN: -emit-sil \
33
// RUN: -enable-builtin-module \
44
// RUN: -enable-experimental-feature LifetimeDependence \
5-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
65
// RUN: | %FileCheck %s
76

87
// REQUIRES: swift_feature_LifetimeDependence
9-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
108

119
import Builtin
1210

test/SIL/implicit_lifetime_dependence.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// RUN: %target-swift-frontend %s \
22
// RUN: -emit-sil -target %target-swift-5.1-abi-triple \
33
// RUN: -enable-experimental-feature LifetimeDependence \
4-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
54
// RUN: | %FileCheck %s
65

76
// REQUIRES: swift_feature_LifetimeDependence
8-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
97

108
@_unsafeNonescapableResult
119
@lifetime(source)

test/SIL/lifetime_dependence_generics.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// RUN: %target-swift-frontend %s -emit-sil \
22
// RUN: -enable-experimental-feature LifetimeDependence \
3-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
43
// RUN: -enable-experimental-feature SuppressedAssociatedTypes \
54
// RUN: | %FileCheck %s
65

76
// REQUIRES: swift_in_compiler
87
// REQUIRES: swift_feature_LifetimeDependence
9-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
108
// REQUIRES: swift_feature_SuppressedAssociatedTypes
119

1210
protocol P {

test/SIL/lifetime_dependence_param_position_test.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// RUN: %target-swift-frontend %s -emit-silgen \
2-
// RUN: -enable-experimental-feature LifetimeDependence \
3-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial
2+
// RUN: -enable-experimental-feature LifetimeDependence
43

54
// REQUIRES: swift_in_compiler
65
// REQUIRES: swift_feature_LifetimeDependence
7-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
86

97

108
public struct Span<Element> : ~Escapable {

test/SIL/lifetime_dependence_span_lifetime_attr.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// RUN: %target-swift-frontend %s -emit-sil \
22
// RUN: -enable-experimental-feature LifetimeDependence \
3-
// RUN: -enable-experimental-feature LifetimeDependenceDiagnoseTrivial \
43
// RUN: | %FileCheck %s
54

65
// REQUIRES: swift_in_compiler
76
// REQUIRES: swift_feature_LifetimeDependence
8-
// REQUIRES: swift_feature_LifetimeDependenceDiagnoseTrivial
97

108
// TODO: Use real Range
119
public struct FakeRange<Bound> {

0 commit comments

Comments
 (0)