Merge pull request #36858 from eeckstein/remove-oat-tracker

SIL: remove the SILOpenedArchetypesTracker

Author: eeckstein

include/swift/SIL/SILBuilder.h

@@ -22,7 +22,6 @@
 #include "swift/SIL/Dominance.h"
 #include "swift/SIL/SILBuilder.h"
 #include "swift/SIL/SILDebugScope.h"
-#include "swift/SIL/SILOpenedArchetypesTracker.h"
 #include "swift/SIL/SILVisitor.h"
 
 namespace swift {
@@ -48,7 +47,6 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   SILBuilder Builder;
   DominanceInfo *DomTree = nullptr;
   TypeSubstitutionMap OpenedExistentialSubs;
-  SILOpenedArchetypesTracker OpenedArchetypesTracker;
 
   // The old-to-new value map.
   llvm::DenseMap<SILValue, SILValue> ValueMap;
@@ -74,21 +72,10 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
 public:
   using SILInstructionVisitor<ImplClass>::asImpl;
 
-  explicit SILCloner(SILFunction &F,
-                     SILOpenedArchetypesTracker &OpenedArchetypesTracker,
-                     DominanceInfo *DT = nullptr)
-      : Builder(F), DomTree(DT),
-        OpenedArchetypesTracker(OpenedArchetypesTracker) {
-    Builder.setOpenedArchetypesTracker(&OpenedArchetypesTracker);
-  }
-
   explicit SILCloner(SILFunction &F, DominanceInfo *DT = nullptr)
-      : Builder(F), DomTree(DT), OpenedArchetypesTracker(&F) {
-    Builder.setOpenedArchetypesTracker(&OpenedArchetypesTracker);
-  }
+      : Builder(F), DomTree(DT) {}
 
-  explicit SILCloner(SILGlobalVariable *GlobVar)
-      : Builder(GlobVar), OpenedArchetypesTracker(nullptr) {}
+  explicit SILCloner(SILGlobalVariable *GlobVar) : Builder(GlobVar) {}
 
   void clearClonerState() {
     ValueMap.clear();
@@ -385,15 +372,6 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
 private:
   /// MARK: SILCloner implementation details hidden from CRTP extensions.
 
-  /// SILVisitor CRTP callback. Preprocess any instruction before cloning.
-  void beforeVisit(SILInstruction *Orig) {
-    // Update the set of available opened archetypes with the opened
-    // archetypes used by the current instruction.
-    auto TypeDependentOperands = Orig->getTypeDependentOperands();
-    Builder.getOpenedArchetypes().addOpenedArchetypeOperands(
-        TypeDependentOperands);
-  }
-
   void clonePhiArgs(SILBasicBlock *oldBB);
 
   void visitBlocksDepthFirst(SILBasicBlock *StartBB);
@@ -418,7 +396,6 @@ class SILBuilderWithPostProcess : public SILBuilder {
     {
       setInsertionPoint(SC.getBuilder().getInsertionBB(),
                         SC.getBuilder().getInsertionPoint());
-      setOpenedArchetypesTracker(SC.getBuilder().getOpenedArchetypesTracker());
     }
 
   ~SILBuilderWithPostProcess() {
@@ -437,27 +414,9 @@ class SILClonerWithScopes : public SILCloner<ImplClass> {
   friend class SILCloner<ImplClass>;
 public:
   SILClonerWithScopes(SILFunction &To,
-                      SILOpenedArchetypesTracker &OpenedArchetypesTracker,
                       DominanceInfo *DT = nullptr,
                       bool Disable = false)
-      : SILCloner<ImplClass>(To, OpenedArchetypesTracker, DT) {
-
-    // We only want to do this when we generate cloned functions, not
-    // when we inline.
-
-    // FIXME: This is due to having TypeSubstCloner inherit from
-    //        SILClonerWithScopes, and having TypeSubstCloner be used
-    //        both by passes that clone whole functions and ones that
-    //        inline functions.
-    if (Disable)
-      return;
-
-    scopeCloner.reset(new ScopeCloner(To));
-  }
-
-  SILClonerWithScopes(SILFunction &To,
-                      bool Disable = false)
-      : SILCloner<ImplClass>(To) {
+      : SILCloner<ImplClass>(To, DT) {
 
     // We only want to do this when we generate cloned functions, not
     // when we inline.
@@ -472,7 +431,6 @@ class SILClonerWithScopes : public SILCloner<ImplClass> {
     scopeCloner.reset(new ScopeCloner(To));
   }
 
-
 private:
   std::unique_ptr<ScopeCloner> scopeCloner;
 protected:
@@ -684,9 +642,7 @@ void SILCloner<ImplClass>::visitBlocksDepthFirst(SILBasicBlock *startBB) {
     if (BB != startBB)
       clonePhiArgs(BB);
 
-    // Non-terminating instructions are cloned in the first preorder walk so
-    // that all opened existentials are registered with OpenedArchetypesTracker
-    // before phi argument type substitution in successors.
+    // Non-terminating instructions are cloned in the first preorder walk.
     getBuilder().setInsertionPoint(BBMap[BB]);
     asImpl().visitInstructionsInBlock(BB);