Merge pull request swiftlang#36592 from drexin/wip-remove-codable-enum-flag

compnerd · web-flow · commit c03c3b266d41 · 2021-03-31T15:04:32.000-07:00
[Frontend] Remove enable-experimental-enum-codable-derivation flag
diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
@@ -273,9 +273,6 @@ namespace swift {
     /// Enable inference of Sendable conformances for public types.
     bool EnableInferPublicSendable = false;
 
-    /// Enable experimental derivation of `Codable` for enums.
-    bool EnableExperimentalEnumCodableDerivation = false;
-
     /// Disable the implicit import of the _Concurrency module.
     bool DisableImplicitConcurrencyModuleImport = false;
 
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -237,10 +237,6 @@ def enable_experimental_flow_sensitive_concurrent_captures :
   Flag<["-"], "enable-experimental-flow-sensitive-concurrent-captures">,
   HelpText<"Enable flow-sensitive concurrent captures">;
 
-def enable_experimental_enum_codable_derivation :
-  Flag<["-"], "enable-experimental-enum-codable-derivation">,
-  HelpText<"Enable experimental derivation of Codable for enums">;
-
 def enable_resilience : Flag<["-"], "enable-resilience">,
      HelpText<"Deprecated, use -enable-library-evolution instead">;
 }
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -394,9 +394,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableExperimentalFlowSensitiveConcurrentCaptures |=
     Args.hasArg(OPT_enable_experimental_flow_sensitive_concurrent_captures);
 
-  Opts.EnableExperimentalEnumCodableDerivation |=
-      Args.hasArg(OPT_enable_experimental_enum_codable_derivation);
-
   Opts.DisableImplicitConcurrencyModuleImport |=
     Args.hasArg(OPT_disable_implicit_concurrency_module_import);
 
