Skip to content

Commit e48a9b5

Browse files
hborlahborla
committed
[NFC] Remove the VariadicGenerics flag from tests that don't use generic types
with parameter packs.
1 parent 336da91 commit e48a9b5

20 files changed

+21
-69
lines changed

‎test/Constraints/pack_expansion_types.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
2-
3-
// REQUIRES: asserts
1+
// RUN: %target-typecheck-verify-swift
42

53
func returnTuple1<each T>() -> (repeat each T) { fatalError() }
64
// expected-note@-1 3 {{in call to function 'returnTuple1()'}}

‎test/Constraints/variadic_generic_constraints.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
2-
3-
// REQUIRES: asserts
1+
// RUN: %target-typecheck-verify-swift
42

53
// Test instantiation of constraint solver constraints from generic requirements
64
// involving type pack parameters

‎test/Constraints/variadic_generic_functions.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
2-
3-
// REQUIRES: asserts
1+
// RUN: %target-typecheck-verify-swift
42

53
func debugPrint<each T>(_ items: repeat each T)
64
where repeat each T: CustomDebugStringConvertible

‎test/DebugInfo/variadic-generics-count.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// RUN: %target-swift-frontend -emit-ir %s -g -o - \
2-
// RUN: -enable-experimental-feature VariadicGenerics \
32
// RUN: -parse-as-library -module-name a | %FileCheck %s
43

5-
// Because of -enable-experimental-feature VariadicGenerics
6-
// REQUIRES: asserts
7-
84
public func f1<each T>(ts: repeat each T) {
95
// CHECK: define {{.*}} @"$s1a2f12tsyxxQp_tRvzlF"(%swift.opaque** {{.*}}, i{{32|64}} [[COUNT1_1:.*]], %swift.type** {{.*}})
106
// CHECK-DAG: store i{{32|64}} [[COUNT1_1]], i{{32|64}}* %[[COUNT1_1_A:.*]], align

‎test/DebugInfo/variadic-generics.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// RUN: %target-swift-frontend -emit-ir %s -g -o - \
2-
// RUN: -enable-experimental-feature VariadicGenerics \
32
// RUN: -parse-as-library -module-name a | %FileCheck %s
43

5-
// Because of -enable-experimental-feature VariadicGenerics
6-
// REQUIRES: asserts
7-
84
public func foo<each T>(args: repeat each T) {
95
// CHECK: define {{.*}} @"$s1a3foo4argsyxxQp_tRvzlF"
106
// CHECK-SAME: %swift.type** %[[TYPE_PACK_ARG:.*]])

‎test/IRGen/run_variadic_generics.sil

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-build-swift-dylib(%t/%target-library-name(PrintShims)) -parse-stdlib %S/../Inputs/print-shims-stdlib.swift -module-name PrintShims -emit-module -emit-module-path %t/PrintShims.swiftmodule
33
// RUN: %target-codesign %t/%target-library-name(PrintShims)
4-
// RUN: %target-build-swift -enable-experimental-feature VariadicGenerics -g -parse-sil %s -emit-ir -I %t -L %t -lPrintShim | %FileCheck %s --check-prefix=CHECK-LL
5-
// RUN: %target-build-swift -enable-experimental-feature VariadicGenerics -g -parse-sil %s -module-name main -o %t/main -I %t -L %t -lPrintShims %target-rpath(%t)
4+
// RUN: %target-build-swift -g -parse-sil %s -emit-ir -I %t -L %t -lPrintShim | %FileCheck %s --check-prefix=CHECK-LL
5+
// RUN: %target-build-swift -g -parse-sil %s -module-name main -o %t/main -I %t -L %t -lPrintShims %target-rpath(%t)
66
// RUN: %target-codesign %t/main
77
// RUN: %target-run %t/main %t/%target-library-name(PrintShims) | %FileCheck %s
88

99
// REQUIRES: executable_test
1010

11-
// Because of -enable-experimental-feature VariadicGenerics
12-
// REQUIRES: asserts
13-
1411
// REQUIRES: rdar108045677
1512

1613
import Builtin

‎test/IRGen/variadic_generic_captures.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics | %FileCheck %s -DINT=i%target-ptrsize
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s -DINT=i%target-ptrsize
52

63
public func takesNoEscape(_: () -> ()) {}
74

‎test/IRGen/variadic_generic_functions.sil

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-frontend -parse-sil -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %IRGenFileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-frontend -parse-sil -emit-ir -primary-file %s | %IRGenFileCheck %s
52

63
import Builtin
74
import Swift

‎test/IRGen/variadic_generic_functions.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %FileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-frontend -emit-ir -primary-file %s | %FileCheck %s
52

63
// REQUIRES: PTRSIZE=64
74

‎test/IRGen/variadic_generic_outlining.sil

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %IRGenFileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-frontend -emit-ir -primary-file %s | %IRGenFileCheck %s
52

63
import Builtin
74
import Swift

‎test/IRGen/variadic_generics.sil

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %IRGenFileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-frontend -emit-ir -primary-file %s | %IRGenFileCheck %s
52

63
import Builtin
74
import Swift

‎test/Interpreter/variadic_generic_captures.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-concrete-type-metadata-mangled-name-accessors)
2-
// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics)
1+
// RUN: %target-run-simple-swift(-Xfrontend -disable-concrete-type-metadata-mangled-name-accessors)
2+
// RUN: %target-run-simple-swift
33

44
// REQUIRES: executable_test
55

6-
// Because of -enable-experimental-feature VariadicGenerics
7-
// REQUIRES: asserts
8-
96
// UNSUPPORTED: use_os_stdlib
107
// UNSUPPORTED: back_deployment_runtime
118

‎test/Interpreter/variadic_generic_tuples.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics)
1+
// RUN: %target-run-simple-swift
22

