commit 6412002d2462ed6ac04b4e1730f3e7b9c309519d
author Daniel Berlin <dberlin@dberlin.org> Wed Mar 02 21:16:28 2016 +0000
committer Daniel Berlin <dberlin@dberlin.org> Wed Mar 02 21:16:28 2016 +0000
tree bd7df4fca20a6f4a8a1495035fa942b2c732370c
parent a0e980610136aba00482eaf49101610567b74451

Really fix ASAN leak/etc issues with MemorySSA unittests

llvm-svn: 262519

llvm/lib/Transforms/Utils/MemorySSA.cpp

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