commit 75b871fb1ecb121f84612864d97e79d90930232c
author Zhou Sheng <zhousheng00@gmail.com> Thu Jan 11 12:24:14 2007 +0000
committer Zhou Sheng <zhousheng00@gmail.com> Thu Jan 11 12:24:14 2007 +0000
tree af683c54f708c4ed3c49607a754c744fb1b1932d
parent 691b263e07d48c6a34eed2f0dd6e8150ff51a286

For PR1043:
Merge ConstantIntegral and ConstantBool into ConstantInt.
Remove ConstantIntegral and ConstantBool from LLVM.

llvm-svn: 33073

llvm/lib/VMCore/Instructions.cpp

diff --git a/llvm/lib/VMCore/Instructions.cpp b/llvm/lib/VMCore/Instructions.cpp
index 8063331..adcf4cd 100644
--- a/llvm/lib/VMCore/Instructions.cpp
+++ b/llvm/lib/VMCore/Instructions.cpp
@@ -1118,10 +1118,10 @@
                                           Instruction *InsertBefore) {
   Constant *C;
   if (const PackedType *PTy = dyn_cast<PackedType>(Op->getType())) {
-    C = ConstantIntegral::getAllOnesValue(PTy->getElementType());
+    C = ConstantInt::getAllOnesValue(PTy->getElementType());
     C = ConstantPacked::get(std::vector<Constant*>(PTy->getNumElements(), C));
   } else {
-    C = ConstantIntegral::getAllOnesValue(Op->getType());
+    C = ConstantInt::getAllOnesValue(Op->getType());
   }
   
   return new BinaryOperator(Instruction::Xor, Op, C,
@@ -1133,11 +1133,11 @@
   Constant *AllOnes;
   if (const PackedType *PTy = dyn_cast<PackedType>(Op->getType())) {
     // Create a vector of all ones values.
-    Constant *Elt = ConstantIntegral::getAllOnesValue(PTy->getElementType());
+    Constant *Elt = ConstantInt::getAllOnesValue(PTy->getElementType());
     AllOnes = 
       ConstantPacked::get(std::vector<Constant*>(PTy->getNumElements(), Elt));
   } else {
-    AllOnes = ConstantIntegral::getAllOnesValue(Op->getType());
+    AllOnes = ConstantInt::getAllOnesValue(Op->getType());
   }
   
   return new BinaryOperator(Instruction::Xor, Op, AllOnes,
@@ -1147,7 +1147,7 @@
 
 // isConstantAllOnes - Helper function for several functions below
 static inline bool isConstantAllOnes(const Value *V) {
-  return isa<ConstantIntegral>(V) &&cast<ConstantIntegral>(V)->isAllOnesValue();
+  return isa<ConstantInt>(V) &&cast<ConstantInt>(V)->isAllOnesValue();
 }
 
 bool BinaryOperator::isNeg(const Value *V) {