diff --git a/lib/Sema/DerivedConformanceCodable.cpp b/lib/Sema/DerivedConformanceCodable.cpp
@@ -2014,9 +2014,7 @@ static bool canDeriveCodable(NominalTypeDecl *NTD,
   // Structs, classes and enums can explicitly derive Encodable and Decodable
   // conformance (explicitly meaning we can synthesize an implementation if
   // a type conforms manually).
-  if (!isa<StructDecl>(NTD) && !isa<ClassDecl>(NTD) &&
-      !(NTD->getASTContext().LangOpts.EnableExperimentalEnumCodableDerivation
-        && isa<EnumDecl>(NTD))) {
+  if (!isa<StructDecl>(NTD) && !isa<ClassDecl>(NTD) && !isa<EnumDecl>(NTD)) {
     return false;
   }
 
@@ -2039,8 +2037,7 @@ bool DerivedConformance::canDeriveEncodable(NominalTypeDecl *NTD) {
 ValueDecl *DerivedConformance::deriveEncodable(ValueDecl *requirement) {
   // We can only synthesize Encodable for structs and classes.
   if (!isa<StructDecl>(Nominal) && !isa<ClassDecl>(Nominal) &&
-      !(Context.LangOpts.EnableExperimentalEnumCodableDerivation
-        && isa<EnumDecl>(Nominal)))
+      !isa<EnumDecl>(Nominal))
     return nullptr;
 
   if (requirement->getBaseName() != Context.Id_encode) {
@@ -2070,8 +2067,7 @@ ValueDecl *DerivedConformance::deriveEncodable(ValueDecl *requirement) {
 ValueDecl *DerivedConformance::deriveDecodable(ValueDecl *requirement) {
   // We can only synthesize Encodable for structs and classes.
   if (!isa<StructDecl>(Nominal) && !isa<ClassDecl>(Nominal) &&
-      !(Context.LangOpts.EnableExperimentalEnumCodableDerivation
-        && isa<EnumDecl>(Nominal)))
+      !isa<EnumDecl>(Nominal))
     return nullptr;
 
   if (requirement->getBaseName() != DeclBaseName::createConstructor()) {
diff --git a/test/IRGen/synthesized_conformance.swift b/test/IRGen/synthesized_conformance.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -disable-generic-metadata-prespecialization -emit-ir %s -swift-version 4 -enable-experimental-enum-codable-derivation | %FileCheck %s
+// RUN: %target-swift-frontend -disable-generic-metadata-prespecialization -emit-ir %s -swift-version 4 | %FileCheck %s
 
 struct Struct<T> {
     var x: T
diff --git a/test/IRGen/synthesized_conformance_future.swift b/test/IRGen/synthesized_conformance_future.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -swift-version 4 -enable-experimental-enum-codable-derivation | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
+// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -swift-version 4 | %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment
 
 // REQUIRES: VENDOR=apple || OS=linux-gnu
 // UNSUPPORTED: CPU=i386 && OS=ios
diff --git a/test/SILGen/synthesized_conformance_enum.swift b/test/SILGen/synthesized_conformance_enum.swift
@@ -1,5 +1,5 @@
-// RUN: %target-swift-frontend -emit-silgen %s -swift-version 4 -enable-experimental-enum-codable-derivation | %FileCheck -check-prefix CHECK -check-prefix CHECK-FRAGILE %s
-// RUN: %target-swift-frontend -emit-silgen %s -swift-version 4 -enable-library-evolution -enable-experimental-enum-codable-derivation | %FileCheck -check-prefix CHECK -check-prefix CHECK-RESILIENT %s
+// RUN: %target-swift-frontend -emit-silgen %s -swift-version 4 | %FileCheck -check-prefix CHECK -check-prefix CHECK-FRAGILE %s
+// RUN: %target-swift-frontend -emit-silgen %s -swift-version 4 -enable-library-evolution | %FileCheck -check-prefix CHECK -check-prefix CHECK-RESILIENT %s
 
 enum Enum<T> {
     case a(T), b(T)
diff --git a/test/decl/protocol/special/coding/enum_codable_case_identifier_overloads.swift b/test/decl/protocol/special/coding/enum_codable_case_identifier_overloads.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 // Simple enums with all Codable parameters whose CodingKeys come from a
 // typealias should get derived conformance to Codable.
diff --git a/test/decl/protocol/special/coding/enum_codable_codingkeys_typealias.swift b/test/decl/protocol/special/coding/enum_codable_codingkeys_typealias.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 // Simple enums with all Codable parameters whose CodingKeys come from a
 // typealias should get derived conformance to Codable.
diff --git a/test/decl/protocol/special/coding/enum_codable_conflicting_parameter_identifier.swift b/test/decl/protocol/special/coding/enum_codable_conflicting_parameter_identifier.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 enum Duplicate : Codable { // expected-error {{type 'Duplicate' does not conform to protocol 'Decodable'}}
   // expected-error@-1 {{type 'Duplicate' does not conform to protocol 'Encodable'}}
diff --git a/test/decl/protocol/special/coding/enum_codable_excluded_optional_properties.swift b/test/decl/protocol/special/coding/enum_codable_excluded_optional_properties.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift
 
 enum EnumWithNonExcludedOptionalParameters : Codable { // expected-error {{type 'EnumWithNonExcludedOptionalParameters' does not conform to protocol 'Decodable'}}
     // expected-error@-1 {{type 'EnumWithNonExcludedOptionalParameters' does not conform to protocol 'Encodable'}}
diff --git a/test/decl/protocol/special/coding/enum_codable_failure_diagnostics.swift b/test/decl/protocol/special/coding/enum_codable_failure_diagnostics.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify -enable-experimental-enum-codable-derivation
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -swift-version 4 %s -verify
 
 // Codable enum with non-Codable parameter.
 enum E1 : Codable {
diff --git a/test/decl/protocol/special/coding/enum_codable_ignore_nonconforming_property.swift b/test/decl/protocol/special/coding/enum_codable_ignore_nonconforming_property.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 struct NonCodable {}
 
diff --git a/test/decl/protocol/special/coding/enum_codable_invalid_codingkeys.swift b/test/decl/protocol/special/coding/enum_codable_invalid_codingkeys.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 // Enums with a CodingKeys entity which is not a type should not derive
 // conformance.
diff --git a/test/decl/protocol/special/coding/enum_codable_member_type_lookup.swift b/test/decl/protocol/special/coding/enum_codable_member_type_lookup.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 // MARK: - Synthesized CodingKeys Enum
 
diff --git a/test/decl/protocol/special/coding/enum_codable_nonconforming_property.swift b/test/decl/protocol/special/coding/enum_codable_nonconforming_property.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 enum NonCodable : Hashable {
     func hash(into hasher: inout Hasher) {}
diff --git a/test/decl/protocol/special/coding/enum_codable_reordered_codingkeys.swift b/test/decl/protocol/special/coding/enum_codable_reordered_codingkeys.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 // The order of cases in the case specific CodingKeys enum should not matter
 enum SimpleEnum : Codable {
diff --git a/test/decl/protocol/special/coding/enum_codable_simple.swift b/test/decl/protocol/special/coding/enum_codable_simple.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown
 
 // Simple enums with all Codable parameters should get derived conformance to
 // Codable.
diff --git a/test/decl/protocol/special/coding/enum_codable_simple_conditional.swift b/test/decl/protocol/special/coding/enum_codable_simple_conditional.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4
 
 enum Conditional<T> {
   case a(x: T, y: T?)
diff --git a/test/decl/protocol/special/coding/enum_codable_simple_conditional_separate.swift b/test/decl/protocol/special/coding/enum_codable_simple_conditional_separate.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4
 
 enum Conditional<T> {
   case a(x: T, y: T?)
diff --git a/test/decl/protocol/special/coding/enum_codable_simple_extension.swift b/test/decl/protocol/special/coding/enum_codable_simple_extension.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4
 
 // Simple enums where Codable conformance is added in extensions should derive
 // conformance.
diff --git a/test/decl/protocol/special/coding/enum_codable_simple_extension_flipped.swift b/test/decl/protocol/special/coding/enum_codable_simple_extension_flipped.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4 -enable-experimental-enum-codable-derivation
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -swift-version 4
 
 // Simple enums where Codable conformance is added in extensions should derive
 // conformance, no matter which order the extension and type occur in.
diff --git a/test/decl/protocol/special/coding/enum_codable_simple_multi.swift b/test/decl/protocol/special/coding/enum_codable_simple_multi.swift
@@ -1,2 +1,2 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation %S/Inputs/enum_codable_simple_multi1.swift %S/Inputs/enum_codable_simple_multi2.swift
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation %S/Inputs/enum_codable_simple_multi2.swift %S/Inputs/enum_codable_simple_multi1.swift
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/enum_codable_simple_multi1.swift %S/Inputs/enum_codable_simple_multi2.swift
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown %S/Inputs/enum_codable_simple_multi2.swift %S/Inputs/enum_codable_simple_multi1.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -disable-generic-metadata-prespecialization -emit-ir %s -swift-version 4 -enable-experimental-enum-codable-derivation \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -disable-generic-metadata-prespecialization -emit-ir %s -swift-version 4 \| %FileCheck %s`
`2`	`2`
`3`	`3`	`struct Struct<T> {`
`4`	`4`	`var x: T`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -swift-version 4 -enable-experimental-enum-codable-derivation \| %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment`
	`1`	`+// RUN: %target-swift-frontend -prespecialize-generic-metadata -target %module-target-future -emit-ir %s -swift-version 4 \| %FileCheck %s -DINT=i%target-ptrsize -DALIGNMENT=%target-alignment`
`2`	`2`
`3`	`3`	`// REQUIRES: VENDOR=apple \|\| OS=linux-gnu`
`4`	`4`	`// UNSUPPORTED: CPU=i386 && OS=ios`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -enable-experimental-enum-codable-derivation`
	`1`	`+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown`
`2`	`2`
`3`	`3`	`// Simple enums with all Codable parameters whose CodingKeys come from a`
`4`	`4`	`// typealias should get derived conformance to Codable.`