Re-commit my previous SSAUpdater changes. The previous version naively tried

[oota-llvm.git] / lib / Transforms / Utils / InstructionNamer.cpp

diff --git a/lib/Transforms/Utils/InstructionNamer.cpp b/lib/Transforms/Utils/InstructionNamer.cpp
index e6a94e3007d2e33dc1d92cc2a1f923ec04c00c8f..090af95c4b87b7734e0153dfe17d789004246dc4 100644 (file)
--- a/lib/Transforms/Utils/InstructionNamer.cpp
+++ b/lib/Transforms/Utils/InstructionNamer.cpp
@@ -32,13 +32,17 @@ namespace {
     bool runOnFunction(Function &F) {
       for (Function::arg_iterator AI = F.arg_begin(), AE = F.arg_end();
            AI != AE; ++AI)
-        if (!AI->hasName() && AI->getType() != Type::VoidTy)
-          AI->setName("tmp");
+        if (!AI->hasName() && !AI->getType()->isVoidTy())
+          AI->setName("arg");
 
-       for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
+      for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
+        if (!BB->hasName())
+          BB->setName("bb");
+        
         for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
-          if (!I->hasName() && I->getType() != Type::VoidTy)
+          if (!I->hasName() && !I->getType()->isVoidTy())
             I->setName("tmp");
+      }
       return true;
     }
   };