Address review comments.

Author: jcranmer-intel

llvm/include/llvm/Transforms/Utils/SSAUpdater.h

@@ -164,13 +164,6 @@ class LoadAndStorePromoter {
   /// removed from the code.
   void run(const SmallVectorImpl<Instruction *> &Insts);
 
-  /// Return true if the specified instruction is in the Inst list.
-  ///
-  /// The Insts list is the one passed into the constructor. Clients should
-  /// implement this with a more efficient version if possible.
-  virtual bool isInstInList(Instruction *I,
-                            const SmallVectorImpl<Instruction *> &Insts) const;
-
   /// This hook is invoked after all the stores are found and inserted as
   /// available values.
   virtual void doExtraRewritesBeforeFinalDeletion() {}

llvm/lib/Transforms/Utils/SSAUpdater.cpp

@@ -442,8 +442,9 @@ void LoadAndStorePromoter::run(const SmallVectorImpl<Instruction *> &Insts) {
 
     // Sort all of the interesting instructions in the block so that we don't
     // have to scan a large block just to find a few instructions.
-    std::sort(BlockUses.begin(), BlockUses.end(),
-              [](Instruction *A, Instruction *B) { return A->comesBefore(B); });
+    llvm::sort(
+        BlockUses.begin(), BlockUses.end(),
+        [](Instruction *A, Instruction *B) { return A->comesBefore(B); });
 
     // Otherwise, we have mixed loads and stores (or just a bunch of stores).
     // Since SSAUpdater is purely for cross-block values, we need to determine
@@ -529,10 +530,3 @@ void LoadAndStorePromoter::run(const SmallVectorImpl<Instruction *> &Insts) {
     User->eraseFromParent();
   }
 }
-
-bool
-LoadAndStorePromoter::isInstInList(Instruction *I,
-                                   const SmallVectorImpl<Instruction *> &Insts)
-                                   const {
-  return is_contained(Insts, I);
-}