commit fd41de0b10ef8df3fd9ab125a884a11d5dc194a0
author Dan Gohman <dan433584@gmail.com> Tue Feb 12 18:44:43 2013 +0000
committer Dan Gohman <dan433584@gmail.com> Tue Feb 12 18:44:43 2013 +0000
tree 6fd97e1eb25391da32e2e66b704c4d8b4d998406
parent d9010963457f5ec3f1e5838c9d64565088f0a15a

Check that pointers are removed from maps before calling delete on the pointers,
for tidiness' sake.

llvm-svn: 174988

llvm/lib/Transforms/Scalar/GVN.cpp

diff --git a/llvm/lib/Transforms/Scalar/GVN.cpp b/llvm/lib/Transforms/Scalar/GVN.cpp
index fae0a1f..0fe1096 100644
--- a/llvm/lib/Transforms/Scalar/GVN.cpp
+++ b/llvm/lib/Transforms/Scalar/GVN.cpp
@@ -2371,8 +2371,8 @@
          E = InstrsToErase.end(); I != E; ++I) {
       DEBUG(dbgs() << "GVN removed: " << **I << '\n');
       if (MD) MD->removeInstruction(*I);
-      (*I)->eraseFromParent();
       DEBUG(verifyRemoved(*I));
+      (*I)->eraseFromParent();
     }
     InstrsToErase.clear();
 
@@ -2504,8 +2504,8 @@
       // the PRE predecessor.  This is typically because of loads which
       // are not value numbered precisely.
       if (!success) {
-        delete PREInstr;
         DEBUG(verifyRemoved(PREInstr));
+        delete PREInstr;
         continue;
       }
 
@@ -2551,8 +2551,8 @@
 
       DEBUG(dbgs() << "GVN PRE removed: " << *CurInst << '\n');
       if (MD) MD->removeInstruction(CurInst);
-      CurInst->eraseFromParent();
       DEBUG(verifyRemoved(CurInst));
+      CurInst->eraseFromParent();
       Changed = true;
     }
   }