[llvm-commits] CVS: llvm/include/llvm/Analysis/ScalarEvolutionExpander.h

[Chris Lattner]

Changes in directory llvm/include/llvm/Analysis:

ScalarEvolutionExpander.h updated: 1.11 -> 1.12
---
Log message:

rename Type::isIntegral to Type::isInteger, eliminating the old Type::isInteger.
rename Type::getIntegralTypeMask to Type::getIntegerTypeMask.

This makes naming much more consistent.  For example, there are now no longer any
instances of IntegerType that are not considered isInteger! :)



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

 ScalarEvolutionExpander.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/include/llvm/Analysis/ScalarEvolutionExpander.h
diff -u llvm/include/llvm/Analysis/ScalarEvolutionExpander.h:1.11 llvm/include/llvm/Analysis/ScalarEvolutionExpander.h:1.12
--- llvm/include/llvm/Analysis/ScalarEvolutionExpander.h:1.11	Sun Jan 14 19:58:56 2007
+++ llvm/include/llvm/Analysis/ScalarEvolutionExpander.h	Sun Jan 14 20:27:26 2007
@@ -60,7 +60,7 @@
     /// loop (inserting one if there is none).  A canonical induction variable
     /// starts at zero and steps by one on each iteration.
     Value *getOrInsertCanonicalInductionVariable(const Loop *L, const Type *Ty){
-      assert((Ty->isIntegral() || Ty->isFloatingPoint()) &&
+      assert((Ty->isInteger() || Ty->isFloatingPoint()) &&
              "Can only insert integer or floating point induction variables!");
       SCEVHandle H = SCEVAddRecExpr::get(SCEVUnknown::getIntegerSCEV(0, Ty),
                                          SCEVUnknown::getIntegerSCEV(1, Ty), L);
@@ -106,9 +106,9 @@
     Value *expandInTy(SCEV *S, const Type *Ty) {
       Value *V = expand(S);
       if (Ty && V->getType() != Ty) {
-        if (isa<PointerType>(Ty) && V->getType()->isIntegral())
+        if (isa<PointerType>(Ty) && V->getType()->isInteger())
           return InsertCastOfTo(Instruction::IntToPtr, V, Ty);
-        else if (Ty->isIntegral() && isa<PointerType>(V->getType()))
+        else if (Ty->isInteger() && isa<PointerType>(V->getType()))
           return InsertCastOfTo(Instruction::PtrToInt, V, Ty);
         else if (Ty->getPrimitiveSizeInBits() == 
                  V->getType()->getPrimitiveSizeInBits())