diff options
| -rw-r--r-- | lib/VMCore/Constants.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index f679f23508..b65758b7dd 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -1109,7 +1109,8 @@ Constant *ConstantExpr::getTy(const Type *ReqTy, unsigned Opcode, assert(C1->getType() == C2->getType() && "Operand types in binary constant expression should match"); - if (ReqTy == C1->getType()) + if (ReqTy == C1->getType() || (Instruction::isRelational(Opcode) && + ReqTy == Type::BoolTy)) if (Constant *FC = ConstantFoldBinaryInstruction(Opcode, C1, C2)) return FC; // Fold a few common cases... @@ -1118,6 +1119,13 @@ Constant *ConstantExpr::getTy(const Type *ReqTy, unsigned Opcode, return ExprConstants.getOrCreate(ReqTy, Key); } +Constant *ConstantExpr::get(unsigned Opcode, Constant *C1, Constant *C2) { + if (Instruction::isRelational(Opcode)) + return getTy(Type::BoolTy, Opcode, C1, C2); + else + return getTy(C1->getType(), Opcode, C1, C2); +} + Constant *ConstantExpr::getSelectTy(const Type *ReqTy, Constant *C, Constant *V1, Constant *V2) { assert(C->getType() == Type::BoolTy && "Select condition must be bool!"); |