For PR1043:

Merge ConstantIntegral and ConstantBool into ConstantInt.
Remove ConstantIntegral and ConstantBool from LLVM.

llvm-svn: 33073

llvm/lib/Bytecode/Reader/Reader.cpp

@@ -1403,7 +1403,7 @@ Value *BytecodeReader::ParseConstantPoolValue(unsigned TypeID) {
     unsigned Val = read_vbr_uint();
     if (Val != 0 && Val != 1)
       error("Invalid boolean value read.");
-    Result = ConstantBool::get(Val == 1);
+    Result = ConstantInt::get(Val == 1);
     if (Handler) Handler->handleConstantValue(Result);
     break;
   }

llvm/lib/Bytecode/Writer/Writer.cpp

@@ -322,7 +322,7 @@ void BytecodeWriter::outputConstant(const Constant *CPV) {
 
   switch (CPV->getType()->getTypeID()) {
   case Type::BoolTyID:    // Boolean Types
-    if (cast<ConstantBool>(CPV)->getValue())
+    if (cast<ConstantInt>(CPV)->getBoolValue())
       output_vbr(1U);
     else
       output_vbr(0U);