From 989e601b2667619feb0f829fbc02ef5cf64babe8 Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Wed, 2 Mar 2016 20:36:22 +0000 Subject: Revert "Fix ASAN detected errors in code and test" (it was not meant to be committed yet) This reverts commit 890bbccd600ba1eb050353d06a29650ad0f2eb95. llvm-svn: 262512 --- llvm/lib/Transforms/Utils/MemorySSA.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Transforms/Utils/MemorySSA.cpp') 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(&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; } -- cgit v1.2.3