Revert "[Polly] Ensure consistent Scop::InstStmtMap. NFC."

This reverts commit 8e06bf6b3a2e8d25e56cd52dca0cf3ff1b37b5d1.

It broke the polly-x86_64-linux-test-suite and
aosp-O3-polly-before-vectorizer-unprofitable buildbots.

1 files changed, 4 insertions, 8 deletions

diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h
index 7b6f13627826..b6fcddc6379a 100644
--- a/polly/include/polly/ScopInfo.h
+++ b/polly/include/polly/ScopInfo.h
@@ -1539,7 +1539,9 @@ public:
 
   /// Set the list of instructions for this statement. It replaces the current
   /// list.
-  void setInstructions(ArrayRef<Instruction *> Range);
+  void setInstructions(ArrayRef<Instruction *> Range) {
+    Instructions.assign(Range.begin(), Range.end());
+  }
 
   std::vector<Instruction *>::const_iterator insts_begin() const {
     return Instructions.begin();
@@ -1947,7 +1949,7 @@ private:
   void addScopStmt(Region *R, StringRef Name, Loop *SurroundingLoop,
                    std::vector<Instruction *> EntryBlockInstructions);
 
-  /// Removes @p Stmt from the StmtMap and InstStmtMap.
+  /// Removes @p Stmt from the StmtMap.
   void removeFromStmtMap(ScopStmt &Stmt);
 
   /// Removes all statements where the entry block of the statement does not
@@ -2360,12 +2362,6 @@ public:
     return InstStmtMap.lookup(Inst);
   }
 
-  /// Update the content of InstStmtMap for @p Stmt. @p OldList contains the
-  /// previous instructions in @p Stmt and is updated to contain the
-  /// instructions in @p NewList.
-  void updateInstStmtMap(ArrayRef<Instruction *> OldList,
-                         ArrayRef<Instruction *> NewList, ScopStmt *Stmt);
-
   /// Return the number of statements in the SCoP.
   size_t getSize() const { return Stmts.size(); }