[llvm] r318049 - Revert "[CodeGenPrepare] Check that erased sunken address are not reused"

[Simon Dardis via llvm-commits]

Author: sdardis
Date: Mon Nov 13 08:41:17 2017
New Revision: 318049

URL: http://llvm.org/viewvc/llvm-project?rev=318049&view=rev
Log:
Revert "[CodeGenPrepare] Check that erased sunken address are not reused"

This reverts commit r318032. The test broke some sanitizer bots.

Removed:
    llvm/trunk/test/Transforms/CodeGenPrepare/Mips/
Modified:
    llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp

Modified: llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp?rev=318049&r1=318048&r2=318049&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/CodeGen/CodeGenPrepare.cpp Mon Nov 13 08:41:17 2017
@@ -4358,12 +4358,7 @@ bool CodeGenPrepare::optimizeMemoryInst(
   // Now that we determined the addressing expression we want to use and know
   // that we have to sink it into this block.  Check to see if we have already
   // done this for some other load/store instr in this block.  If so, reuse the
-  // computation.  Before attempting reuse, check if the address is valid as it
-  // may have been erased.
-  auto I = SunkAddrs.find(Addr);
-  if (I != SunkAddrs.end() && I->second && I->second->user_empty())
-    SunkAddrs.erase(I);
-
+  // computation.
   Value *&SunkAddr = SunkAddrs[Addr];
   if (SunkAddr) {
     DEBUG(dbgs() << "CGP: Reusing nonlocal addrmode: " << AddrMode << " for "