Use the expression map correctly.

llvm-svn: 1140

1 files changed, 3 insertions, 6 deletions

diff --git a/llvm/lib/Transforms/LevelRaise.cpp b/llvm/lib/Transforms/LevelRaise.cpp
index 6883008a7ae..ccba32b4ec2 100644
--- a/llvm/lib/Transforms/LevelRaise.cpp
+++ b/llvm/lib/Transforms/LevelRaise.cpp
@@ -42,7 +42,7 @@
 
 #include "llvm/Assembly/Writer.h"
 
-#define DEBUG_PEEPHOLE_INSTS 1
+//#define DEBUG_PEEPHOLE_INSTS 1
 
 #ifdef DEBUG_PEEPHOLE_INSTS
 #define PRINT_PEEPHOLE(ID, NUM, I)            \
@@ -356,11 +356,8 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
         PRINT_PEEPHOLE2("CAST-DEST-EXPR-CONV:in ", CI, Src);
 
         ValueMapCache ValueMap;
-        ConvertUsersType(CI, Src, ValueMap);
-        if (!Src->hasName() && CI->hasName()) {
-          string Name = CI->getName(); CI->setName("");
-          Src->setName(Name, BB->getParent()->getSymbolTable());
-        }
+        ConvertUsersType(CI, Src, ValueMap);  // This will delete CI!
+
         BI = BB->begin();  // Rescan basic block.  BI might be invalidated.
         PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", I);
         return true;