[llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp Reassociate.cpp TailRecursionElimination.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.364 -> 1.365
Reassociate.cpp updated: 1.50 -> 1.51
TailRecursionElimination.cpp updated: 1.20 -> 1.21
---
Log message:

Use the new 'moveBefore' method to simplify some code.  Really, which is
easier to understand?  :)


---
Diffs of the changes:  (+4 -6)

 InstructionCombining.cpp     |    3 +--
 Reassociate.cpp              |    5 ++---
 TailRecursionElimination.cpp |    2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.364 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.365
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.364	Sun Aug  7 02:03:10 2005
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Aug  8 14:11:57 2005
@@ -5238,8 +5238,7 @@
   BasicBlock::iterator InsertPos = DestBlock->begin();
   while (isa<PHINode>(InsertPos)) ++InsertPos;
 
-  BasicBlock *SrcBlock = I->getParent();
-  DestBlock->getInstList().splice(InsertPos, SrcBlock->getInstList(), I);
+  I->moveBefore(InsertPos);
   ++NumSunkInst;
   return true;
 }


Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.50 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.51
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.50	Wed Jul 27 01:12:34 2005
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Mon Aug  8 14:11:57 2005
@@ -184,7 +184,7 @@
 
   // Move the RHS instruction to live immediately before I, avoiding breaking
   // dominator properties.
-  I->getParent()->getInstList().splice(I, RHS->getParent()->getInstList(), RHS);
+  RHS->moveBefore(I);
 
   // Move operands around to do the linearization.
   I->setOperand(1, RHS->getOperand(0));
@@ -261,8 +261,7 @@
 
   // Move LHS right before I to make sure that the tree expression dominates all
   // values.
-  I->getParent()->getInstList().splice(I,
-                                      LHSBO->getParent()->getInstList(), LHSBO);
+  LHSBO->moveBefore(I);
 
   // Linearize the expression tree on the LHS.
   LinearizeExprTree(LHSBO, Ops);


Index: llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
diff -u llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.20 llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.21
--- llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.20	Sun Aug  7 02:00:52 2005
+++ llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp	Mon Aug  8 14:11:57 2005
@@ -363,7 +363,7 @@
              NEBI = NewEntry->begin(); OEBI != E; )
         if (AllocaInst *AI = dyn_cast<AllocaInst>(OEBI++))
           if (isa<ConstantInt>(AI->getArraySize()))
-            NewEntry->getInstList().splice(NEBI, OldEntry->getInstList(), AI);
+            AI->moveBefore(NEBI);
 
     // Now that we have created a new block, which jumps to the entry
     // block, insert a PHI node for each argument of the function.