summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
diff options
context:
space:
mode:
authorStuart Hastings <stuart@apple.com>2011-05-13 00:15:17 +0000
committerStuart Hastings <stuart@apple.com>2011-05-13 00:15:17 +0000
commit8d57d8ea64cb83173c6503acec7da4215da9ed19 (patch)
tree715daa8d86d066740ac2c13615740b0d060c3438 /llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
parent502931fad98615619d3767428a2b5a5d64a513fc (diff)
downloadbcm5719-llvm-8d57d8ea64cb83173c6503acec7da4215da9ed19.tar.gz
bcm5719-llvm-8d57d8ea64cb83173c6503acec7da4215da9ed19.zip
Revert 131266 and 131261 due to buildbot complaints.
rdar://problem/9298790 llvm-svn: 131269
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 5a833d335c1..e2e6691ba7c 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/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);
OpenPOWER on IntegriCloud