commit f49d4c45a17d4be48f3e3627e9c21212e46bc83c
author Daniel Berlin <dberlin@dberlin.org> Tue Apr 04 23:43:04 2017 +0000
committer Daniel Berlin <dberlin@dberlin.org> Tue Apr 04 23:43:04 2017 +0000
tree 486560f360453f246e47bceff64478034c3e25d7
parent 880cfd45fcc0b9417a7c8d22c45b38dd1fe23929

Revert "MemorySSA: Add support for caching clobbering access in stores"

This reverts revision r299322.

llvm-svn: 299485

llvm/lib/Transforms/Utils/MemorySSA.cpp

diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp
index 8ceec2e..5a3b163 100644
--- a/llvm/lib/Transforms/Utils/MemorySSA.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp
@@ -2181,9 +2181,9 @@
   // If this is an already optimized use or def, return the optimized result.
   // Note: Currently, we do not store the optimized def result because we'd need
   // a separate field, since we can't use it as the defining access.
-  if (auto *MUD = dyn_cast<MemoryUseOrDef>(StartingAccess))
-    if (MUD->isOptimized())
-      return MUD->getOptimized();
+  if (MemoryUse *MU = dyn_cast<MemoryUse>(StartingAccess))
+    if (MU->isOptimized())
+      return MU->getDefiningAccess();
 
   const Instruction *I = StartingAccess->getMemoryInst();
   UpwardsMemoryQuery Q(I, StartingAccess);
@@ -2199,8 +2199,8 @@
   if (isUseTriviallyOptimizableToLiveOnEntry(*MSSA->AA, I)) {
     MemoryAccess *LiveOnEntry = MSSA->getLiveOnEntryDef();
     Cache.insert(StartingAccess, LiveOnEntry, Q.StartingLoc, Q.IsCall);
-    if (auto *MUD = dyn_cast<MemoryUseOrDef>(StartingAccess))
-      MUD->setDefiningAccess(LiveOnEntry, true);
+    if (MemoryUse *MU = dyn_cast<MemoryUse>(StartingAccess))
+      MU->setDefiningAccess(LiveOnEntry, true);
     return LiveOnEntry;
   }
 
@@ -2217,8 +2217,8 @@
   DEBUG(dbgs() << *DefiningAccess << "\n");
   DEBUG(dbgs() << "Final Memory SSA clobber for " << *I << " is ");
   DEBUG(dbgs() << *Result << "\n");
-  if (auto *MUD = dyn_cast<MemoryUseOrDef>(StartingAccess))
-    MUD->setDefiningAccess(Result, true);
+  if (MemoryUse *MU = dyn_cast<MemoryUse>(StartingAccess))
+    MU->setDefiningAccess(Result, true);
 
   return Result;
 }

llvm/lib/Transforms/Utils/MemorySSAUpdater.cpp

diff --git a/llvm/lib/Transforms/Utils/MemorySSAUpdater.cpp b/llvm/lib/Transforms/Utils/MemorySSAUpdater.cpp
index c396bd7..7e04395 100644
--- a/llvm/lib/Transforms/Utils/MemorySSAUpdater.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSAUpdater.cpp
@@ -451,8 +451,8 @@
 
     while (!MA->use_empty()) {
       Use &U = *MA->use_begin();
-      if (auto *MUD = dyn_cast<MemoryUseOrDef>(U.getUser()))
-        MUD->resetOptimized();
+      if (MemoryUse *MU = dyn_cast<MemoryUse>(U.getUser()))
+        MU->resetOptimized();
       U.set(NewDefTarget);
     }
   }