Also revert 108422, it's causing some test failures.

Working on testcases for Owen.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108494 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2010-07-16 01:36:12 +00:00
parent e160a520ce
commit de309a8b52
2 changed files with 0 additions and 34 deletions

View File

@ -472,25 +472,6 @@ Value *InstCombiner::FoldAndOfICmps(ICmpInst *LHS, ICmpInst *RHS) {
Value *NewOr = Builder->CreateOr(Val, Val2);
return Builder->CreateICmp(LHSCC, NewOr, LHSCst);
}
// (icmp ne (A & C1), 0) & (icmp ne (A & C2), 0) -->
// (icmp eq (A & (C1|C2)), (C1|C2))
if (LHSCC == ICmpInst::ICMP_NE && LHSCst->isZero()) {
Instruction *I1 = dyn_cast<Instruction>(Val);
Instruction *I2 = dyn_cast<Instruction>(Val2);
if (I1 && I1->getOpcode() == Instruction::And &&
I2 && I2->getOpcode() == Instruction::And &&
I1->getOperand(0) == I1->getOperand(0)) {
ConstantInt *CI1 = dyn_cast<ConstantInt>(I1->getOperand(1));
ConstantInt *CI2 = dyn_cast<ConstantInt>(I2->getOperand(1));
if (CI1 && !CI1->isZero() && CI2 && !CI2->isZero() &&
CI1->getValue().operator&(CI2->getValue()) == 0) {
Constant *ConstOr = ConstantExpr::getOr(CI1, CI2);
Value *NewAnd = Builder->CreateAnd(I1->getOperand(0), ConstOr);
return Builder->CreateICmp(ICmpInst::ICMP_EQ, NewAnd, ConstOr);
}
}
}
}
// From here on, we only handle:

View File

@ -1,15 +0,0 @@
; This test makes sure that these instructions are properly eliminated.
;
; RUN: opt < %s -instcombine -S | \
; RUN: not grep {tobool}
; END.
define i32 @main(i32 %argc, i8** %argv) nounwind ssp {
entry:
%and = and i32 %argc, 1 ; <i32> [#uses=1]
%tobool = icmp ne i32 %and, 0 ; <i1> [#uses=1]
%and2 = and i32 %argc, 2 ; <i32> [#uses=1]
%tobool3 = icmp ne i32 %and2, 0 ; <i1> [#uses=1]
%or.cond = and i1 %tobool, %tobool3 ; <i1> [#uses=1]
%retval.0 = select i1 %or.cond, i32 2, i32 1 ; <i32> [#uses=1]
ret i32 %retval.0
}