Skip to content

Commit c1bb143

Browse files
AzoyAzoy
committed
Make ValueGenerics feature always available
1 parent ed9eef2 commit c1bb143

38 files changed

+42
-100
lines changed

‎Runtimes/Core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ add_compile_options(
190190
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature FreestandingMacros>"
191191
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature BitwiseCopyable>"
192192
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature Extern>"
193-
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature ValueGenerics>"
194193
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-enable-experimental-feature AddressableParameters>"
195194
# TODO: we should reevaluate if it still makes sense to restrict this
196195
# to Darwin, https://github.com/swiftlang/swift/issues/79279

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8259,8 +8259,6 @@ ERROR(value_generic_unexpected,none,
82598259
"using value generic %0 here is not allowed", (Type))
82608260
ERROR(missing_value_generic_type,none,
82618261
"value generic %0 must have an explicit value type declared", (Identifier))
8262-
ERROR(value_generics_missing_feature,none,
8263-
"value generics require '-enable-experimental-feature ValueGenerics'", ())
82648262
ERROR(availability_value_generic_type_only_version_newer, none,
82658263
"values in generic types are only available in %0 %1 or newer",
82668264
(StringRef, llvm::VersionTuple))

‎include/swift/Basic/Features.def

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ LANGUAGE_FEATURE(ObjCImplementation, 436, "@objc @implementation extensions")
215215
LANGUAGE_FEATURE(NonescapableTypes, 446, "Nonescapable types")
216216
LANGUAGE_FEATURE(BuiltinEmplaceTypedThrows, 0, "Builtin.emplace typed throws")
217217
SUPPRESSIBLE_LANGUAGE_FEATURE(MemorySafetyAttributes, 458, "@unsafe attribute")
218+
LANGUAGE_FEATURE(ValueGenerics, 452, "Value generics feature (integer generics)")
218219

219220
// Swift 6
220221
UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
@@ -426,9 +427,6 @@ EXPERIMENTAL_FEATURE(AssumeResilientCxxTypes, true)
426427
// Isolated deinit
427428
SUPPRESSIBLE_LANGUAGE_FEATURE(IsolatedDeinit, 371, "isolated deinit")
428429

429-
// Enable values in generic signatures, e.g. <let N: Int>
430-
EXPERIMENTAL_FEATURE(ValueGenerics, true)
431-
432430
// When a parameter has unspecified isolation, infer it as main actor isolated.
433431
EXPERIMENTAL_FEATURE(UnspecifiedMeansMainActorIsolated, false)
434432

‎lib/AST/RequirementMachine/RequirementMachineRequests.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -825,10 +825,6 @@ InferredGenericSignatureRequest::evaluate(
825825
"Parsed an empty generic parameter list?");
826826

827827
for (auto *gpDecl : *gpList) {
828-
if (gpDecl->isValue() &&
829-
!gpDecl->getASTContext().LangOpts.hasFeature(Feature::ValueGenerics))
830-
gpDecl->diagnose(diag::value_generics_missing_feature);
831-
832828
auto *gpType = gpDecl->getDeclaredInterfaceType()
833829
->castTo<GenericTypeParamType>();
834830
genericParams.push_back(gpType);

‎stdlib/public/core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Macros")
319319
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "FreestandingMacros")
320320
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Extern")
321321
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "BitwiseCopyable")
322-
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "ValueGenerics")
323322
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "AddressableParameters")
324323
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "AddressableTypes")
325324
list(APPEND swift_stdlib_compile_flags "-strict-memory-safety")

‎test/ASTGen/decls.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11

22
// RUN: %empty-directory(%t)
3-
// RUN: %target-swift-frontend-dump-parse -disable-availability-checking -enable-experimental-move-only -enable-experimental-concurrency -enable-experimental-feature ValueGenerics -enable-experimental-feature ParserASTGen \
3+
// RUN: %target-swift-frontend-dump-parse -disable-availability-checking -enable-experimental-move-only -enable-experimental-concurrency -enable-experimental-feature ParserASTGen \
44
// RUN: | %sanitize-address > %t/astgen.ast
5-
// RUN: %target-swift-frontend-dump-parse -disable-availability-checking -enable-experimental-move-only -enable-experimental-concurrency -enable-experimental-feature ValueGenerics \
5+
// RUN: %target-swift-frontend-dump-parse -disable-availability-checking -enable-experimental-move-only -enable-experimental-concurrency \
66
// RUN: | %sanitize-address > %t/cpp-parser.ast
77