33
// FIXME: Fix the optimizer
44
// REQUIRES: swift_test_mode_optimize_none
55

66
// REQUIRES: executable_test
77

8-
// Because of -enable-experimental-feature VariadicGenerics
9-
// REQUIRES: asserts
10-
118
import StdlibUnittest
129

1310
var tuples = TestSuite("VariadicGenericTuples")

‎test/Macros/macro_expand_variadic.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
// RUN: %empty-directory(%t)
44
// RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/variadic_macros.swift -g -no-toolchain-stdlib-rpath
5-
// RUN: %target-typecheck-verify-swift -swift-version 5 -enable-experimental-feature VariadicGenerics -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS -swift-version 5
6-
// RUN: %target-build-swift -swift-version 5 -enable-experimental-feature VariadicGenerics -load-plugin-library %t/%target-library-name(MacroDefinition) %s -o %t/main -module-name MacroUser -swift-version 5
5+
// RUN: %target-typecheck-verify-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) -module-name MacroUser -DTEST_DIAGNOSTICS -swift-version 5
6+
// RUN: %target-build-swift -swift-version 5 -load-plugin-library %t/%target-library-name(MacroDefinition) %s -o %t/main -module-name MacroUser -swift-version 5
77
// RUN: %target-codesign %t/main
88
// RUN: %target-run %t/main | %FileCheck %s
99

‎test/SIL/Parser/variadic_generics.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-experimental-feature VariadicGenerics -enable-sil-verify-all=true %s | %target-sil-opt -enable-experimental-feature VariadicGenerics -enable-sil-verify-all=true | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all=true %s | %target-sil-opt -enable-sil-verify-all=true | %FileCheck %s
22

33
import Builtin
44
import Swift

‎test/SILGen/variadic-generic-arguments.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics %s | %FileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-emit-silgen %s | %FileCheck %s
52

63
// CHECK-LABEL: @$s4main14receive_simpleyyxxQpRvzlF : $@convention(thin) <each T> (@pack_guaranteed Pack{repeat each T}) -> () {
74
// CHECK: bb0(%0 : $*Pack{repeat each T}):

‎test/SILGen/variadic-generic-reabstraction.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics %s | %FileCheck %s
2-
// REQUIRES: asserts
1+
// RUN: %target-swift-emit-silgen %s | %FileCheck %s
32

43
func takesVariadicFunction<each T>(function: (repeat each T) -> Int) {}
54
func takesVariadicOwnedFunction<each T>(function: (repeat __owned each T) -> Int) {}

‎test/SILGen/variadic-generic-results.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics %s | %FileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-emit-silgen %s | %FileCheck %s
52

63
func sequence() {}
74

‎test/SILOptimizer/tuples_from_packs.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
// RUN: %target-swift-frontend -parse-as-library -O -emit-sil %s -enable-experimental-feature VariadicGenerics | %FileCheck %s
2-
3-
// Because of -enable-experimental-feature VariadicGenerics
4-
// REQUIRES: asserts
1+
// RUN: %target-swift-frontend -parse-as-library -O -emit-sil %s | %FileCheck %s
52

63
@_transparent func makeTuple<each T>(_ t: repeat each T) -> (repeat each T) {
74
return (repeat each t)

‎test/SILOptimizer/variadic_generics.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-sil-opt -enable-experimental-feature VariadicGenerics -enable-sil-verify-all %s -inline | %FileCheck %s
1+
// RUN: %target-sil-opt -enable-sil-verify-all %s -inline | %FileCheck %s
22

33
import Swift
44
import Builtin

0 commit comments

Comments
 (0)