Revert "Track dependencies of SIL instructions on opened archetypes which they use"

This reverts commit 8ef8bb4.

Broke swift_tools-RA_stdlib-RD_test-no_device and soem others

Author: Xin Tong

include/swift/SIL/SILBuilder.h

@@ -16,7 +16,6 @@
 #include "swift/SIL/SILDebugScope.h"
 #include "swift/SIL/SILFunction.h"
 #include "swift/SIL/SILModule.h"
-#include "swift/SIL/SILOpenedArchetypesTracker.h"
 #include "llvm/ADT/PointerUnion.h"
 #include "llvm/ADT/StringExtras.h"
 
@@ -41,16 +40,6 @@ class SILBuilder {
   /// recorded in this list.
   SmallVectorImpl<SILInstruction *> *InsertedInstrs = nullptr;
 
-  /// An immutable view on the set of available opened archetypes.
-  /// It is passed down to SILInstruction constructors and create
-  /// methods.
-  SILOpenedArchetypesState OpenedArchetypes;
-
-  /// Maps opened archetypes to their definitions. If provided,
-  /// can be used by the builder. It is supposed to be used
-  /// only by SILGen or SIL deserializers.
-  SILOpenedArchetypesTracker *OpenedArchetypesTracker = nullptr;
-
 public:
   SILBuilder(SILFunction &F) : F(F), BB(0) {}
 
@@ -86,19 +75,6 @@ class SILBuilder {
     return F.getModule().getTypeLowering(T);
   }
 
-  void setOpenedArchetypesTracker(SILOpenedArchetypesTracker *Tracker) {
-    this->OpenedArchetypesTracker = Tracker;
-    this->OpenedArchetypes.setOpenedArchetypesTracker(OpenedArchetypesTracker);
-  }
-
-  SILOpenedArchetypesTracker *getOpenedArchetypesTracker() const {
-    return OpenedArchetypesTracker;
-  }
-
-  SILOpenedArchetypesState &getOpenedArchetypes() {
-    return OpenedArchetypes;
-  }
-
   void setCurrentDebugScope(const SILDebugScope *DS) { CurDebugScope = DS; }
   const SILDebugScope *getCurrentDebugScope() const { return CurDebugScope; }
 
@@ -285,8 +261,7 @@ class SILBuilder {
                          SILType Result, ArrayRef<Substitution> Subs,
                          ArrayRef<SILValue> Args, bool isNonThrowing) {
     return insert(ApplyInst::create(getSILDebugLocation(Loc), Fn, SubstFnTy,
-                                    Result, Subs, Args, isNonThrowing, F,
-                                    OpenedArchetypes));
+                                    Result, Subs, Args, isNonThrowing, F));
   }
 
   ApplyInst *createApply(SILLocation Loc, SILValue Fn, ArrayRef<SILValue> Args,
@@ -303,18 +278,16 @@ class SILBuilder {
                                SILBasicBlock *errorBB) {
     return insertTerminator(TryApplyInst::create(getSILDebugLocation(Loc),
                                                  fn, substFnTy, subs, args,
-                                                 normalBB, errorBB, F,
-                                                 OpenedArchetypes));
+                                                 normalBB, errorBB, F));
   }
 
   PartialApplyInst *createPartialApply(SILLocation Loc, SILValue Fn,
                                        SILType SubstFnTy,
                                        ArrayRef<Substitution> Subs,
                                        ArrayRef<SILValue> Args,
                                        SILType ClosureTy) {
-    return insert(PartialApplyInst::create(getSILDebugLocation(Loc), Fn,
-                                           SubstFnTy, Subs, Args, ClosureTy, F,
-                                           OpenedArchetypes));
+    return insert(PartialApplyInst::create(
+        getSILDebugLocation(Loc), Fn, SubstFnTy, Subs, Args, ClosureTy, F));
   }
 
   BuiltinInst *createBuiltin(SILLocation Loc, Identifier Name, SILType ResultTy,
@@ -553,8 +526,8 @@ class SILBuilder {
 
   UncheckedRefCastInst *createUncheckedRefCast(SILLocation Loc, SILValue Op,
                                                SILType Ty) {
-    return insert(UncheckedRefCastInst::create(getSILDebugLocation(Loc), Op, Ty,
-                                               F, OpenedArchetypes));
+    return insert(new (F.getModule()) UncheckedRefCastInst(
+        getSILDebugLocation(Loc), Op, Ty));
   }
 
   UncheckedRefCastAddrInst *
@@ -566,20 +539,20 @@ class SILBuilder {
 
   UncheckedAddrCastInst *createUncheckedAddrCast(SILLocation Loc, SILValue Op,
                                                  SILType Ty) {
-    return insert(UncheckedAddrCastInst::create(getSILDebugLocation(Loc), Op,
-                                                Ty, F, OpenedArchetypes));
+    return insert(new (F.getModule()) UncheckedAddrCastInst(
+        getSILDebugLocation(Loc), Op, Ty));
   }
 
   UncheckedTrivialBitCastInst *
   createUncheckedTrivialBitCast(SILLocation Loc, SILValue Op, SILType Ty) {
-    return insert(UncheckedTrivialBitCastInst::create(
-        getSILDebugLocation(Loc), Op, Ty, F, OpenedArchetypes));
+    return insert(new (F.getModule()) UncheckedTrivialBitCastInst(
+        getSILDebugLocation(Loc), Op, Ty));
   }
 
   UncheckedBitwiseCastInst *
   createUncheckedBitwiseCast(SILLocation Loc, SILValue Op, SILType Ty) {
-    return insert(UncheckedBitwiseCastInst::create(getSILDebugLocation(Loc), Op,
-                                                   Ty, F, OpenedArchetypes));
+    return insert(new (F.getModule()) UncheckedBitwiseCastInst(
+        getSILDebugLocation(Loc), Op, Ty));
   }
 
   RefToBridgeObjectInst *createRefToBridgeObject(SILLocation Loc, SILValue Ref,
@@ -675,8 +648,8 @@ class SILBuilder {
 
   UnconditionalCheckedCastInst *
   createUnconditionalCheckedCast(SILLocation Loc, SILValue op, SILType destTy) {
-    return insert(UnconditionalCheckedCastInst::create(
-        getSILDebugLocation(Loc), op, destTy, F, OpenedArchetypes));
+    return insert(new (F.getModule()) UnconditionalCheckedCastInst(
+        getSILDebugLocation(Loc), op, destTy));
   }
 
   UnconditionalCheckedCastAddrInst *createUnconditionalCheckedCastAddr(
@@ -923,10 +896,11 @@ class SILBuilder {
   WitnessMethodInst *createWitnessMethod(SILLocation Loc, CanType LookupTy,
                                          ProtocolConformanceRef Conformance,
                                          SILDeclRef Member, SILType MethodTy,
+                                         SILValue OptionalOpenedExistential,
                                          bool Volatile = false) {
     return insert(WitnessMethodInst::create(
         getSILDebugLocation(Loc), LookupTy, Conformance, Member, MethodTy,
-        &F, OpenedArchetypes, Volatile));
+        &F, OptionalOpenedExistential, Volatile));
   }
 
   DynamicMethodInst *createDynamicMethod(SILLocation Loc, SILValue Operand,
@@ -938,39 +912,27 @@ class SILBuilder {
 
   OpenExistentialAddrInst *
   createOpenExistentialAddr(SILLocation Loc, SILValue Operand, SILType SelfTy) {
-    auto *I = insert(new (F.getModule()) OpenExistentialAddrInst(
+    return insert(new (F.getModule()) OpenExistentialAddrInst(
         getSILDebugLocation(Loc), Operand, SelfTy));
-    if (OpenedArchetypesTracker)
-      OpenedArchetypesTracker->registerOpenedArchetypes(I);
-    return I;
   }
 
   OpenExistentialMetatypeInst *createOpenExistentialMetatype(SILLocation Loc,
                                                              SILValue operand,
                                                              SILType selfTy) {
-    auto *I = insert(new (F.getModule()) OpenExistentialMetatypeInst(
+    return insert(new (F.getModule()) OpenExistentialMetatypeInst(
         getSILDebugLocation(Loc), operand, selfTy));
-    if (OpenedArchetypesTracker)
-      OpenedArchetypesTracker->registerOpenedArchetypes(I);
-    return I;
   }
 
   OpenExistentialRefInst *
   createOpenExistentialRef(SILLocation Loc, SILValue Operand, SILType Ty) {
-    auto *I = insert(new (F.getModule()) OpenExistentialRefInst(
+    return insert(new (F.getModule()) OpenExistentialRefInst(
         getSILDebugLocation(Loc), Operand, Ty));
-    if (OpenedArchetypesTracker)
-      OpenedArchetypesTracker->registerOpenedArchetypes(I);
-    return I;
   }
 
   OpenExistentialBoxInst *
   createOpenExistentialBox(SILLocation Loc, SILValue Operand, SILType Ty) {
-    auto *I = insert(new (F.getModule()) OpenExistentialBoxInst(
+    return insert(new (F.getModule()) OpenExistentialBoxInst(
         getSILDebugLocation(Loc), Operand, Ty));
-    if (OpenedArchetypesTracker)
-      OpenedArchetypesTracker->registerOpenedArchetypes(I);
-    return I;
   }
 
   InitExistentialAddrInst *
@@ -980,25 +942,25 @@ class SILBuilder {
                             ArrayRef<ProtocolConformanceRef> Conformances) {
     return insert(InitExistentialAddrInst::create(
         getSILDebugLocation(Loc), Existential, FormalConcreteType,
-        LoweredConcreteType, Conformances, &F, OpenedArchetypes));
+        LoweredConcreteType, Conformances, &F));
   }
 
   InitExistentialMetatypeInst *
   createInitExistentialMetatype(SILLocation Loc, SILValue metatype,
                                 SILType existentialType,
                                 ArrayRef<ProtocolConformanceRef> conformances) {
     return insert(InitExistentialMetatypeInst::create(
-        getSILDebugLocation(Loc), existentialType, metatype, conformances, &F,
-        OpenedArchetypes));
+        getSILDebugLocation(Loc), existentialType, metatype, conformances,
+        &F));
   }
 
   InitExistentialRefInst *
   createInitExistentialRef(SILLocation Loc, SILType ExistentialType,
                            CanType FormalConcreteType, SILValue Concrete,
                            ArrayRef<ProtocolConformanceRef> Conformances) {
     return insert(InitExistentialRefInst::create(
-        getSILDebugLocation(Loc), ExistentialType, FormalConcreteType, Concrete,
-        Conformances, &F, OpenedArchetypes));
+        getSILDebugLocation(Loc), ExistentialType, FormalConcreteType,
+        Concrete, Conformances, &F));
   }
 
   DeinitExistentialAddrInst *createDeinitExistentialAddr(SILLocation Loc,
@@ -1030,8 +992,8 @@ class SILBuilder {
   }
 
   MetatypeInst *createMetatype(SILLocation Loc, SILType Metatype) {
-    return insert(MetatypeInst::create(getSILDebugLocation(Loc), Metatype,
-                                       &F, OpenedArchetypes));
+    return insert(new (F.getModule())
+                      MetatypeInst(getSILDebugLocation(Loc), Metatype));
   }
 
   ObjCMetatypeToObjectInst *
@@ -1344,9 +1306,9 @@ class SILBuilder {
                                                  SILValue op, SILType destTy,
                                                  SILBasicBlock *successBB,
                                                  SILBasicBlock *failureBB) {
-    return insertTerminator(CheckedCastBranchInst::create(
-        getSILDebugLocation(Loc), isExact, op, destTy, successBB, failureBB, F,
-        OpenedArchetypes));
+    return insertTerminator(new (F.getModule()) CheckedCastBranchInst(
+        getSILDebugLocation(Loc), isExact, op, destTy, successBB,
+        failureBB));
   }
 
   CheckedCastAddrBranchInst *

include/swift/SIL/SILCloner.h

@@ -17,7 +17,6 @@
 #ifndef SWIFT_SIL_SILCLONER_H
 #define SWIFT_SIL_SILCLONER_H
 
-#include "swift/SIL/SILOpenedArchetypesTracker.h"
 #include "swift/SIL/SILBuilder.h"
 #include "swift/SIL/SILDebugScope.h"
 #include "swift/SIL/SILVisitor.h"
@@ -40,19 +39,9 @@ class SILCloner : protected SILVisitor<ImplClass> {
 public:
   using SILVisitor<ImplClass>::asImpl;
 
-  explicit SILCloner(SILFunction &F,
-                     SILOpenedArchetypesTracker &OpenedArchetypesTracker)
-      : Builder(F), InsertBeforeBB(nullptr),
-        OpenedArchetypesTracker(OpenedArchetypesTracker) {
-    Builder.setOpenedArchetypesTracker(&OpenedArchetypesTracker);
-  }
-
   explicit SILCloner(SILFunction &F)
-      : Builder(F), InsertBeforeBB(nullptr),
-        OpenedArchetypesTracker(F) {
-    Builder.setOpenedArchetypesTracker(&OpenedArchetypesTracker);
-  }
-
+    : Builder(F), InsertBeforeBB(nullptr) { }
+  
   /// Clients of SILCloner who want to know about any newly created
   /// instructions can install a SmallVector into the builder to collect them.
   void setTrackingList(SmallVectorImpl<SILInstruction*> *II) {
@@ -210,14 +199,6 @@ class SILCloner : protected SILVisitor<ImplClass> {
   void cleanUp(SILFunction *F);
 
 public:
-  void doPreProcess(SILInstruction *Orig) {
-    // Extend the set of available opened archetypes by the opened archetypes
-    // used by the instruction being cloned.
-    auto OpenedArchetypeOperands = Orig->getOpenedArchetypeOperands();
-    Builder.getOpenedArchetypes().addOpenedArchetypeOperands(
-        OpenedArchetypeOperands);
-  }
-
   void doPostProcess(SILInstruction *Orig, SILInstruction *Cloned) {
     asImpl().postProcess(Orig, Cloned);
     assert((Orig->getDebugScope() ? Cloned->getDebugScope()!=nullptr : true) &&
@@ -236,8 +217,6 @@ class SILCloner : protected SILVisitor<ImplClass> {
   llvm::MapVector<SILBasicBlock*, SILBasicBlock*> BBMap;
 
   TypeSubstitutionMap OpenedExistentialSubs;
-  SILOpenedArchetypesTracker OpenedArchetypesTracker;
-
   /// Set of basic blocks where unreachable was inserted.
   SmallPtrSet<SILBasicBlock *, 32> BlocksWithUnreachables;
 };
@@ -274,27 +253,8 @@ template<typename ImplClass>
 class SILClonerWithScopes : public SILCloner<ImplClass> {
   friend class SILCloner<ImplClass>;
 public:
-  SILClonerWithScopes(SILFunction &To,
-                      SILOpenedArchetypesTracker &OpenedArchetypesTracker,
-                      bool Disable = false)
-      : SILCloner<ImplClass>(To, OpenedArchetypesTracker) {
-
-    // 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) {
+  SILClonerWithScopes(SILFunction &To, bool Disable = false)
+    : SILCloner<ImplClass>(To) {
 
     // We only want to do this when we generate cloned functions, not
     // when we inline.
@@ -309,7 +269,6 @@ class SILClonerWithScopes : public SILCloner<ImplClass> {
     scopeCloner.reset(new ScopeCloner(To));
   }
 
-
 private:
   std::unique_ptr<ScopeCloner> scopeCloner;
 protected:
@@ -374,12 +333,8 @@ void
 SILCloner<ImplClass>::visitSILBasicBlock(SILBasicBlock* BB) {
   SILFunction &F = getBuilder().getFunction();
   // Iterate over and visit all instructions other than the terminator to clone.
-  for (auto I = BB->begin(), E = --BB->end(); I != E; ++I) {
-    // Update the set of available opened archetypes with the opned archetypes
-    // used by the current instruction.
-    doPreProcess(&*I);
+  for (auto I = BB->begin(), E = --BB->end(); I != E; ++I)
     asImpl().visit(&*I);
-  }
   // Iterate over successors to do the depth-first search.
   for (auto &Succ : BB->getSuccessors()) {
     auto BBI = BBMap.find(Succ);
@@ -1296,17 +1251,16 @@ template<typename ImplClass>
 void
 SILCloner<ImplClass>::visitWitnessMethodInst(WitnessMethodInst *Inst) {
   auto conformance =
-      getOpConformance(Inst->getLookupType(), Inst->getConformance());
-  auto lookupType = Inst->getLookupType();
-  auto newLookupType = getOpASTType(lookupType);
+    getOpConformance(Inst->getLookupType(), Inst->getConformance());
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   doPostProcess(
       Inst,
       getBuilder()
           .createWitnessMethod(
               getOpLocation(Inst->getLoc()),
-              newLookupType, conformance,
+              getOpASTType(Inst->getLookupType()), conformance,
               Inst->getMember(), getOpType(Inst->getType()),
+              Inst->hasOperand() ? getOpValue(Inst->getOperand()) : SILValue(),
               Inst->isVolatile()));
 }