88
// RUN: %diff -u %t/astgen.ast %t/cpp-parser.ast
99

10-
// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -Xfrontend -enable-experimental-concurrency -enable-experimental-feature ValueGenerics -enable-experimental-feature ParserASTGen)
10+
// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -Xfrontend -enable-experimental-concurrency -enable-experimental-feature ParserASTGen)
1111

1212
// REQUIRES: executable_test
1313
// REQUIRES: swift_swift_parser
1414
// REQUIRES: swift_feature_ParserASTGen
15-
// REQUIRES: swift_feature_ValueGenerics
1615

1716
// rdar://116686158
1817
// UNSUPPORTED: asan

‎test/DebugInfo/value-generics-embedded.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// RUN: %target-swift-frontend %s -target %target-cpu-apple-macos14 -emit-ir -g -enable-experimental-feature ValueGenerics -enable-experimental-feature Embedded -wmo -disable-availability-checking -o - | %FileCheck %s
1+
// RUN: %target-swift-frontend %s -target %target-cpu-apple-macos14 -emit-ir -g -enable-experimental-feature Embedded -wmo -disable-availability-checking -o - | %FileCheck %s
22

33
// REQUIRES: OS=macosx
44

55
// REQUIRES: swift_feature_Embedded
6-
// REQUIRES: swift_feature_ValueGenerics
76

87
// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "InlineArray",{{.*}}size: 64{{.*}}elements: ![[ELTS:[0-9]+]], runtimeLang: DW_LANG_Swift, templateParams: ![[SLAB_PARAMS:[0-9]+]], identifier: "$es11InlineArrayVy$0_4main8MySpriteVGD", specification:
98
// CHECK-DAG: ![[SLAB_PARAMS]] = !{![[COUNT_PARAM:.*]], ![[ELEMENT_PARAM:.*]]}

‎test/DebugInfo/value-generics.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-swift-frontend %s -emit-ir -g -enable-builtin-module -enable-experimental-feature ValueGenerics -disable-availability-checking -o - | %FileCheck %s
2-
3-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-swift-frontend %s -emit-ir -g -enable-builtin-module -disable-availability-checking -o - | %FileCheck %s
42

53
import Builtin
64

‎test/IRGen/array_type_layout.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-ir -disable-availability-checking -enable-experimental-feature ValueGenerics %s | %FileCheck %s
2-
3-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-swift-frontend -emit-ir -disable-availability-checking %s | %FileCheck %s
42

