From ca3a56f2fbde4132e405ead4edadc3570b209386 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Fri, 15 Feb 2008 19:34:17 +0000 Subject: [PATCH] Teach LegalizeTypes how to promote the flags in a ret node. These are created as i32 constants but on some platforms i32 is not legal. This fixes 26 "make check" failures, for example Alpha/2005-07-12-TwoMallocCalls.ll. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47172 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/LegalizeTypes.h | 13 ++++++----- lib/CodeGen/SelectionDAG/LegalizeTypesPromote.cpp | 28 ++++++++++++++++++++++- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/lib/CodeGen/SelectionDAG/LegalizeTypes.h b/lib/CodeGen/SelectionDAG/LegalizeTypes.h index 6f3ffba52ea..47985c7e8aa 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeTypes.h +++ b/lib/CodeGen/SelectionDAG/LegalizeTypes.h @@ -182,18 +182,19 @@ private: // Operand Promotion. bool PromoteOperand(SDNode *N, unsigned OperandNo); SDOperand PromoteOperand_ANY_EXTEND(SDNode *N); - SDOperand PromoteOperand_ZERO_EXTEND(SDNode *N); - SDOperand PromoteOperand_SIGN_EXTEND(SDNode *N); - SDOperand PromoteOperand_TRUNCATE(SDNode *N); + SDOperand PromoteOperand_BR_CC(SDNode *N, unsigned OpNo); + SDOperand PromoteOperand_BRCOND(SDNode *N, unsigned OpNo); SDOperand PromoteOperand_FP_EXTEND(SDNode *N); SDOperand PromoteOperand_FP_ROUND(SDNode *N); SDOperand PromoteOperand_INT_TO_FP(SDNode *N); + SDOperand PromoteOperand_RET(SDNode *N, unsigned OpNo); SDOperand PromoteOperand_SELECT(SDNode *N, unsigned OpNo); - SDOperand PromoteOperand_BRCOND(SDNode *N, unsigned OpNo); - SDOperand PromoteOperand_BR_CC(SDNode *N, unsigned OpNo); SDOperand PromoteOperand_SETCC(SDNode *N, unsigned OpNo); + SDOperand PromoteOperand_SIGN_EXTEND(SDNode *N); SDOperand PromoteOperand_STORE(StoreSDNode *N, unsigned OpNo); - + SDOperand PromoteOperand_TRUNCATE(SDNode *N); + SDOperand PromoteOperand_ZERO_EXTEND(SDNode *N); + void PromoteSetCCOperands(SDOperand &LHS,SDOperand &RHS, ISD::CondCode Code); //===--------------------------------------------------------------------===// diff --git a/lib/CodeGen/SelectionDAG/LegalizeTypesPromote.cpp b/lib/CodeGen/SelectionDAG/LegalizeTypesPromote.cpp index 3dab01a981d..870501c9a7c 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeTypesPromote.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeTypesPromote.cpp @@ -340,8 +340,10 @@ bool DAGTypeLegalizer::PromoteOperand(SDNode *N, unsigned OpNo) { case ISD::MEMSET: case ISD::MEMCPY: case ISD::MEMMOVE: Res = HandleMemIntrinsic(N); break; + + case ISD::RET: Res = PromoteOperand_RET(N, OpNo); break; } - + // If the result is null, the sub-method took care of registering results etc. if (!Res.Val) return false; // If the result is N, the sub-method updated N in place. @@ -524,3 +526,27 @@ SDOperand DAGTypeLegalizer::PromoteOperand_STORE(StoreSDNode *N, unsigned OpNo){ SVOffset, N->getMemoryVT(), isVolatile, Alignment); } + +SDOperand DAGTypeLegalizer::PromoteOperand_RET(SDNode *N, unsigned OpNo) { + assert(!(OpNo & 1) && "Return values should be legally typed!"); + assert((N->getNumOperands() & 1) && "Wrong number of operands!"); + + // It's a flag. Promote all the flags in one hit, as an optimization. + SmallVector NewValues(N->getNumOperands()); + NewValues[0] = N->getOperand(0); // The chain + for (unsigned i = 1, e = N->getNumOperands(); i < e; i += 2) { + // The return value. + NewValues[i] = N->getOperand(i); + + // The flag. + SDOperand Flag = N->getOperand(i + 1); + if (getTypeAction(Flag.getValueType()) == Promote) + // The promoted value may have rubbish in the new bits, but that + // doesn't matter because those bits aren't queried anyway. + Flag = GetPromotedOp(Flag); + NewValues[i + 1] = Flag; + } + + return DAG.UpdateNodeOperands(SDOperand (N, 0), + &NewValues[0], NewValues.size()); +} -- 2.11.0