From 44579680111b807613703ab401db3b8c0148e36c Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Thu, 17 Mar 2011 14:21:56 +0000 Subject: [PATCH] Rename getTypeForExtendedInteger() to getTypeForExtArgOrReturn(). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@127807 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetLowering.h | 4 ++-- lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 2 +- lib/Target/X86/X86ISelLowering.cpp | 4 ++-- lib/Target/X86/X86ISelLowering.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/llvm/Target/TargetLowering.h b/include/llvm/Target/TargetLowering.h index f257b035b8f..bf1188ffdf5 100644 --- a/include/llvm/Target/TargetLowering.h +++ b/include/llvm/Target/TargetLowering.h @@ -1287,14 +1287,14 @@ public: return false; } - /// getTypeForExtendedInteger - Return the type that should be used to zero or + /// getTypeForExtArgOrReturn - Return the type that should be used to zero or /// sign extend a zeroext/signext integer argument or return value. /// FIXME: Most C calling convention requires the return type to be promoted, /// but this is not true all the time, e.g. i1 on x86-64. It is also not /// necessary for non-C calling conventions. The frontend should handle this /// and include all of the necessary information. virtual MVT - getTypeForExtendedInteger(EVT VT, ISD::NodeType ExtendKind) const { + getTypeForExtArgOrReturn(EVT VT, ISD::NodeType ExtendKind) const { return MVT::i32; } diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 55483188355..9671a45062f 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -1129,7 +1129,7 @@ void SelectionDAGBuilder::visitRet(const ReturnInst &I) { ExtendKind = ISD::ZERO_EXTEND; if (ExtendKind != ISD::ANY_EXTEND && VT.isInteger()) { - MVT ReturnMVT = TLI.getTypeForExtendedInteger(VT, ExtendKind); + MVT ReturnMVT = TLI.getTypeForExtArgOrReturn(VT, ExtendKind); EVT MinVT = TLI.getRegisterType(*DAG.getContext(), ReturnMVT); if (VT.bitsLT(MinVT)) VT = MinVT; diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp index c1aa7200bef..dfb7b87d4ea 100644 --- a/lib/Target/X86/X86ISelLowering.cpp +++ b/lib/Target/X86/X86ISelLowering.cpp @@ -1449,8 +1449,8 @@ bool X86TargetLowering::isUsedByReturnOnly(SDNode *N) const { } MVT -X86TargetLowering::getTypeForExtendedInteger(EVT VT, - ISD::NodeType ExtendKind) const { +X86TargetLowering::getTypeForExtArgOrReturn(EVT VT, + ISD::NodeType ExtendKind) const { // TODO: Is this also valid on 32-bit? if (Subtarget->is64Bit() && VT == MVT::i1 && ExtendKind == ISD::ZERO_EXTEND) return MVT::i8; diff --git a/lib/Target/X86/X86ISelLowering.h b/lib/Target/X86/X86ISelLowering.h index 0857c594b4f..bd9247b0a65 100644 --- a/lib/Target/X86/X86ISelLowering.h +++ b/lib/Target/X86/X86ISelLowering.h @@ -844,7 +844,7 @@ namespace llvm { virtual bool isUsedByReturnOnly(SDNode *N) const; virtual MVT - getTypeForExtendedInteger(EVT VT, ISD::NodeType ExtendKind) const; + getTypeForExtArgOrReturn(EVT VT, ISD::NodeType ExtendKind) const; virtual bool CanLowerReturn(CallingConv::ID CallConv, bool isVarArg,