diff options
| author | Stuart Hastings <stuart@apple.com> | 2011-05-13 00:15:17 +0000 |
|---|---|---|
| committer | Stuart Hastings <stuart@apple.com> | 2011-05-13 00:15:17 +0000 |
| commit | 8ad145d7299dbeb8b816ce0549d9323630bbae1a (patch) | |
| tree | 43febed96da2c90e5379b66e11d9e93db169f5cc /lib | |
| parent | 4c576ca9dbda7d9b7069954c561ddc99d1c6b938 (diff) | |
| download | llvm-8ad145d7299dbeb8b816ce0549d9323630bbae1a.tar.gz llvm-8ad145d7299dbeb8b816ce0549d9323630bbae1a.tar.bz2 llvm-8ad145d7299dbeb8b816ce0549d9323630bbae1a.tar.xz | |
Revert 131266 and 131261 due to buildbot complaints.
rdar://problem/9298790
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131269 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index 5a833d335c..e2e6691ba7 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -3535,16 +3535,9 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node, Tmp2.getOperand(0), Tmp2.getOperand(1), Node->getOperand(2)); } else { - // We test only the i1 bit. Skip the AND if UNDEF. - Tmp3 = (Tmp2.getOpcode() == ISD::UNDEF || - (Tmp2.getOpcode() == ISD::AND && - Tmp2.getConstantOperandVal(1) == 1)) ? - Tmp2 : - DAG.getNode(ISD::AND, dl, Tmp2.getValueType(), Tmp2, - DAG.getConstant(1, Tmp2.getValueType())); Tmp1 = DAG.getNode(ISD::BR_CC, dl, MVT::Other, Tmp1, - DAG.getCondCode(ISD::SETNE), Tmp3, - DAG.getConstant(0, Tmp3.getValueType()), + DAG.getCondCode(ISD::SETNE), Tmp2, + DAG.getConstant(0, Tmp2.getValueType()), Node->getOperand(2)); } Results.push_back(Tmp1); |