Revert "Fix ASAN detected errors in code and test" (it was not meant to be committed yet)

This reverts commit 890bbccd600ba1eb050353d06a29650ad0f2eb95.

llvm-svn: 262512

1 files changed, 3 insertions, 2 deletions

diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp
index f7dc7444d4a..8013b4a4c7b 100644
--- a/llvm/lib/Transforms/Utils/MemorySSA.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp
@@ -231,7 +231,7 @@ MemorySSAWalker *MemorySSA::buildMemorySSA(AliasAnalysis *AA,
   assert(!this->AA && !this->DT &&
          "MemorySSA without a walker already has AA or DT?");
 
-  Walker = new CachingMemorySSAWalker(this, AA, DT);
+  auto *Result = new CachingMemorySSAWalker(this, AA, DT);
   this->AA = AA;
   this->DT = DT;
 
@@ -343,7 +343,7 @@ MemorySSAWalker *MemorySSA::buildMemorySSA(AliasAnalysis *AA,
     for (auto &MA : *Accesses) {
       if (auto *MU = dyn_cast<MemoryUse>(&MA)) {
         Instruction *Inst = MU->getMemoryInst();
-        MU->setDefiningAccess(Walker->getClobberingMemoryAccess(Inst));
+        MU->setDefiningAccess(Result->getClobberingMemoryAccess(Inst));
       }
     }
   }
@@ -354,6 +354,7 @@ MemorySSAWalker *MemorySSA::buildMemorySSA(AliasAnalysis *AA,
     if (!Visited.count(&BB))
       markUnreachableAsLiveOnEntry(&BB);
 
+  Walker = Result;
   return Walker;
 }