Author: dsanders Date: Mon Dec 1 10:35:35 2014 New Revision: 223045 URL: http://llvm.org/viewvc/llvm-project?rev=223045&view=rev Log: Merged from r221516:
[mips] Removed IsVarArg from MipsISelLowering::analyzeCallOperands(). NFC. Summary: CCState objects already carry this information in their isVarArg() method. Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D6084 Modified: llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.cpp llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.h Modified: llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.cpp?rev=223045&r1=223044&r2=223045&view=diff ============================================================================== --- llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.cpp (original) +++ llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.cpp Mon Dec 1 10:35:35 2014 @@ -2587,8 +2587,7 @@ MipsTargetLowering::LowerCall(TargetLowe MipsCC MipsCCInfo(CallConv, Subtarget, CCInfo); CCInfo.PreAnalyzeCallOperandsForF128_(Outs, CLI.getArgs(), Callee.getNode()); - MipsCCInfo.analyzeCallOperands(Outs, IsVarArg, Callee.getNode(), - CLI.getArgs(), CCInfo); + MipsCCInfo.analyzeCallOperands(Outs, Callee.getNode(), CLI.getArgs(), CCInfo); CCInfo.ClearOriginalArgWasF128(); // Get a count of how many bytes are to be pushed on the stack. @@ -3588,12 +3587,11 @@ MipsTargetLowering::MipsCC::MipsCC(Calli } void MipsTargetLowering::MipsCC::analyzeCallOperands( - const SmallVectorImpl<ISD::OutputArg> &Args, bool IsVarArg, - const SDNode *CallNode, std::vector<ArgListEntry> &FuncArgs, - CCState &State) { + const SmallVectorImpl<ISD::OutputArg> &Args, const SDNode *CallNode, + std::vector<ArgListEntry> &FuncArgs, CCState &State) { MipsCC::SpecialCallingConvType SpecialCallingConv = getSpecialCallingConv(CallNode); - assert((CallConv != CallingConv::Fast || !IsVarArg) && + assert((CallConv != CallingConv::Fast || !State.isVarArg()) && "CallingConv::Fast shouldn't be used for vararg functions."); unsigned NumOpnds = Args.size(); @@ -3607,7 +3605,7 @@ void MipsTargetLowering::MipsCC::analyze ISD::ArgFlagsTy ArgFlags = Args[I].Flags; bool R; - if (IsVarArg && !Args[I].IsFixed) + if (State.isVarArg() && !Args[I].IsFixed) R = CC_Mips_VarArg(I, ArgVT, ArgVT, CCValAssign::Full, ArgFlags, State); else R = FixedFn(I, ArgVT, ArgVT, CCValAssign::Full, ArgFlags, State); Modified: llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.h?rev=223045&r1=223044&r2=223045&view=diff ============================================================================== --- llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.h (original) +++ llvm/branches/release_35/lib/Target/Mips/MipsISelLowering.h Mon Dec 1 10:35:35 2014 @@ -352,7 +352,7 @@ namespace llvm { CCState &Info); void analyzeCallOperands(const SmallVectorImpl<ISD::OutputArg> &Outs, - bool IsVarArg, const SDNode *CallNode, + const SDNode *CallNode, std::vector<ArgListEntry> &FuncArgs, CCState &State); _______________________________________________ llvm-branch-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits
