aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/SelectionDAG/LegalizeDAG.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 428e161f99..b353569c1f 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -6445,14 +6445,17 @@ void SelectionDAGLegalize::ExpandOp(SDValue Op, SDValue &Lo, SDValue &Hi){
unsigned OpV = Node->getOpcode() == ISD::ADD ? ISD::ADDC : ISD::SUBC;
bool hasCarry = false;
if (NVT == MVT::i64)
- hasCarry |= TLI.isOperationLegal(OpV, MVT::i32)
+ hasCarry |= TLI.isOperationLegal(OpV, MVT::i64)
+ | TLI.isOperationLegal(OpV, MVT::i32)
| TLI.isOperationLegal(OpV, MVT::i16)
| TLI.isOperationLegal(OpV, MVT::i8);
if (NVT == MVT::i32)
- hasCarry |= TLI.isOperationLegal(OpV, MVT::i16)
+ hasCarry |= TLI.isOperationLegal(OpV, MVT::i32)
+ | TLI.isOperationLegal(OpV, MVT::i16)
| TLI.isOperationLegal(OpV, MVT::i8);
if (NVT == MVT::i16)
- hasCarry |= TLI.isOperationLegal(OpV, MVT::i8);
+ hasCarry |= TLI.isOperationLegal(OpV, MVT::i16)
+ | TLI.isOperationLegal(OpV, MVT::i8);
if(hasCarry) {
if (Node->getOpcode() == ISD::ADD) {