Merge pull request #75183 from kavon/remove-reverse-condfail-workaround

NCGenerics: remove the reverse-condfail workaround

Author: kavon

include/swift/Basic/Features.def

@@ -393,8 +393,6 @@ EXPERIMENTAL_FEATURE(DebugDescriptionMacro, true)
 
 EXPERIMENTAL_FEATURE(ReinitializeConsumeInMultiBlockDefer, false)
 
-EXPERIMENTAL_FEATURE(SE427NoInferenceOnExtension, false)
-
 #undef EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE
 #undef EXPERIMENTAL_FEATURE
 #undef UPCOMING_FEATURE

lib/AST/FeatureSet.cpp

@@ -220,7 +220,6 @@ UNINTERESTING_FEATURE(CImplementation)
 UNINTERESTING_FEATURE(Sensitive)
 UNINTERESTING_FEATURE(DebugDescriptionMacro)
 UNINTERESTING_FEATURE(ReinitializeConsumeInMultiBlockDefer)
-UNINTERESTING_FEATURE(SE427NoInferenceOnExtension)
 
 // ----------------------------------------------------------------------------
 // MARK: - FeatureSet

lib/Sema/TypeCheckGeneric.cpp

@@ -788,15 +788,6 @@ GenericSignatureRequest::evaluate(Evaluator &evaluator,
     // to invertible protocols. This forces people to write out the conditions.
     inferInvertibleReqs = !ext->isAddingConformanceToInvertible();
 
-    // FIXME: to workaround a reverse condfail, always infer the requirements if
-    //  the extension is in a swiftinterface file. This is temporary and should
-    //  be removed soon. (rdar://130424971)
-    if (auto *sf = ext->getOutermostParentSourceFile()) {
-      if (sf->Kind == SourceFileKind::Interface
-          && !ctx.LangOpts.hasFeature(Feature::SE427NoInferenceOnExtension))
-        inferInvertibleReqs = true;
-    }
-
     collectAdditionalExtensionRequirements(ext->getExtendedType(), extraReqs);
 
     auto *extendedNominal = ext->getExtendedNominal();

test/ModuleInterface/noncopyable_generics.swift

@@ -1,20 +1,15 @@
 // RUN: %empty-directory(%t)
 
-// Due to SE427NoInferenceOnExtension not being in production
-// REQUIRES: asserts
-
 // RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module \
 // RUN:     -enable-experimental-feature SuppressedAssociatedTypes \
 // RUN:     -enable-experimental-feature NonescapableTypes \
-// RUN:     -enable-experimental-feature SE427NoInferenceOnExtension \
 // RUN:     -o %t/NoncopyableGenerics_Misc.swiftmodule \
 // RUN:     -emit-module-interface-path %t/NoncopyableGenerics_Misc.swiftinterface \
 // RUN:     %S/Inputs/NoncopyableGenerics_Misc.swift
 
 // RUN: %target-swift-frontend -swift-version 5 -enable-library-evolution -emit-module \
 // RUN:     -enable-experimental-feature SuppressedAssociatedTypes \
 // RUN:     -enable-experimental-feature NonescapableTypes \
-// RUN:     -enable-experimental-feature SE427NoInferenceOnExtension \
 // RUN:     -o %t/Swiftskell.swiftmodule \
 // RUN:     -emit-module-interface-path %t/Swiftskell.swiftinterface \
 // RUN:     %S/../Inputs/Swiftskell.swift
@@ -29,19 +24,16 @@
 // RUN: %target-swift-frontend -compile-module-from-interface \
 // RUN:     -enable-experimental-feature SuppressedAssociatedTypes \
 // RUN:     -enable-experimental-feature NonescapableTypes \
-// RUN:     -enable-experimental-feature SE427NoInferenceOnExtension \
 // RUN:    %t/NoncopyableGenerics_Misc.swiftinterface -o %t/NoncopyableGenerics_Misc.swiftmodule
 
 // RUN: %target-swift-frontend -compile-module-from-interface \
 // RUN:     -enable-experimental-feature SuppressedAssociatedTypes \
 // RUN:     -enable-experimental-feature NonescapableTypes \
-// RUN:     -enable-experimental-feature SE427NoInferenceOnExtension \
 // RUN:    %t/Swiftskell.swiftinterface -o %t/Swiftskell.swiftmodule
 
 // RUN: %target-swift-frontend -emit-silgen -I %t %s \
 // RUN:     -enable-experimental-feature SuppressedAssociatedTypes \
 // RUN:    -enable-experimental-feature NonescapableTypes \
-// RUN:     -enable-experimental-feature SE427NoInferenceOnExtension \
 // RUN:    -o %t/final.silgen
 
 // RUN: %FileCheck %s --check-prefix=CHECK-SILGEN < %t/final.silgen