diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-11-28 01:03:30 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-11-28 01:03:30 +0000 |
| commit | b6c806045bbd4a650f90f613a96cee01a1584412 (patch) | |
| tree | ca7c7ce1ba246f60e6a046b480867bbc0fb58f93 | |
| parent | 480f093dc2b6aff9b501cc56cf5728513e55be81 (diff) | |
| download | external_llvm-b6c806045bbd4a650f90f613a96cee01a1584412.zip external_llvm-b6c806045bbd4a650f90f613a96cee01a1584412.tar.gz external_llvm-b6c806045bbd4a650f90f613a96cee01a1584412.tar.bz2 | |
Fix PR1016
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31950 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index a1a5955..5b15dfb 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -1862,6 +1862,10 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { break; case Promote: Tmp1 = PromoteOp(Node->getOperand(0)); // Promote the condition. + // Make sure the condition is either zero or one. + if (!TLI.MaskedValueIsZero(Tmp1, + MVT::getIntVTBitMask(Tmp1.getValueType())^1)) + Tmp1 = DAG.getZeroExtendInReg(Tmp1, MVT::i1); break; } Tmp2 = LegalizeOp(Node->getOperand(1)); // TrueVal @@ -1883,11 +1887,6 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { Tmp2, Tmp3, cast<CondCodeSDNode>(Tmp1.getOperand(2))->get()); } else { - // Make sure the condition is either zero or one. It may have been - // promoted from something else. - unsigned NumBits = MVT::getSizeInBits(Tmp1.getValueType()); - if (!TLI.MaskedValueIsZero(Tmp1, (~0ULL >> (64-NumBits))^1)) - Tmp1 = DAG.getZeroExtendInReg(Tmp1, MVT::i1); Result = DAG.getSelectCC(Tmp1, DAG.getConstant(0, Tmp1.getValueType()), Tmp2, Tmp3, ISD::SETNE); |