Remove SpecializeOpaqueArchetypes for now

Author: aschwaighofer

include/swift/SIL/SILCloner.h

@@ -121,8 +121,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   /// after mapping all blocks.
   void cloneReachableBlocks(SILBasicBlock *startBB,
                             ArrayRef<SILBasicBlock *> exitBlocks,
-                            SILBasicBlock *insertAfterBB = nullptr,
-                            bool havePrepopulatedFunctionArgs = false);
+                            SILBasicBlock *insertAfterBB = nullptr);
 
   /// Clone all blocks in this function and all instructions in those
   /// blocks.
@@ -580,15 +579,13 @@ void SILCloner<ImplClass>::visitInstructionsInBlock(SILBasicBlock* BB) {
 template <typename ImplClass>
 void SILCloner<ImplClass>::cloneReachableBlocks(
   SILBasicBlock *startBB, ArrayRef<SILBasicBlock *> exitBlocks,
-  SILBasicBlock *insertAfterBB,
-  bool havePrepopulatedFunctionArgs) {
+  SILBasicBlock *insertAfterBB) {
 
   SILFunction *F = startBB->getParent();
   assert(F == &Builder.getFunction()
          && "cannot clone region across functions.");
   assert(BBMap.empty() && "This API does not allow clients to map blocks.");
-  assert((havePrepopulatedFunctionArgs || ValueMap.empty()) &&
-         "Stale ValueMap.");
+  assert(ValueMap.empty() && "Stale ValueMap.");
 
   auto *clonedStartBB = insertAfterBB ? F->createBasicBlockAfter(insertAfterBB)
     : F->createBasicBlock();

include/swift/SIL/SILType.h

@@ -465,10 +465,10 @@ class SILType {
   ///
   /// If the replacement types are generic, you must push a generic context
   /// first.
-  SILType subst(SILModule &silModule, TypeSubstitutionFn subs,
+  SILType subst(SILModule &silModule,
+                TypeSubstitutionFn subs,
                 LookupConformanceFn conformances,
-                CanGenericSignature genericSig = CanGenericSignature(),
-                bool shouldSubstituteOpaqueArchetypes = false) const;
+                CanGenericSignature genericSig=CanGenericSignature()) const;
 
   SILType subst(SILModule &silModule, SubstitutionMap subs) const;
 

include/swift/SILOptimizer/PassManager/Passes.def

@@ -224,8 +224,6 @@ PASS(NoReturnFolding, "noreturn-folding",
      "Prune Control Flow at No-Return Calls Using SIL unreachable")
 PASS(ObjectOutliner, "object-outliner",
      "Outlining of Global Objects")
-PASS(OpaqueArchetypeSpecializer, "opaque-archetype-specializer",
-     "Opaque archetype specializer")
 PASS(Outliner, "outliner",
      "Function Outlining Optimization")
 PASS(OwnershipModelEliminator, "ownership-model-eliminator",

lib/SIL/SILFunctionType.cpp

@@ -2274,21 +2274,17 @@ class SILTypeSubstituter :
   // context signature.
   CanGenericSignature Sig;
 
-  bool shouldSubstituteOpaqueArchetypes;
-
   ASTContext &getASTContext() { return TheSILModule.getASTContext(); }
 
 public:
   SILTypeSubstituter(SILModule &silModule,
                      TypeSubstitutionFn Subst,
                      LookupConformanceFn Conformances,
-                     CanGenericSignature Sig,
-                     bool shouldSubstituteOpaqueArchetypes)
+                     CanGenericSignature Sig)
     : TheSILModule(silModule),
       Subst(Subst),
       Conformances(Conformances),
-      Sig(Sig),
-      shouldSubstituteOpaqueArchetypes(shouldSubstituteOpaqueArchetypes)
+      Sig(Sig)
   {}
 
   // SIL type lowering only does special things to tuples and functions.
@@ -2409,13 +2405,7 @@ class SILTypeSubstituter :
   CanType visitType(CanType origType) {
     assert(!isa<AnyFunctionType>(origType));
     assert(!isa<LValueType>(origType) && !isa<InOutType>(origType));
-
-    SubstOptions substOptions(None);
-    if (shouldSubstituteOpaqueArchetypes)
-      substOptions = SubstFlags::SubstituteOpaqueArchetypes |
-                     SubstFlags::AllowLoweredTypes;
-    auto substType =
-        origType.subst(Subst, Conformances, substOptions)->getCanonicalType();
+    auto substType = origType.subst(Subst, Conformances)->getCanonicalType();
 
     // If the substitution didn't change anything, we know that the
     // original type was a lowered type, so we're good.
@@ -2430,24 +2420,23 @@ class SILTypeSubstituter :
 
 } // end anonymous namespace
 
-SILType SILType::subst(SILModule &silModule, TypeSubstitutionFn subs,
+SILType SILType::subst(SILModule &silModule,
+                       TypeSubstitutionFn subs,
                        LookupConformanceFn conformances,
-                       CanGenericSignature genericSig,
-                       bool shouldSubstituteOpaqueArchetypes) const {
-  if (!hasArchetype() && !hasTypeParameter() &&
-      (!shouldSubstituteOpaqueArchetypes ||
-       !getASTType()->hasOpaqueArchetype()))
+                       CanGenericSignature genericSig) const {
+  if (!hasArchetype() && !hasTypeParameter())
     return *this;
 
   if (!genericSig)
     genericSig = silModule.Types.getCurGenericContext();
   SILTypeSubstituter STST(silModule, subs, conformances,
-                          genericSig, shouldSubstituteOpaqueArchetypes);
+                          genericSig);
   return STST.subst(*this);
 }
 
 SILType SILType::subst(SILModule &silModule, SubstitutionMap subs) const{
-  return subst(silModule, QuerySubstitutionMap{subs},
+  return subst(silModule,
+               QuerySubstitutionMap{subs},
                LookUpConformanceInSubstitutionMap(subs));
 }
 
@@ -2476,7 +2465,7 @@ SILFunctionType::substGenericArgs(SILModule &silModule,
                                   LookupConformanceFn conformances) {
   if (!isPolymorphic()) return CanSILFunctionType(this);
   SILTypeSubstituter substituter(silModule, subs, conformances,
-                                 getGenericSignature(), false);
+                                 getGenericSignature());
   return substituter.substSILFunctionType(CanSILFunctionType(this));
 }
 

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -273,11 +273,7 @@ void addSSAPasses(SILPassPipelinePlan &P, OptimizationLevelKind OpLevel) {
 
   // Mainly for Array.append(contentsOf) optimization.
   P.addArrayElementPropagation();
-
-  // Specialize opaque archetypes.
-  // This can expose oportunities for the generic specializer.
-  P.addOpaqueArchetypeSpecializer();
-
+  
   // Run the devirtualizer, specializer, and inliner. If any of these
   // makes a change we'll end up restarting the function passes on the
   // current function (after optimizing any new callees).

lib/SILOptimizer/Transforms/CMakeLists.txt

@@ -32,7 +32,6 @@ silopt_register_sources(
   SILSROA.cpp
   SimplifyCFG.cpp
   Sink.cpp
-  SpecializeOpaqueArchetypes.cpp
   SpeculativeDevirtualizer.cpp
   StackPromotion.cpp
   UnsafeGuaranteedPeephole.cpp