53
struct VerySmallSlab<T> {
64
var inline: InlineArray<16, T?>

‎test/IRGen/builtin_vector_fixed_array.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// RUN: %target-swift-frontend -emit-irgen -disable-availability-checking -enable-experimental-feature ValueGenerics -enable-experimental-feature BuiltinModule %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -emit-irgen -disable-availability-checking -enable-experimental-feature BuiltinModule %s | %FileCheck %s
22

33
// REQUIRES: swift_feature_BuiltinModule
4-
// REQUIRES: swift_feature_ValueGenerics
4+
55
import Builtin
66
import Swift
77

‎test/IRGen/existential-bitwise-borrowability.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %{python} %utils/chex.py < %s > %t/existential-bitwise-borrowability.swift
3-
// RUN: %target-swift-frontend -enable-experimental-feature RawLayout -enable-experimental-feature ValueGenerics -emit-ir -disable-availability-checking -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %t/existential-bitwise-borrowability.swift | %FileCheck %t/existential-bitwise-borrowability.swift --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
3+
// RUN: %target-swift-frontend -enable-experimental-feature RawLayout -emit-ir -disable-availability-checking -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %t/existential-bitwise-borrowability.swift | %FileCheck %t/existential-bitwise-borrowability.swift --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
44

55
// REQUIRES: swift_feature_RawLayout
6-
// REQUIRES: swift_feature_ValueGenerics
76

87
// Copyable existentials are bitwise-borrowable (because copyable types are
98
// always bitwise-borrowable if they're bitwise-takable, and only bitwise-takable

‎test/IRGen/loadable_by_address_reg2mem_fixed_array.sil

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// %target-swift-frontend %s -Xllvm -sil-print-after=loadable-address -import-objc-header %S/Inputs/large_c.h -c -o %t/t.o 2>&1 | %FileCheck %s
22

3-
// RUN: %target-swift-frontend %s -disable-availability-checking -enable-experimental-feature ValueGenerics -enable-experimental-feature BuiltinModule -Xllvm -sil-print-types -Xllvm -sil-print-after=loadable-address -c -o %t/t.o 2>&1 | %FileCheck %s
3+
// RUN: %target-swift-frontend %s -disable-availability-checking -enable-experimental-feature BuiltinModule -Xllvm -sil-print-types -Xllvm -sil-print-after=loadable-address -c -o %t/t.o 2>&1 | %FileCheck %s
44

55
// REQUIRES: swift_feature_BuiltinModule
6-
// REQUIRES: swift_feature_ValueGenerics
76

87
// wasm currently disables aggressive reg2mem
98
// UNSUPPORTED: wasm

‎test/IRGen/raw_layout.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %{python} %utils/chex.py < %s > %t/raw_layout.sil
3-
// RUN: %target-swift-frontend -enable-experimental-feature RawLayout -enable-experimental-feature ValueGenerics -emit-ir -disable-availability-checking -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %t/raw_layout.sil | %FileCheck %t/raw_layout.sil --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
3+
// RUN: %target-swift-frontend -enable-experimental-feature RawLayout -emit-ir -disable-availability-checking -I %S/Inputs -cxx-interoperability-mode=upcoming-swift %t/raw_layout.sil | %FileCheck %t/raw_layout.sil --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
44

55
// REQUIRES: swift_feature_RawLayout
6-
// REQUIRES: swift_feature_ValueGenerics
76

87
import Builtin
98
import Swift

‎test/IRGen/stdlib/Mutex.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %{python} %utils/chex.py < %s > %t/Mutex.swift
3-
// RUN: %target-swift-frontend -enable-experimental-feature RawLayout -enable-experimental-feature ValueGenerics -emit-ir -disable-availability-checking -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -module-name stdlib %t/Mutex.swift | %FileCheck %t/Mutex.swift --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
3+
// RUN: %target-swift-frontend -enable-experimental-feature RawLayout -emit-ir -disable-availability-checking -I %S/Inputs -cxx-interoperability-mode=upcoming-swift -module-name stdlib %t/Mutex.swift | %FileCheck %t/Mutex.swift --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
44

55
// REQUIRES: synchronization
66
// REQUIRES: swift_feature_RawLayout
7-
// REQUIRES: swift_feature_ValueGenerics
87

98
import Synchronization
109

‎test/Interpreter/value_generics.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
// RUN: %target-run-simple-swift(-enable-experimental-feature ValueGenerics -Xfrontend -disable-availability-checking) | %FileCheck %s
1+
// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking) | %FileCheck %s
22

33
// UNSUPPORTED: use_os_stdlib
44
// UNSUPPORTED: back_deployment_runtime
55

66
// REQUIRES: executable_test
7-
// REQUIRES: swift_feature_ValueGenerics
87

98
struct A<let N: Int, let M: Int> {}
109

‎test/ModuleInterface/value_generics.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name ValueGeneric -enable-experimental-feature ValueGenerics -disable-availability-checking
2+
// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name ValueGeneric -disable-availability-checking
33
// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name ValueGeneric -disable-availability-checking
44
// RUN: %FileCheck %s < %t.swiftinterface
55

6-
// REQUIRES: swift_feature_ValueGenerics
7-
86
// CHECK: public struct Slab<Element, let N : Swift.Int>
97
public struct Slab<Element, let N: Int> {
108
// CHECK-LABEL: public var count: Swift.Int {

‎test/Prototypes/Vector.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// RUN: %target-run-simple-swift(-target %module-target-future -enable-experimental-feature ValueGenerics -enable-experimental-feature BuiltinModule -Xfrontend -disable-experimental-parser-round-trip) | %FileCheck %s
2-
// RUN: %target-swift-frontend -target %module-target-future -enable-experimental-feature ValueGenerics -enable-experimental-feature BuiltinModule -disable-experimental-parser-round-trip -emit-module %s -o %t/Vector.swiftmodule
1+
// RUN: %target-run-simple-swift(-target %module-target-future -enable-experimental-feature BuiltinModule -Xfrontend -disable-experimental-parser-round-trip) | %FileCheck %s
2+
// RUN: %target-swift-frontend -target %module-target-future -enable-experimental-feature BuiltinModule -disable-experimental-parser-round-trip -emit-module %s -o %t/Vector.swiftmodule
33

44
// REQUIRES: executable_test
55
// REQUIRES: swift_feature_BuiltinModule
6-
// REQUIRES: swift_feature_ValueGenerics
76
// UNSUPPORTED: use_os_stdlib
87
// UNSUPPORTED: back_deployment_runtime
98

‎test/Runtime/check_create_type.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -enable-experimental-feature ValueGenerics)
1+
// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking)
22
// REQUIRES: executable_test
3-
// REQUIRES: swift_feature_ValueGenerics
43

54
// UNSUPPORTED: CPU=arm64e
65
// UNSUPPORTED: use_os_stdlib

‎test/SIL/Parser/basic2.sil

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-sil-opt -sil-print-types %s -enable-experimental-feature ValueGenerics | %target-sil-opt -sil-print-types -enable-experimental-feature ValueGenerics | %FileCheck %s
2-
3-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-sil-opt -sil-print-types %s | %target-sil-opt -sil-print-types | %FileCheck %s
42

53
import Builtin
64
import Swift

‎test/SIL/Serialization/basic2.sil

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// First parse this and then emit a *.sib. Then read in the *.sib, then recreate
22
// RUN: %empty-directory(%t)
3-
// RUN: %target-sil-opt -sil-print-types %s -emit-sib -o %t/tmp.sib -module-name basic2 -enable-experimental-feature ValueGenerics
4-
// RUN: %target-sil-opt -sil-print-types %t/tmp.sib -o %t/tmp.2.sib -module-name basic2 -enable-experimental-feature ValueGenerics
5-
// RUN: %target-sil-opt -sil-print-types %t/tmp.2.sib -module-name basic2 -emit-sorted-sil -enable-experimental-feature ValueGenerics | %FileCheck %s
6-
7-
// REQUIRES: swift_feature_ValueGenerics
3+
// RUN: %target-sil-opt -sil-print-types %s -emit-sib -o %t/tmp.sib -module-name basic2
4+
// RUN: %target-sil-opt -sil-print-types %t/tmp.sib -o %t/tmp.2.sib -module-name basic2
5+
// RUN: %target-sil-opt -sil-print-types %t/tmp.2.sib -module-name basic2 -emit-sorted-sil | %FileCheck %s
86

97
import Builtin
108
import Swift

‎test/SILGen/bitwise_copyable.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
// RUN: -emit-silgen \
44
// RUN: -target %target-swift-5.1-abi-triple \
55
// RUN: -enable-experimental-feature Sensitive \
6-
// RUN: -enable-experimental-feature ValueGenerics \
76
// RUN: -enable-builtin-module
87

98
// REQUIRES: swift_feature_Sensitive
10-
// REQUIRES: swift_feature_ValueGenerics
119

1210
// REQUIRES: asserts
1311

‎test/SILGen/builtin_vector.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -disable-experimental-parser-round-trip -disable-availability-checking -enable-experimental-feature ValueGenerics -enable-experimental-feature BuiltinModule %s | %FileCheck %s
1+
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -disable-experimental-parser-round-trip -disable-availability-checking -enable-experimental-feature BuiltinModule %s | %FileCheck %s
22

33
// REQUIRES: swift_feature_BuiltinModule
4-
// REQUIRES: swift_feature_ValueGenerics
54

65
import Builtin
76

‎test/SILGen/closures.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
2-
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -module-name closures -parse-stdlib -parse-as-library %s -enable-experimental-feature ValueGenerics -disable-availability-checking | %FileCheck %s
3-
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -module-name closures -parse-stdlib -parse-as-library %s -enable-experimental-feature ValueGenerics -disable-availability-checking | %FileCheck %s --check-prefix=GUARANTEED
4-
5-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -module-name closures -parse-stdlib -parse-as-library %s -disable-availability-checking | %FileCheck %s
2+
// RUN: %target-swift-emit-silgen -Xllvm -sil-print-types -module-name closures -parse-stdlib -parse-as-library %s -disable-availability-checking | %FileCheck %s --check-prefix=GUARANTEED
63

74
import Swift
85

‎test/SILGen/inlinearray_literal.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-swift-emit-silgen %s -disable-availability-checking -enable-experimental-feature ValueGenerics | %FileCheck %s
2-
3-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-swift-emit-silgen %s -disable-availability-checking | %FileCheck %s
42

53
import Synchronization
64

‎test/SILOptimizer/addressable_dependencies.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// RUN: %target-swift-frontend -emit-sil -enable-experimental-feature BuiltinModule -enable-experimental-feature LifetimeDependence -enable-experimental-feature AddressableTypes -enable-experimental-feature ValueGenerics %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -emit-sil -enable-experimental-feature BuiltinModule -enable-experimental-feature LifetimeDependence -enable-experimental-feature AddressableTypes %s | %FileCheck %s
22

33
// REQUIRES: swift_feature_BuiltinModule
44
// REQUIRES: swift_feature_AddressableTypes
55
// REQUIRES: swift_feature_LifetimeDependence
6-
// REQUIRES: swift_feature_ValueGenerics
76

87
import Builtin
98

‎test/SILOptimizer/cse_ossa.sil

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -update-borrowed-from -cse -enable-experimental-feature ValueGenerics | %FileCheck %s
2-
3-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-sil-opt -sil-print-types -enable-sil-verify-all %s -update-borrowed-from -cse | %FileCheck %s
42

53
sil_stage canonical
64

‎test/SILOptimizer/definite_init_builtin_vector.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
// RUN: %target-swift-frontend -emit-sil -disable-experimental-parser-round-trip -disable-availability-checking -enable-experimental-feature ValueGenerics -enable-experimental-feature BuiltinModule %s
1+
// RUN: %target-swift-frontend -emit-sil -disable-experimental-parser-round-trip -disable-availability-checking -enable-experimental-feature BuiltinModule %s
22

33
// REQUIRES: swift_feature_BuiltinModule
4-
// REQUIRES: swift_feature_ValueGenerics
54

65
import Builtin
76

‎test/SILOptimizer/functionsigopts.sil

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %target-sil-opt -sil-print-types -sil-inline-generics -enable-sil-verify-all -inline -function-signature-opts -enable-experimental-feature ValueGenerics %s | %FileCheck %s
2-
// RUN: %target-sil-opt -sil-print-types -sil-inline-generics -enable-sil-verify-all -inline -function-signature-opts -enable-experimental-feature ValueGenerics %s | %FileCheck -check-prefix=CHECK-NEGATIVE %s
3-
4-
// REQUIRES: swift_feature_ValueGenerics
1+
// RUN: %target-sil-opt -sil-print-types -sil-inline-generics -enable-sil-verify-all -inline -function-signature-opts %s | %FileCheck %s
2+
// RUN: %target-sil-opt -sil-print-types -sil-inline-generics -enable-sil-verify-all -inline -function-signature-opts %s | %FileCheck -check-prefix=CHECK-NEGATIVE %s
53

64
import Builtin
75
import Swift

‎test/SILOptimizer/inlinearray_bounds_check_tests.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
// RUN: %target-swift-frontend %s -emit-sil -O \
2-
// RUN: -disable-availability-checking \
3-
// RUN: -enable-experimental-feature ValueGenerics | %FileCheck %s --check-prefix=CHECK-SIL
2+
// RUN: -disable-availability-checking | %FileCheck %s --check-prefix=CHECK-SIL
43

54
// RUN: %target-swift-frontend %s -emit-ir -O \
6-
// RUN: -disable-availability-checking \
7-
// RUN: -enable-experimental-feature ValueGenerics | %FileCheck %s --check-prefix=CHECK-IR
5+
// RUN: -disable-availability-checking | %FileCheck %s --check-prefix=CHECK-IR
86

97
// REQUIRES: swift_in_compiler
10-
// REQUIRES: swift_feature_ValueGenerics
118
// REQUIRES: swift_stdlib_no_asserts, optimized_stdlib
129

1310
// Bounds check should be eliminated

‎test/SILOptimizer/sil_combine.sil

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
// RUN: %target-sil-opt -sil-print-types -enable-objc-interop -enable-sil-verify-all %s -sil-combine -enable-experimental-feature ValueGenerics | %FileCheck %s
1+
// RUN: %target-sil-opt -sil-print-types -enable-objc-interop -enable-sil-verify-all %s -sil-combine | %FileCheck %s
22

33
// REQUIRES: swift_in_compiler
4-
// REQUIRES: swift_feature_ValueGenerics
54

65
// Declare this SIL to be canonical because some tests break raw SIL
76
// conventions. e.g. address-type block args. -enforce-exclusivity=none is also

0 commit comments

Comments
 (0)