diff options
author | Dinesh Dwivedi <dinesh.d@samsung.com> | 2014-05-15 08:22:55 +0000 |
---|---|---|
committer | Dinesh Dwivedi <dinesh.d@samsung.com> | 2014-05-15 08:22:55 +0000 |
commit | 0d5742fc595012a306c3a46a95c9600008c14dff (patch) | |
tree | f4c7cee15c5c477a13418283fbb7b72673dcbc7f /lib/Transforms/InstCombine | |
parent | 707048b0dbeefad6673bde4fd5dc10b1d49e0984 (diff) | |
download | llvm-0d5742fc595012a306c3a46a95c9600008c14dff.tar.gz llvm-0d5742fc595012a306c3a46a95c9600008c14dff.tar.bz2 llvm-0d5742fc595012a306c3a46a95c9600008c14dff.tar.xz |
Reverting r208848, reason: build failure: sanitizer-x86_64-linux-bootstrap/builds/3399
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208852 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/InstCombine')
-rw-r--r-- | lib/Transforms/InstCombine/InstCombineSelect.cpp | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineSelect.cpp b/lib/Transforms/InstCombine/InstCombineSelect.cpp index 90525950ea..98260b0599 100644 --- a/lib/Transforms/InstCombine/InstCombineSelect.cpp +++ b/lib/Transforms/InstCombine/InstCombineSelect.cpp @@ -365,15 +365,7 @@ static Value *SimplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp, /// 1. The icmp predicate is inverted /// 2. The select operands are reversed /// 3. The magnitude of C2 and C1 are flipped -/// -/// This also tries to turn -/// --- Single bit tests: -/// if ((x & C) == 0) x |= C to x |= C -/// if ((x & C) != 0) x ^= C to x &= ~C -/// if ((x & C) == 0) x ^= C to x |= C -/// if ((x & C) != 0) x &= ~C to x &= ~C -/// if ((x & C) == 0) x &= ~C to nothing -static Value *foldSelectICmpAndOr(SelectInst &SI, Value *TrueVal, +static Value *foldSelectICmpAndOr(const SelectInst &SI, Value *TrueVal, Value *FalseVal, InstCombiner::BuilderTy *Builder) { const ICmpInst *IC = dyn_cast<ICmpInst>(SI.getCondition()); @@ -392,34 +384,10 @@ static Value *foldSelectICmpAndOr(SelectInst &SI, Value *TrueVal, return nullptr; const APInt *C2; - - // if ((x & C) != 0) x ^= C becomes x &= ~C - if (match(FalseVal, m_Xor(m_Specific(TrueVal), m_APInt(C2))) && C1 == C2) { - return Builder->CreateAnd(TrueVal, ~(*C1)); - } - - // if ((x & C) == 0) x ^= C becomes x |= C - if (match(TrueVal, m_Xor(m_Specific(FalseVal), m_APInt(C2))) && C1 == C2) { - return Builder->CreateOr(FalseVal, *C1); - } - - // if ((x & C) != 0) x &= ~C becomes x &= ~C - // if ((x & C) == 0) x &= ~C becomes nothing - if ((match(FalseVal, m_And(m_Specific(TrueVal), m_APInt(C2))) || - match(TrueVal, m_And(m_Specific(FalseVal), m_APInt(C2)))) && - *C1 == ~(*C2)) { - return FalseVal; - } - - bool OrOnFalseVal = false; - bool OrOnTrueVal = match(TrueVal, m_Or(m_Specific(FalseVal), m_Power2(C2))); - - // if ((x & C) == 0) x |= C becomes x |= C - if (OrOnTrueVal && C1 == C2) - return TrueVal; - - if (!OrOnTrueVal) - OrOnFalseVal = match(FalseVal, m_Or(m_Specific(TrueVal), m_Power2(C2))); + bool OrOnTrueVal = false; + bool OrOnFalseVal = match(FalseVal, m_Or(m_Specific(TrueVal), m_Power2(C2))); + if (!OrOnFalseVal) + OrOnTrueVal = match(TrueVal, m_Or(m_Specific(FalseVal), m_Power2(C2))); if (!OrOnFalseVal && !OrOnTrueVal) return nullptr; |