commit 7629b71dd4cee9d1a3a69b092b318674532b22ba
author Owen Anderson <resistor@mac.com> Mon Apr 14 17:38:21 2008 +0000
committer Owen Anderson <resistor@mac.com> Mon Apr 14 17:38:21 2008 +0000
tree 2b1a27e3901928ee7df4a8269604ab368265ee9c
parent cad92f24477606e61c060ee318a8930f058a011d

Revert r49614.  As Dan pointed out, some of these aren't correct.

llvm-svn: 49657

llvm/lib/Transforms/Scalar/LoopUnroll.cpp

diff --git a/llvm/lib/Transforms/Scalar/LoopUnroll.cpp b/llvm/lib/Transforms/Scalar/LoopUnroll.cpp
index a3c58f7..1962c14 100644
--- a/llvm/lib/Transforms/Scalar/LoopUnroll.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopUnroll.cpp
@@ -179,8 +179,8 @@
   BB->eraseFromParent();
 
   // Inherit predecessor's name if it exists...
-  if (BB->hasName() && !OnlyPred->hasName())
-    OnlyPred->takeName(BB);
+  if (!OldName.empty() && !OnlyPred->hasName())
+    OnlyPred->setName(OldName);
 
   return OnlyPred;
 }