mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-20 11:08:27 +00:00
Fix a latent bug exposed by my recent changes
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15498 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ff4c183790
commit
c3d12f0823
@ -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!");
|
||||
|
Loading…
Reference in New Issue
Block a user