diff options
author | Chris Lattner <sabre@nondot.org> | 2005-03-29 19:09:56 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2005-03-29 19:09:56 +0000 |
commit | f51d3bd6769d46e7cf7beaa283d1ca449629bd32 (patch) | |
tree | aeaf2573a3dc1aeb27546dfa84b37283defb5425 | |
parent | cfba7981eb119488788f5d35cb50f36a65acd8a8 (diff) |
Fix a bug that andrew noticed where we do not correctly sign/zero extend
returned integer values all of the way to 64-bits (we only did it to 32-bits
leaving the top bits undefined). This causes problems for targets like alpha
whose ABI's define the top bits too.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20926 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index c4df0cdc27..ded66afaa1 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -378,22 +378,31 @@ void SelectionDAGLowering::visitRet(ReturnInst &I) { } SDOperand Op1 = getValue(I.getOperand(0)); + MVT::ValueType TmpVT; + switch (Op1.getValueType()) { default: assert(0 && "Unknown value type!"); case MVT::i1: case MVT::i8: case MVT::i16: - // Extend integer types to 32-bits. + case MVT::i32: + // If this is a machine where 32-bits is legal or expanded, promote to + // 32-bits, otherwise, promote to 64-bits. + if (TLI.getTypeAction(MVT::i32) == TargetLowering::Promote) + TmpVT = TLI.getTypeToTransformTo(MVT::i32); + else + TmpVT = MVT::i32; + + // Extend integer types to result type. if (I.getOperand(0)->getType()->isSigned()) - Op1 = DAG.getNode(ISD::SIGN_EXTEND, MVT::i32, Op1); + Op1 = DAG.getNode(ISD::SIGN_EXTEND, TmpVT, Op1); else - Op1 = DAG.getNode(ISD::ZERO_EXTEND, MVT::i32, Op1); + Op1 = DAG.getNode(ISD::ZERO_EXTEND, TmpVT, Op1); break; case MVT::f32: // Extend float to double. Op1 = DAG.getNode(ISD::FP_EXTEND, MVT::f64, Op1); break; - case MVT::i32: case MVT::i64: case MVT::f64: break; // No extension needed! |