Merge pull request #66251 from slavapestov/variadic-generics-feature-5.9

slavapestov · web-flow · commit 883a0f5b18d2 · 2023-06-01T19:24:37.000-04:00
Basic: Remove VariadicGenerics feature [5.9]
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -5411,9 +5411,6 @@ ERROR(vararg_not_allowed,none,
       "variadic parameter cannot appear outside of a function parameter list",
       ())
 
-ERROR(experimental_type_with_parameter_pack,none,
-      "generic types with parameter packs are experimental",
-      ())
 ERROR(more_than_one_pack_in_type,none,
       "generic type cannot declare more than one type pack", ())
 ERROR(enum_with_pack,none,
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -115,7 +115,6 @@ UPCOMING_FEATURE(ExistentialAny, 335, 6)
 UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
 
 EXPERIMENTAL_FEATURE(StaticAssert, false)
-EXPERIMENTAL_FEATURE(VariadicGenerics, false)
 EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)
 EXPERIMENTAL_FEATURE(FlowSensitiveConcurrencyCaptures, false)
 EXPERIMENTAL_FEATURE(CodeItemMacros, true)
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -3204,10 +3204,6 @@ static bool usesFeatureBareSlashRegexLiterals(Decl *decl) {
   return false;
 }
 
-static bool usesFeatureVariadicGenerics(Decl *decl) {
-  return false;
-}
-
 static bool usesFeatureTupleConformances(Decl *decl) {
   return false;
 }
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -480,10 +480,6 @@ static void checkGenericParams(GenericContext *ownerCtx) {
     // is not enabled.
     auto &ctx = decl->getASTContext();
     if (gp->isParameterPack() && isGenericType) {
-      if (!ctx.LangOpts.hasFeature(Feature::VariadicGenerics)) {
-        decl->diagnose(diag::experimental_type_with_parameter_pack);
-      }
-
       TypeChecker::checkAvailability(
           gp->getSourceRange(),
           ownerCtx->getASTContext().getVariadicGenericTypeAvailability(),
diff --git a/test/Constraints/one_element_tuple.swift b/test/Constraints/one_element_tuple.swift
@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 let t1: (_: Int) = (_: 3)
 
diff --git a/test/Constraints/pack-expansion-expressions.swift b/test/Constraints/pack-expansion-expressions.swift
@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature VariadicGenerics
-
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 func tuplify<each T>(_ t: repeat each T) -> (repeat each T) {
   return (repeat each t)
diff --git a/test/Constraints/variadic_generic_types.swift b/test/Constraints/variadic_generic_types.swift
@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 // Parsing an UnresolvedSpecializeExpr containing a PackExpansionType
 struct G<each T> {}
diff --git a/test/DebugInfo/variadic-generics-count.swift b/test/DebugInfo/variadic-generics-count.swift
@@ -1,6 +1,5 @@
-// REQUIRES: asserts
 // RUN: %target-swift-frontend -emit-ir %s -g -o - \
-// RUN:    -parse-as-library -module-name a -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s
+// RUN:    -parse-as-library -module-name a -disable-availability-checking | %FileCheck %s
 
 public func f1<each T>(ts: repeat each T) {
   // CHECK: define {{.*}} @"$s1a2f12tsyxxQp_tRvzlF"(%swift.opaque** {{.*}}, i{{32|64}} [[COUNT1_1:.*]], %swift.type** {{.*}})
diff --git a/test/Frontend/experimental_feature.swift b/test/Frontend/experimental_feature.swift
diff --git a/test/Generics/pack-shape-requirements.swift b/test/Generics/pack-shape-requirements.swift
@@ -1,6 +1,4 @@
-// RUN: %target-swift-frontend -typecheck -enable-experimental-feature VariadicGenerics %s -debug-generic-signatures -disable-availability-checking 2>&1 | %FileCheck %s
-
-// REQUIRES: asserts
+// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-availability-checking 2>&1 | %FileCheck %s
 
 protocol P {
   associatedtype A
diff --git a/test/Generics/variadic_generic_requirements.swift b/test/Generics/variadic_generic_requirements.swift
@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 struct Conformance<each T: Equatable> {}
 
diff --git a/test/Generics/variadic_generic_types.swift b/test/Generics/variadic_generic_types.swift
@@ -1,7 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 // Disallowed cases
 struct MultiplePack<each T, each U> {} // expected-error {{generic type cannot declare more than one type pack}}
diff --git a/test/Generics/variadic_generic_types_availability.swift b/test/Generics/variadic_generic_types_availability.swift
@@ -1,7 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift
 
 // REQUIRES: OS=macosx
 
diff --git a/test/IRGen/pack_archetype_canonicalization.swift b/test/IRGen/pack_archetype_canonicalization.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-frontend -emit-ir %s -disable-availability-checking
 
 // This would crash.
 public struct G<T> {}
diff --git a/test/IRGen/variadic_generic_fulfillment.swift b/test/IRGen/variadic_generic_fulfillment.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s -DINT=i%target-ptrsize
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-frontend -emit-ir %s -disable-availability-checking | %FileCheck %s -DINT=i%target-ptrsize
 
 public struct G<T> {}
 
diff --git a/test/IRGen/variadic_generic_fulfillments.sil b/test/IRGen/variadic_generic_fulfillments.sil
@@ -1,7 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics | %IRGenFileCheck %s
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-frontend -emit-ir -primary-file %s | %IRGenFileCheck %s
 
 import Builtin
 import Swift
diff --git a/test/IRGen/variadic_generic_types.swift b/test/IRGen/variadic_generic_types.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir -primary-file %s -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-frontend -emit-ir -primary-file %s -disable-availability-checking | %FileCheck %s
 
 // REQUIRES: PTRSIZE=64
 
diff --git a/test/Interpreter/variadic_generic_conformances.swift b/test/Interpreter/variadic_generic_conformances.swift
@@ -1,10 +1,7 @@
-// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-availability-checking)
+// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking)
 
 // REQUIRES: executable_test
 
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
-
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
diff --git a/test/Interpreter/variadic_generic_types.swift b/test/Interpreter/variadic_generic_types.swift
@@ -1,11 +1,8 @@
-// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-concrete-type-metadata-mangled-name-accessors -Xfrontend -disable-availability-checking)
-// RUN: %target-run-simple-swift(-enable-experimental-feature VariadicGenerics -Xfrontend -disable-availability-checking)
+// RUN: %target-run-simple-swift(-Xfrontend -disable-concrete-type-metadata-mangled-name-accessors -Xfrontend -disable-availability-checking)
+// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking)
 
 // REQUIRES: executable_test
 
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
-
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
diff --git a/test/ModuleInterface/pack_expansion_type.swift b/test/ModuleInterface/pack_expansion_type.swift
@@ -1,10 +1,7 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-emit-module-interface(%t/PackExpansionType.swiftinterface) %s -module-name PackExpansionType -enable-experimental-feature VariadicGenerics -disable-availability-checking
+// RUN: %target-swift-emit-module-interface(%t/PackExpansionType.swiftinterface) %s -module-name PackExpansionType -disable-availability-checking
 // RUN: %FileCheck %s < %t/PackExpansionType.swiftinterface
 
-// Experimental features require an asserts compiler
-// REQUIRES: asserts
-
 // CHECK: #if compiler(>=5.3) && $ParameterPacks
 // CHECK-NEXT: public func variadicFunction<each T, each U>(t: repeat each T, u: repeat each U) -> (repeat (each T, each U)) where (repeat (each T, each U)) : Any
 public func variadicFunction<each T, each U>(t: repeat each T, u: repeat each U) -> (repeat (each T, each U)) {}
diff --git a/test/Parse/type_parameter_packs.swift b/test/Parse/type_parameter_packs.swift
@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 protocol P {}
 
diff --git a/test/SIL/Serialization/pack_expansion_type.swift b/test/SIL/Serialization/pack_expansion_type.swift
@@ -1,9 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module %s -emit-module-path %t/pack_expansion_type.swiftmodule -DLIB -enable-experimental-feature VariadicGenerics
-// RUN: %target-swift-frontend -emit-ir %s -I %t -DAPP -module-name main -enable-experimental-feature VariadicGenerics
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-frontend -emit-module %s -emit-module-path %t/pack_expansion_type.swiftmodule -DLIB
+// RUN: %target-swift-frontend -emit-ir %s -I %t -DAPP -module-name main
 
 #if LIB
 
diff --git a/test/SILGen/pack_expansion_type.swift b/test/SILGen/pack_expansion_type.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-silgen %s -enable-experimental-feature VariadicGenerics -disable-availability-checking | %FileCheck %s
-
-// Experimental features require an asserts compiler
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen %s -disable-availability-checking | %FileCheck %s
 
 // CHECK-LABEL: sil [ossa] @$s19pack_expansion_type16variadicFunction1t1ux_q_txQp_txxQp_q_xQptRvzRv_q_Rhzr0_lF : $@convention(thin) <each T, each U where (repeat (each T, each U)) : Any> (@pack_guaranteed Pack{repeat each T}, @pack_guaranteed Pack{repeat each U}) -> @pack_out Pack{repeat (each T, each U)} {
 // CHECK: bb0(%0 : $*Pack{repeat (each T, each U)}, %1 : $*Pack{repeat each T}, %2 : $*Pack{repeat each U}):
diff --git a/test/SILGen/parameterized_existentials_variadic.swift b/test/SILGen/parameterized_existentials_variadic.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-silgen -module-name parameterized -disable-availability-checking %s -enable-experimental-feature VariadicGenerics | %FileCheck %s
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen -module-name parameterized -disable-availability-checking %s | %FileCheck %s
 
 protocol P<A> {
   associatedtype A
diff --git a/test/SILGen/variadic-generic-closures.swift b/test/SILGen/variadic-generic-closures.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics -disable-availability-checking %s | %FileCheck %s
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen -disable-availability-checking %s | %FileCheck %s
 
 public struct G<T> {}
 
diff --git a/test/SILGen/variadic-generic-tuples.swift b/test/SILGen/variadic-generic-tuples.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics -disable-availability-checking %s | %FileCheck %s
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen -disable-availability-checking %s | %FileCheck %s
 
 func takeAny(_ arg: Any) {}
 
diff --git a/test/SILGen/variadic-generic-vanishing-tuples.swift b/test/SILGen/variadic-generic-vanishing-tuples.swift
@@ -1,11 +1,8 @@
-// RUN: %target-swift-emit-silgen -enable-experimental-feature VariadicGenerics -disable-availability-checking %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -disable-availability-checking %s | %FileCheck %s
 
 // rdar://107459964
 // rdar://107478603
 
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
-
 public struct G<Value> {
   public let id: Int
 }
diff --git a/test/SILGen/variadic_generic_types.swift b/test/SILGen/variadic_generic_types.swift
@@ -1,7 +1,4 @@
-// RUN: %target-swift-emit-silgen %s -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-swift-emit-silgen %s -disable-availability-checking
 
 struct Variadic<each T> where repeat each T: Equatable {}
 
diff --git a/test/Serialization/pack_expansion_type.swift b/test/Serialization/pack_expansion_type.swift
@@ -1,9 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend %S/Inputs/pack_expansion_type_other.swift -emit-module -emit-module-path %t/pack_expansion_type_other.swiftmodule -enable-experimental-feature VariadicGenerics -disable-availability-checking
-// RUN: %target-typecheck-verify-swift -I %t -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// Experimental features require an asserts compiler
-// REQUIRES: asserts
+// RUN: %target-swift-frontend %S/Inputs/pack_expansion_type_other.swift -emit-module -emit-module-path %t/pack_expansion_type_other.swiftmodule -disable-availability-checking
+// RUN: %target-typecheck-verify-swift -I %t -disable-availability-checking
 
 import pack_expansion_type_other
 
diff --git a/test/TypeDecoder/variadic_nominal_types.swift b/test/TypeDecoder/variadic_nominal_types.swift
@@ -1,13 +1,10 @@
 // RUN: %empty-directory(%t)
 
-// RUN: %target-build-swift -emit-executable %s -g -o %t/variadic_nominal_types -emit-module -enable-experimental-feature VariadicGenerics -Xfrontend -disable-availability-checking
+// RUN: %target-build-swift -emit-executable %s -g -o %t/variadic_nominal_types -emit-module -Xfrontend -disable-availability-checking
 
 // RUN: sed -ne '/\/\/ *DEMANGLE-TYPE: /s/\/\/ *DEMANGLE-TYPE: *//p' < %s > %t/input
 // RUN: %lldb-moduleimport-test-with-sdk %t/variadic_nominal_types -type-from-mangled=%t/input | %FileCheck %s --check-prefix=CHECK-TYPE
 
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
-
 struct Variadic<each T, U> {
   struct Inner<each V, W> {}
 }
diff --git a/test/decl/protocol/conforms/variadic_generic_type.swift b/test/decl/protocol/conforms/variadic_generic_type.swift
@@ -1,7 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// Because of -enable-experimental-feature VariadicGenerics
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 // Generic parameter packs cannot witness associated type requirements
 protocol HasAssoc {
diff --git a/test/type/pack_expansion.swift b/test/type/pack_expansion.swift
@@ -1,6 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature VariadicGenerics -disable-availability-checking
-
-// REQUIRES: asserts
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 func f1<each T>() -> repeat each T {}
 // expected-error@-1 {{pack expansion 'repeat each T' can only appear in a function parameter list, tuple element, or generic argument list}}

Original file line number	Diff line number	Diff line change
`@@ -3204,10 +3204,6 @@ static bool usesFeatureBareSlashRegexLiterals(Decl *decl) {`
`3204`	`3204`	`return false;`
`3205`	`3205`	`}`
`3206`	`3206`
`3207`		`-static bool usesFeatureVariadicGenerics(Decl *decl) {`
`3208`		`- return false;`
`3209`		`-}`
`3210`		`-`
`3211`	`3207`	`static bool usesFeatureTupleConformances(Decl *decl) {`
`3212`	`3208`	`return false;`
`3213`	`3209`	`}`