commit e0e6e48b2910bee0aeede5df8a4defb34e8f3860
author George Burgess IV <george.burgess.iv@gmail.com> Wed Mar 02 02:35:04 2016 +0000
committer George Burgess IV <george.burgess.iv@gmail.com> Wed Mar 02 02:35:04 2016 +0000
tree 8e367cbaaabb78db63afa7d96b8b8acc4be0cadb
parent 1168f93c2b16b7eb9972d093cbee97372a0d1210

Attempt to fix ASAN failure in a MemorySSA test.

llvm-svn: 262452

llvm/lib/Transforms/Utils/MemorySSA.cpp

diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp
index 858ebdc..8013b4a 100644
--- a/llvm/lib/Transforms/Utils/MemorySSA.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp
@@ -463,11 +463,11 @@
   }
   ValueToMemoryAccess.erase(MemoryInst);
 
-  auto &Accesses = PerBlockAccesses.find(MA->getBlock())->second;
+  auto AccessIt = PerBlockAccesses.find(MA->getBlock());
+  std::unique_ptr<AccessListType> &Accesses = AccessIt->second;
   Accesses->erase(MA);
-  if (Accesses->empty()) {
-    PerBlockAccesses.erase(MA->getBlock());
-  }
+  if (Accesses->empty())
+    PerBlockAccesses.erase(AccessIt);
 }
 
 void MemorySSA::removeMemoryAccess(MemoryAccess *MA) {