summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStuart Hastings <stuart@apple.com>2011-05-13 00:51:54 +0000
committerStuart Hastings <stuart@apple.com>2011-05-13 00:51:54 +0000
commit88882247d2e1bb70103062faf5bd15dd8a30b2d1 (patch)
tree5ddee79f3dfa5996280dc6143a56aaa049376802 /lib
parent8ad145d7299dbeb8b816ce0549d9323630bbae1a (diff)
downloadllvm-88882247d2e1bb70103062faf5bd15dd8a30b2d1.tar.gz
llvm-88882247d2e1bb70103062faf5bd15dd8a30b2d1.tar.bz2
llvm-88882247d2e1bb70103062faf5bd15dd8a30b2d1.tar.xz
Since I can't reproduce the failures from 131261, re-trying with a
simplified version. <rdar://problem/9298790> git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131274 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/SelectionDAG/LegalizeDAG.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index e2e6691ba7..e140d671a8 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -3535,9 +3535,13 @@ 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 :
+ 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), Tmp2,
- DAG.getConstant(0, Tmp2.getValueType()),
+ DAG.getCondCode(ISD::SETNE), Tmp3,
+ DAG.getConstant(0, Tmp3.getValueType()),
Node->getOperand(2));
}
Results.push_back(Tmp1);