mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-03 14:08:57 +00:00
Speculatively revert r108378; may be causing bootstrap failures.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108389 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
6881898eb5
commit
5e84e8e52a
@ -472,24 +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 && CI2) {
|
||||
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:
|
||||
|
@ -699,31 +699,6 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
|
||||
SI.setOperand(2, TrueVal);
|
||||
return &SI;
|
||||
}
|
||||
|
||||
// select (or (A == 0) (B == 0)) T, F--> select (and (A != 0) (B != 0)) F, T
|
||||
// Note: This is a canonicalization rather than an optimization, and is used
|
||||
// to expose opportunities to other instcombine transforms.
|
||||
Instruction* CondInst = dyn_cast<Instruction>(CondVal);
|
||||
if (CondInst && CondInst->getOpcode() == Instruction::Or) {
|
||||
ICmpInst *LHSCmp = dyn_cast<ICmpInst>(CondInst->getOperand(0));
|
||||
ICmpInst *RHSCmp = dyn_cast<ICmpInst>(CondInst->getOperand(1));
|
||||
if (LHSCmp && LHSCmp->getPredicate() == ICmpInst::ICMP_EQ &&
|
||||
RHSCmp && RHSCmp->getPredicate() == ICmpInst::ICMP_EQ) {
|
||||
ConstantInt* C1 = dyn_cast<ConstantInt>(LHSCmp->getOperand(1));
|
||||
ConstantInt* C2 = dyn_cast<ConstantInt>(RHSCmp->getOperand(1));
|
||||
if (C1 && C1->isZero() && C2 && C2->isZero()) {
|
||||
LHSCmp->setPredicate(ICmpInst::ICMP_NE);
|
||||
RHSCmp->setPredicate(ICmpInst::ICMP_NE);
|
||||
Value *And =
|
||||
InsertNewInstBefore(BinaryOperator::CreateAnd(LHSCmp, RHSCmp,
|
||||
"and."+CondVal->getName()), SI);
|
||||
SI.setOperand(0, And);
|
||||
SI.setOperand(1, FalseVal);
|
||||
SI.setOperand(2, TrueVal);
|
||||
return &SI;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user