[llvm-commits] CVS: llvm/lib/Transforms/Utils/CodeExtractor.cpp SimplifyCFG.cpp

[Reid Spencer]

Changes in directory llvm/lib/Transforms/Utils:

CodeExtractor.cpp updated: 1.45 -> 1.46
SimplifyCFG.cpp updated: 1.109 -> 1.110
---
Log message:

Rename BoolTy as Int1Ty. Patch by Sheng Zhou.


---
Diffs of the changes:  (+3 -3)

 CodeExtractor.cpp |    2 +-
 SimplifyCFG.cpp   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/Utils/CodeExtractor.cpp
diff -u llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.45 llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.46
--- llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.45	Thu Jan 11 06:24:14 2007
+++ llvm/lib/Transforms/Utils/CodeExtractor.cpp	Thu Jan 11 12:21:29 2007
@@ -251,7 +251,7 @@
   switch (NumExitBlocks) {
   case 0:
   case 1: RetTy = Type::VoidTy; break;
-  case 2: RetTy = Type::BoolTy; break;
+  case 2: RetTy = Type::Int1Ty; break;
   default: RetTy = Type::Int16Ty; break;
   }
 


Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.109 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.110
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.109	Thu Jan 11 06:24:14 2007
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Thu Jan 11 12:21:29 2007
@@ -971,7 +971,7 @@
   for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
     ConstantInt *CB;
     if ((CB = dyn_cast<ConstantInt>(PN->getIncomingValue(i))) &&
-        CB->getType() == Type::BoolTy) {
+        CB->getType() == Type::Int1Ty) {
       // Okay, we now know that all edges from PredBB should be revectored to
       // branch to RealDest.
       BasicBlock *PredBB = PN->getIncomingBlock(i);
@@ -1516,7 +1516,7 @@
               // Otherwise, if there are multiple predecessors, insert a PHI that
               // merges in the constant and simplify the block result.
               if (BlockIsSimpleEnoughToThreadThrough(BB)) {
-                PHINode *NewPN = new PHINode(Type::BoolTy,
+                PHINode *NewPN = new PHINode(Type::Int1Ty,
                                              BI->getCondition()->getName()+".pr",
                                              BB->begin());
                 for (PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI)