From de309a8b529bb978cea072680738147e04d21e70 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 16 Jul 2010 01:36:12 +0000 Subject: [PATCH] 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 --- .../InstCombine/InstCombineAndOrXor.cpp | 19 ------------------- test/Transforms/InstCombine/bit-checks.ll | 15 --------------- 2 files changed, 34 deletions(-) delete mode 100644 test/Transforms/InstCombine/bit-checks.ll diff --git a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp index 5876f408343..3f4a857c41a 100644 --- a/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp +++ b/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp @@ -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(Val); - Instruction *I2 = dyn_cast(Val2); - if (I1 && I1->getOpcode() == Instruction::And && - I2 && I2->getOpcode() == Instruction::And && - I1->getOperand(0) == I1->getOperand(0)) { - ConstantInt *CI1 = dyn_cast(I1->getOperand(1)); - ConstantInt *CI2 = dyn_cast(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: diff --git a/test/Transforms/InstCombine/bit-checks.ll b/test/Transforms/InstCombine/bit-checks.ll deleted file mode 100644 index f97fb45af16..00000000000 --- a/test/Transforms/InstCombine/bit-checks.ll +++ /dev/null @@ -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 ; [#uses=1] - %tobool = icmp ne i32 %and, 0 ; [#uses=1] - %and2 = and i32 %argc, 2 ; [#uses=1] - %tobool3 = icmp ne i32 %and2, 0 ; [#uses=1] - %or.cond = and i1 %tobool, %tobool3 ; [#uses=1] - %retval.0 = select i1 %or.cond, i32 2, i32 1 ; [#uses=1] - ret i32 %retval.0 -} -- 2.34.1