Sema: Remove non-experimental associated type inference

Author: slavapestov

include/swift/AST/ProtocolConformance.h

@@ -747,10 +747,6 @@ class NormalProtocolConformance : public RootProtocolConformance,
   /// Override the witness for a given requirement.
   void overrideWitness(ValueDecl *requirement, Witness newWitness);
 
-  /// Populate the signature conformances without checking if they satisfy
-  /// requirements. Can only be used with parsed or imported conformances.
-  void finishSignatureConformances();
-
   /// Determine whether the witness for the given type requirement
   /// is the default definition.
   bool usesDefaultDefinition(AssociatedTypeDecl *requirement) const {

include/swift/Basic/LangOptions.h

@@ -567,9 +567,6 @@ namespace swift {
     /// rewrite system.
     bool EnableRequirementMachineOpaqueArchetypes = false;
 
-    /// Enable experimental associated type inference improvements.
-    bool EnableExperimentalAssociatedTypeInference = false;
-
     /// Enable implicit lifetime dependence for ~Escapable return types.
     bool EnableExperimentalLifetimeDependenceInference = true;
 

lib/AST/ProtocolConformance.cpp

@@ -563,14 +563,6 @@ NormalProtocolConformance::getAssociatedConformance(Type assocType,
   forEachAssociatedConformance(
       [&](Type t, ProtocolDecl *p, unsigned index) {
         if (t->isEqual(assocType) && p == protocol) {
-          if (!ctx.LangOpts.EnableExperimentalAssociatedTypeInference) {
-            // Fill in the signature conformances, if we haven't done so yet.
-            if (!hasComputedAssociatedConformances()) {
-              const_cast<NormalProtocolConformance *>(this)
-                  ->finishSignatureConformances();
-            }
-          }
-
           // Not strictly necessary, but avoids a bit of request evaluator
           // overhead in the happy case.
           if (hasComputedAssociatedConformances()) {
@@ -632,28 +624,6 @@ void NormalProtocolConformance::setAssociatedConformance(
   AssociatedConformances[index] = assocConf;
 }
 
-/// Collect conformances for the requirement signature.
-void NormalProtocolConformance::finishSignatureConformances() {
-  if (Loader)
-    resolveLazyInfo();
-
-  if (hasComputedAssociatedConformances())
-    return;
-
-  createAssociatedConformanceArray();
-
-  auto &ctx = getDeclContext()->getASTContext();
-
-  forEachAssociatedConformance(
-    [&](Type origTy, ProtocolDecl *reqProto, unsigned index) {
-      auto canTy = origTy->getCanonicalType();
-      evaluateOrDefault(ctx.evaluator,
-                        AssociatedConformanceRequest{this, canTy, reqProto, index},
-                        ProtocolConformanceRef::forInvalid());
-      return false;
-    });
-}
-
 Witness RootProtocolConformance::getWitness(ValueDecl *requirement) const {
   ROOT_CONFORMANCE_SUBCLASS_DISPATCH(getWitness, (requirement))
 }

lib/Basic/LangOptions.cpp

@@ -51,7 +51,6 @@ LangOptions::LangOptions() {
   // Default-on NoncopyableGenerics when the build-script setting is enabled.
   if (SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS) {
     Features.insert(Feature::NoncopyableGenerics);
-    EnableExperimentalAssociatedTypeInference = true;
   }
 
   // Enable any playground options that are enabled by default.

lib/Frontend/CompilerInvocation.cpp

@@ -1390,13 +1390,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_enable_requirement_machine_opaque_archetypes))
     Opts.EnableRequirementMachineOpaqueArchetypes = true;
 
-  Opts.EnableExperimentalAssociatedTypeInference = true;
-
-  if (Args.hasArg(OPT_enable_experimental_associated_type_inference))
-    Opts.EnableExperimentalAssociatedTypeInference = true;
-  if (Args.hasArg(OPT_disable_experimental_associated_type_inference))
-    Opts.EnableExperimentalAssociatedTypeInference = false;
-
   if (Args.hasArg(OPT_enable_experimental_lifetime_dependence_inference))
     Opts.EnableExperimentalLifetimeDependenceInference = true;
   if (Args.hasArg(OPT_disable_experimental_lifetime_dependence_inference))

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1656,8 +1656,6 @@ void InterfaceSubContextDelegateImpl::inheritOptionsForBuildingInterface(
   if (bool(requireNCGenerics)) {
     genericSubInvocation.getLangOptions()
                         .enableFeature(Feature::NoncopyableGenerics);
-    genericSubInvocation.getLangOptions()
-      .EnableExperimentalAssociatedTypeInference = true;
   }
 
   // Pass-down the obfuscators so we can get the serialized search paths properly.