Parameterized Existential Types Are Enabled By Default

CodaFi · CodaFi · commit c8b6989baf0f · 2022-05-25T10:09:03.000-07:00
See https://forums.swift.org/t/accepted-se-0353-constrained-existential-types/57560
diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
@@ -338,10 +338,6 @@ namespace swift {
     /// in calls to generic functions.
     bool EnableOpenedExistentialTypes = false;
 
-    /// Enable support for parameterized protocol types in existential
-    /// position.
-    bool EnableParameterizedExistentialTypes = false;
-
     /// Enable experimental flow-sensitive concurrent captures.
     bool EnableExperimentalFlowSensitiveConcurrentCaptures = false;
 
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -543,10 +543,6 @@ def enable_explicit_existential_types :
   Flag<["-"], "enable-explicit-existential-types">,
   HelpText<"Enable experimental support for explicit existential types">;
 
-def enable_parameterized_existential_types :
-  Flag<["-"], "enable-parameterized-existential-types">,
-  HelpText<"Enable experimental support for parameterized existential types">;
-
 def enable_experimental_opened_existential_types :
   Flag<["-"], "enable-experimental-opened-existential-types">,
   HelpText<"Enable experimental support for implicitly opened existentials">;
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -448,9 +448,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableExperimentalNamedOpaqueTypes |=
       Args.hasArg(OPT_enable_experimental_named_opaque_types);
 
-  Opts.EnableParameterizedExistentialTypes |=
-      Args.hasArg(OPT_enable_parameterized_existential_types);
-
   Opts.EnableOpenedExistentialTypes =
     Args.hasFlag(OPT_enable_experimental_opened_existential_types,
                  OPT_disable_experimental_opened_existential_types,
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -632,7 +632,7 @@ static Type applyGenericArguments(Type type, TypeResolution resolution,
     // Build ParameterizedProtocolType if the protocol has a primary associated
     // type and we're in a supported context (for now just generic requirements,
     // inheritance clause, extension binding).
-    if (!resolution.getOptions().isParameterizedProtocolSupported(ctx.LangOpts)) {
+    if (!resolution.getOptions().isParameterizedProtocolSupported()) {
       diags.diagnose(loc, diag::parameterized_protocol_not_supported);
       return ErrorType::get(ctx);
     }
diff --git a/lib/Sema/TypeCheckType.h b/lib/Sema/TypeCheckType.h
@@ -284,18 +284,14 @@ class TypeResolutionOptions {
   }
 
   /// Whether parameterized protocol types are supported in this context.
-  ///
-  /// FIXME: Remove LangOptions parameter once EnableParameterizedExistentialTypes
-  /// staging flag is gone.
-  bool isParameterizedProtocolSupported(const LangOptions &opts) const {
+  bool isParameterizedProtocolSupported() const {
     switch (context) {
     case Context::Inherited:
     case Context::ExtensionBinding:
     case Context::GenericRequirement:
-      return true;
     case Context::ExistentialConstraint:
     case Context::MetatypeBase:
-      return opts.EnableParameterizedExistentialTypes;
+      return true;
     case Context::None:
     case Context::TypeAliasDecl:
     case Context::GenericTypeAliasDecl:
diff --git a/test/Constraints/parameterized_existential_metatypes.swift b/test/Constraints/parameterized_existential_metatypes.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-parameterized-existential-types -disable-availability-checking
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 //
 // FIXME: Merge this file with existential_metatypes.swift once -enable-parameterized-existential-types becomes the default
 
diff --git a/test/IRGen/existential_shape_metadata.swift b/test/IRGen/existential_shape_metadata.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s -swift-version 5  -disable-availability-checking -enable-parameterized-existential-types | %IRGenFileCheck %s
+// RUN: %target-swift-frontend -emit-ir %s -swift-version 5 -disable-availability-checking | %IRGenFileCheck %s
 
 // CHECK-LABEL: @"$sl26existential_shape_metadata2Q0_pyxXPXGMq" = linkonce_odr hidden constant
 // CHECK-SAME:  { i32 {{.*}}sub ([[INT]] ptrtoint (i8** @{{[0-9]+}} to [[INT]])
diff --git a/test/Interpreter/parameterized_existentials.swift b/test/Interpreter/parameterized_existentials.swift
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-Xfrontend -enable-parameterized-existential-types -Xfrontend -disable-availability-checking)
+// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking)
 // REQUIRES: executable_test
 
 import StdlibUnittest
diff --git a/test/RemoteAST/parameterized_existentials.swift b/test/RemoteAST/parameterized_existentials.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-remoteast-test -enable-parameterized-existential-types -disable-availability-checking %s | %FileCheck %s
+// RUN: %target-swift-remoteast-test -disable-availability-checking %s | %FileCheck %s
 
 // REQUIRES: swift-remoteast-test
 
diff --git a/test/SILGen/parameterized_existentials.swift b/test/SILGen/parameterized_existentials.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -module-name parameterized -enable-parameterized-existential-types -disable-availability-checking %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -module-name parameterized -disable-availability-checking %s | %FileCheck %s
 
 protocol P<T, U, V> {
   associatedtype T
diff --git a/test/SILOptimizer/cast_folding_parameterized_protocol.swift b/test/SILOptimizer/cast_folding_parameterized_protocol.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend %s -emit-sil -enable-parameterized-existential-types -disable-availability-checking -O -o - | %FileCheck %s
+// RUN: %target-swift-frontend %s -emit-sil -disable-availability-checking -O -o - | %FileCheck %s
 
 public protocol P<T> {
   associatedtype T
diff --git a/test/Sema/availability_parameterized_existential.swift b/test/Sema/availability_parameterized_existential.swift
@@ -1,8 +1,8 @@
-// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -enable-parameterized-existential-types
-// RUN: not %target-swift-frontend -target %target-cpu-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -enable-parameterized-existential-types -typecheck %s 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.50 -disable-objc-attr-requires-foundation-module
+// RUN: not %target-swift-frontend -target %target-cpu-apple-macosx10.50 -disable-objc-attr-requires-foundation-module -typecheck %s 2>&1 | %FileCheck %s '--implicit-check-not=<unknown>:0'
 
 // Make sure we do not emit availability errors or warnings when -disable-availability-checking is passed
-// RUN: not %target-swift-frontend -target %target-cpu-apple-macosx10.50 -typecheck -disable-objc-attr-requires-foundation-module -enable-parameterized-existential-types -disable-availability-checking %s 2>&1 | %FileCheck %s '--implicit-check-not=error:'
+// RUN: not %target-swift-frontend -target %target-cpu-apple-macosx10.50 -typecheck -disable-objc-attr-requires-foundation-module -disable-availability-checking %s 2>&1 | %FileCheck %s '--implicit-check-not=error:'
 
 // REQUIRES: OS=macosx
 
diff --git a/test/Serialization/parameterized_protocol.swift b/test/Serialization/parameterized_protocol.swift
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -enable-parameterized-existential-types -emit-module %S/Inputs/parameterized_protocol_other.swift -emit-module-path %t/parameterized_protocol_other.swiftmodule
-// RUN: %target-typecheck-verify-swift -enable-parameterized-existential-types -I%t
+// RUN: %target-swift-frontend -emit-module %S/Inputs/parameterized_protocol_other.swift -emit-module-path %t/parameterized_protocol_other.swiftmodule
+// RUN: %target-typecheck-verify-swift -I%t
 
 import parameterized_protocol_other
 
diff --git a/test/type/opaque_parameterized_existential.swift b/test/type/opaque_parameterized_existential.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-parameterized-existential-types -disable-availability-checking -typecheck -verify %s
+// RUN: %target-swift-frontend -disable-availability-checking -typecheck -verify %s
 
 // I do not like nested some type params,
 // I do not like them Σam-i-am
diff --git a/test/type/parameterized_existential.swift b/test/type/parameterized_existential.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -disable-availability-checking -enable-parameterized-existential-types
+// RUN: %target-typecheck-verify-swift -requirement-machine-protocol-signatures=on -requirement-machine-inferred-signatures=on -disable-availability-checking
 
 protocol Sequence<Element> {
   associatedtype Element
diff --git a/validation-test/compiler_crashers_2_fixed/unsupported_recursive_opaque_conformance.swift b/validation-test/compiler_crashers_2_fixed/unsupported_recursive_opaque_conformance.swift
@@ -1,4 +1,4 @@
-// RUN: not %target-swift-frontend -disable-availability-checking -emit-ir -enable-parameterized-existential-types %s
+// RUN: not %target-swift-frontend -disable-availability-checking -emit-ir %s
 
 protocol P<X, Y> {
   associatedtype X : P

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ static Type applyGenericArguments(Type type, TypeResolution resolution,`
`632`	`632`	`// Build ParameterizedProtocolType if the protocol has a primary associated`
`633`	`633`	`// type and we're in a supported context (for now just generic requirements,`
`634`	`634`	`// inheritance clause, extension binding).`
`635`		`- if (!resolution.getOptions().isParameterizedProtocolSupported(ctx.LangOpts)) {`
	`635`	`+ if (!resolution.getOptions().isParameterizedProtocolSupported()) {`
`636`	`636`	`diags.diagnose(loc, diag::parameterized_protocol_not_supported);`
`637`	`637`	`return ErrorType::get(ctx);`
`638`	`638`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-typecheck-verify-swift -enable-parameterized-existential-types -disable-availability-checking`
	`1`	`+// RUN: %target-typecheck-verify-swift -disable-availability-checking`
`2`	`2`	`//`
`3`	`3`	`// FIXME: Merge this file with existential_metatypes.swift once -enable-parameterized-existential-types becomes the default`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -emit-ir %s -swift-version 5 -disable-availability-checking -enable-parameterized-existential-types \| %IRGenFileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -emit-ir %s -swift-version 5 -disable-availability-checking \| %IRGenFileCheck %s`
`2`	`2`
`3`	`3`	`// CHECK-LABEL: @"$sl26existential_shape_metadata2Q0_pyxXPXGMq" = linkonce_odr hidden constant`
`4`	`4`	`// CHECK-SAME: { i32 {{.}}sub ([[INT]] ptrtoint (i8* @{{[0-9]+}} to [[INT]])`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-run-simple-swift(-Xfrontend -enable-parameterized-existential-types -Xfrontend -disable-availability-checking)`
	`1`	`+// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking)`
`2`	`2`	`// REQUIRES: executable_test`
`3`	`3`
`4`	`4`	`import StdlibUnittest`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-remoteast-test -enable-parameterized-existential-types -disable-availability-checking %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-remoteast-test -disable-availability-checking %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: swift-remoteast-test`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-emit-silgen -module-name parameterized -enable-parameterized-existential-types -disable-availability-checking %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-emit-silgen -module-name parameterized -disable-availability-checking %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`protocol P<T, U, V> {`
`4`	`4`	`associatedtype T`