[PATCH] D20376: [SDAG] Remove FixedArgs parameter from CallLoweringInfo::setCallee

Justin Bogner via llvm-commits llvm-commits at lists.llvm.org
Fri Jun 17 11:02:40 PDT 2016


Krzysztof Parzyszek <kparzysz at codeaurora.org> writes:
> kparzysz retitled this revision from "Properly set CLI.NumFixedArgs
> for mem{set,move,cpy} builtins in SelectionDAG" to "[SDAG] Remove
> FixedArgs parameter from CallLoweringInfo::setCallee".
> kparzysz updated the summary for this revision.
> kparzysz removed a reviewer: mehdi_amini.
> kparzysz updated this revision to Diff 60888.
> kparzysz added a comment.
> Herald added subscribers: dsanders, jyknight.
>
> As per earlier comments, updated the diff to remove FixedArgs
> parameter from setCallee and fixed all calls to setCallee to reflect
> the change.

LGTM.

>
> Repository:
>   rL LLVM
>
> http://reviews.llvm.org/D20376
>
> Files:
>   include/llvm/Target/TargetLowering.h
>   lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
>   lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
>   lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
>   lib/CodeGen/SelectionDAG/SelectionDAG.cpp
>   lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
>   lib/CodeGen/SelectionDAG/TargetLowering.cpp
>   lib/Target/AArch64/AArch64ISelLowering.cpp
>   lib/Target/AArch64/AArch64SelectionDAGInfo.cpp
>   lib/Target/ARM/ARMISelLowering.cpp
>   lib/Target/ARM/ARMSelectionDAGInfo.cpp
>   lib/Target/Hexagon/HexagonSelectionDAGInfo.cpp
>   lib/Target/Mips/MipsISelLowering.cpp
>   lib/Target/PowerPC/PPCISelLowering.cpp
>   lib/Target/Sparc/SparcISelLowering.cpp
>   lib/Target/X86/X86ISelDAGToDAG.cpp
>   lib/Target/X86/X86ISelLowering.cpp
>   lib/Target/X86/X86SelectionDAGInfo.cpp
>   lib/Target/XCore/XCoreISelLowering.cpp
>   lib/Target/XCore/XCoreSelectionDAGInfo.cpp
>
> Index: lib/Target/XCore/XCoreSelectionDAGInfo.cpp
> ===================================================================
> --- lib/Target/XCore/XCoreSelectionDAGInfo.cpp
> +++ lib/Target/XCore/XCoreSelectionDAGInfo.cpp
> @@ -39,7 +39,7 @@
>                     Type::getVoidTy(*DAG.getContext()),
>                     DAG.getExternalSymbol("__memcpy_4",
>                                           TLI.getPointerTy(DAG.getDataLayout())),
> -                   std::move(Args), 0)
> +                   std::move(Args))
>          .setDiscardResult();
>  
>      std::pair<SDValue,SDValue> CallResult = TLI.LowerCallTo(CLI);
> Index: lib/Target/XCore/XCoreISelLowering.cpp
> ===================================================================
> --- lib/Target/XCore/XCoreISelLowering.cpp
> +++ lib/Target/XCore/XCoreISelLowering.cpp
> @@ -492,7 +492,7 @@
>        CallingConv::C, IntPtrTy,
>        DAG.getExternalSymbol("__misaligned_load",
>                              getPointerTy(DAG.getDataLayout())),
> -      std::move(Args), 0);
> +      std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>    SDValue Ops[] = { CallResult.first, CallResult.second };
> @@ -555,7 +555,7 @@
>        CallingConv::C, Type::getVoidTy(*DAG.getContext()),
>        DAG.getExternalSymbol("__misaligned_store",
>                              getPointerTy(DAG.getDataLayout())),
> -      std::move(Args), 0);
> +      std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>    return CallResult.second;
> Index: lib/Target/X86/X86SelectionDAGInfo.cpp
> ===================================================================
> --- lib/Target/X86/X86SelectionDAGInfo.cpp
> +++ lib/Target/X86/X86SelectionDAGInfo.cpp
> @@ -87,8 +87,7 @@
>        TargetLowering::CallLoweringInfo CLI(DAG);
>        CLI.setDebugLoc(dl).setChain(Chain)
>          .setCallee(CallingConv::C, Type::getVoidTy(*DAG.getContext()),
> -                   DAG.getExternalSymbol(bzeroEntry, IntPtr), std::move(Args),
> -                   0)
> +                   DAG.getExternalSymbol(bzeroEntry, IntPtr), std::move(Args))
>          .setDiscardResult();
>  
>        std::pair<SDValue,SDValue> CallResult = TLI.LowerCallTo(CLI);
> Index: lib/Target/X86/X86ISelLowering.cpp
> ===================================================================
> --- lib/Target/X86/X86ISelLowering.cpp
> +++ lib/Target/X86/X86ISelLowering.cpp
> @@ -19453,7 +19453,7 @@
>    CLI.setDebugLoc(dl).setChain(InChain)
>      .setCallee(getLibcallCallingConv(LC),
>                 static_cast<EVT>(MVT::v2i64).getTypeForEVT(*DAG.getContext()),
> -               Callee, std::move(Args), 0)
> +               Callee, std::move(Args))
>      .setInRegister().setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue, SDValue> CallInfo = LowerCallTo(CLI);
> @@ -21162,7 +21162,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(DAG.getEntryNode())
> -    .setCallee(CallingConv::C, RetTy, Callee, std::move(Args), 0);
> +    .setCallee(CallingConv::C, RetTy, Callee, std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallResult = TLI.LowerCallTo(CLI);
>  
> Index: lib/Target/X86/X86ISelDAGToDAG.cpp
> ===================================================================
> --- lib/Target/X86/X86ISelDAGToDAG.cpp
> +++ lib/Target/X86/X86ISelDAGToDAG.cpp
> @@ -662,7 +662,7 @@
>      CLI.setChain(CurDAG->getRoot())
>          .setCallee(CallingConv::C, Type::getVoidTy(*CurDAG->getContext()),
>                     CurDAG->getExternalSymbol("__main", TLI->getPointerTy(DL)),
> -                   std::move(Args), 0);
> +                   std::move(Args));
>      const TargetLowering &TLI = CurDAG->getTargetLoweringInfo();
>      std::pair<SDValue, SDValue> Result = TLI.LowerCallTo(CLI);
>      CurDAG->setRoot(Result.second);
> Index: lib/Target/Sparc/SparcISelLowering.cpp
> ===================================================================
> --- lib/Target/Sparc/SparcISelLowering.cpp
> +++ lib/Target/Sparc/SparcISelLowering.cpp
> @@ -2197,7 +2197,7 @@
>    }
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(SDLoc(Op)).setChain(Chain)
> -    .setCallee(CallingConv::C, RetTyABI, Callee, std::move(Args), 0);
> +    .setCallee(CallingConv::C, RetTyABI, Callee, std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallInfo = LowerCallTo(CLI);
>  
> @@ -2252,7 +2252,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(DL).setChain(Chain)
> -    .setCallee(CallingConv::C, RetTy, Callee, std::move(Args), 0);
> +    .setCallee(CallingConv::C, RetTy, Callee, std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallInfo = LowerCallTo(CLI);
>  
> Index: lib/Target/PowerPC/PPCISelLowering.cpp
> ===================================================================
> --- lib/Target/PowerPC/PPCISelLowering.cpp
> +++ lib/Target/PowerPC/PPCISelLowering.cpp
> @@ -2466,7 +2466,7 @@
>    CLI.setDebugLoc(dl).setChain(Chain)
>      .setCallee(CallingConv::C, Type::getVoidTy(*DAG.getContext()),
>                 DAG.getExternalSymbol("__trampoline_setup", PtrVT),
> -               std::move(Args), 0);
> +               std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>    return CallResult.second;
> Index: lib/Target/Mips/MipsISelLowering.cpp
> ===================================================================
> --- lib/Target/Mips/MipsISelLowering.cpp
> +++ lib/Target/Mips/MipsISelLowering.cpp
> @@ -1828,7 +1828,7 @@
>  
>      TargetLowering::CallLoweringInfo CLI(DAG);
>      CLI.setDebugLoc(DL).setChain(DAG.getEntryNode())
> -      .setCallee(CallingConv::C, PtrTy, TlsGetAddr, std::move(Args), 0);
> +      .setCallee(CallingConv::C, PtrTy, TlsGetAddr, std::move(Args));
>      std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>  
>      SDValue Ret = CallResult.first;
> Index: lib/Target/Hexagon/HexagonSelectionDAGInfo.cpp
> ===================================================================
> --- lib/Target/Hexagon/HexagonSelectionDAGInfo.cpp
> +++ lib/Target/Hexagon/HexagonSelectionDAGInfo.cpp
> @@ -52,7 +52,7 @@
>                   Type::getVoidTy(*DAG.getContext()),
>                   DAG.getTargetExternalSymbol(
>                       SpecialMemcpyName, TLI.getPointerTy(DAG.getDataLayout())),
> -                 std::move(Args), 0)
> +                 std::move(Args))
>        .setDiscardResult();
>  
>    std::pair<SDValue, SDValue> CallResult = TLI.LowerCallTo(CLI);
> Index: lib/Target/ARM/ARMSelectionDAGInfo.cpp
> ===================================================================
> --- lib/Target/ARM/ARMSelectionDAGInfo.cpp
> +++ lib/Target/ARM/ARMSelectionDAGInfo.cpp
> @@ -118,7 +118,7 @@
>             TLI->getLibcallCallingConv(LC), Type::getVoidTy(*DAG.getContext()),
>             DAG.getExternalSymbol(FunctionNames[AEABILibcall][AlignVariant],
>                                   TLI->getPointerTy(DAG.getDataLayout())),
> -           std::move(Args), 0)
> +           std::move(Args))
>        .setDiscardResult();
>    std::pair<SDValue,SDValue> CallResult = TLI->LowerCallTo(CLI);
>    
> Index: lib/Target/ARM/ARMISelLowering.cpp
> ===================================================================
> --- lib/Target/ARM/ARMISelLowering.cpp
> +++ lib/Target/ARM/ARMISelLowering.cpp
> @@ -2709,8 +2709,7 @@
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(Chain)
>      .setCallee(CallingConv::C, Type::getInt32Ty(*DAG.getContext()),
> -               DAG.getExternalSymbol("__tls_get_addr", PtrVT), std::move(Args),
> -               0);
> +               DAG.getExternalSymbol("__tls_get_addr", PtrVT), std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>    return CallResult.first;
> @@ -6844,7 +6843,7 @@
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl)
>        .setChain(DAG.getEntryNode())
> -      .setCallee(CC, RetTy, Callee, std::move(Args), 0)
> +      .setCallee(CC, RetTy, Callee, std::move(Args))
>        .setDiscardResult(ShouldUseSRet);
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>  
> @@ -6897,7 +6896,7 @@
>    CLI.setDebugLoc(dl)
>      .setChain(Chain)
>      .setCallee(CallingConv::ARM_AAPCS_VFP, VT.getTypeForEVT(*DAG.getContext()),
> -               ES, std::move(Args), 0);
> +               ES, std::move(Args));
>  
>    return LowerCallTo(CLI).first;
>  }
> @@ -11867,7 +11866,7 @@
>    SDLoc dl(Op);
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(InChain)
> -    .setCallee(getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setInRegister().setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue, SDValue> CallInfo = LowerCallTo(CLI);
> @@ -11905,7 +11904,7 @@
>    // Lower call
>    CallLoweringInfo CLI(DAG);
>    CLI.setChain(InChain)
> -     .setCallee(CallingConv::ARM_AAPCS, RetTy, Callee, std::move(Args), 0)
> +     .setCallee(CallingConv::ARM_AAPCS, RetTy, Callee, std::move(Args))
>       .setSExtResult(isSigned).setZExtResult(!isSigned).setDebugLoc(SDLoc(N));
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>  
> Index: lib/Target/AArch64/AArch64SelectionDAGInfo.cpp
> ===================================================================
> --- lib/Target/AArch64/AArch64SelectionDAGInfo.cpp
> +++ lib/Target/AArch64/AArch64SelectionDAGInfo.cpp
> @@ -44,7 +44,7 @@
>      TargetLowering::CallLoweringInfo CLI(DAG);
>      CLI.setDebugLoc(dl).setChain(Chain)
>        .setCallee(CallingConv::C, Type::getVoidTy(*DAG.getContext()),
> -                 DAG.getExternalSymbol(bzeroEntry, IntPtr), std::move(Args), 0)
> +                 DAG.getExternalSymbol(bzeroEntry, IntPtr), std::move(Args))
>        .setDiscardResult();
>      std::pair<SDValue, SDValue> CallResult = TLI.LowerCallTo(CLI);
>      return CallResult.second;
> Index: lib/Target/AArch64/AArch64ISelLowering.cpp
> ===================================================================
> --- lib/Target/AArch64/AArch64ISelLowering.cpp
> +++ lib/Target/AArch64/AArch64ISelLowering.cpp
> @@ -2109,7 +2109,7 @@
>    StructType *RetTy = StructType::get(ArgTy, ArgTy, nullptr);
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(DAG.getEntryNode())
> -    .setCallee(CallingConv::Fast, RetTy, Callee, std::move(Args), 0);
> +    .setCallee(CallingConv::Fast, RetTy, Callee, std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>    return CallResult.first;
> Index: lib/CodeGen/SelectionDAG/TargetLowering.cpp
> ===================================================================
> --- lib/CodeGen/SelectionDAG/TargetLowering.cpp
> +++ lib/CodeGen/SelectionDAG/TargetLowering.cpp
> @@ -136,7 +136,7 @@
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    bool signExtend = shouldSignExtendTypeInLibCall(RetVT, isSigned);
>    CLI.setDebugLoc(dl).setChain(DAG.getEntryNode())
> -    .setCallee(getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setNoReturn(doesNotReturn).setDiscardResult(!isReturnValueUsed)
>      .setSExtResult(signExtend).setZExtResult(!signExtend);
>    return LowerCallTo(CLI);
> @@ -3551,7 +3551,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(DAG.getEntryNode());
> -  CLI.setCallee(CallingConv::C, VoidPtrType, EmuTlsGetAddr, std::move(Args), 0);
> +  CLI.setCallee(CallingConv::C, VoidPtrType, EmuTlsGetAddr, std::move(Args));
>    std::pair<SDValue, SDValue> CallResult = LowerCallTo(CLI);
>  
>    // TLSADDR will be codegen'ed as call. Inform MFI that function has calls.
> Index: lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
> ===================================================================
> --- lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
> +++ lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
> @@ -5481,7 +5481,7 @@
>          CallingConv::C, I.getType(),
>          DAG.getExternalSymbol(TrapFuncName.data(),
>                                TLI.getPointerTy(DAG.getDataLayout())),
> -        std::move(Args), 0);
> +        std::move(Args));
>  
>      std::pair<SDValue, SDValue> Result = TLI.LowerCallTo(CLI);
>      DAG.setRoot(Result.second);
> @@ -7194,8 +7194,7 @@
>  
>    CLI.setDebugLoc(getCurSDLoc())
>        .setChain(getRoot())
> -      .setCallee(CS.getCallingConv(), ReturnTy, Callee, std::move(Args),
> -                 NumArgs)
> +      .setCallee(CS.getCallingConv(), ReturnTy, Callee, std::move(Args))
>        .setDiscardResult(CS->use_empty())
>        .setIsPatchPoint(IsPatchPoint);
>  }
> Index: lib/CodeGen/SelectionDAG/SelectionDAG.cpp
> ===================================================================
> --- lib/CodeGen/SelectionDAG/SelectionDAG.cpp
> +++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp
> @@ -4692,7 +4692,7 @@
>                   Dst.getValueType().getTypeForEVT(*getContext()),
>                   getExternalSymbol(TLI->getLibcallName(RTLIB::MEMCPY),
>                                     TLI->getPointerTy(getDataLayout())),
> -                 std::move(Args), 0)
> +                 std::move(Args))
>        .setDiscardResult()
>        .setTailCall(isTailCall);
>  
> @@ -4753,7 +4753,7 @@
>                   Dst.getValueType().getTypeForEVT(*getContext()),
>                   getExternalSymbol(TLI->getLibcallName(RTLIB::MEMMOVE),
>                                     TLI->getPointerTy(getDataLayout())),
> -                 std::move(Args), 0)
> +                 std::move(Args))
>        .setDiscardResult()
>        .setTailCall(isTailCall);
>  
> @@ -4815,7 +4815,7 @@
>                   Dst.getValueType().getTypeForEVT(*getContext()),
>                   getExternalSymbol(TLI->getLibcallName(RTLIB::MEMSET),
>                                     TLI->getPointerTy(getDataLayout())),
> -                 std::move(Args), 0)
> +                 std::move(Args))
>        .setDiscardResult()
>        .setTailCall(isTailCall);
>  
> Index: lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
> ===================================================================
> --- lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
> +++ lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
> @@ -1106,7 +1106,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(SDLoc(Node)).setChain(InChain)
> -    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue, SDValue> CallInfo = TLI.LowerCallTo(CLI);
> Index: lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
> ===================================================================
> --- lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
> +++ lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
> @@ -2605,7 +2605,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(Chain)
> -    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Func, std::move(Args), 0)
> +    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Func, std::move(Args))
>      .setSExtResult();
>  
>    std::pair<SDValue, SDValue> CallInfo = TLI.LowerCallTo(CLI);
> Index: lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
> ===================================================================
> --- lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
> +++ lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
> @@ -1978,7 +1978,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(SDLoc(Node)).setChain(InChain)
> -    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setTailCall(isTailCall).setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue, SDValue> CallInfo = TLI.LowerCallTo(CLI);
> @@ -2013,7 +2013,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(DAG.getEntryNode())
> -    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue,SDValue> CallInfo = TLI.LowerCallTo(CLI);
> @@ -2047,7 +2047,7 @@
>  
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(SDLoc(Node)).setChain(InChain)
> -    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue, SDValue> CallInfo = TLI.LowerCallTo(CLI);
> @@ -2142,7 +2142,7 @@
>    SDLoc dl(Node);
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(InChain)
> -    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args), 0)
> +    .setCallee(TLI.getLibcallCallingConv(LC), RetTy, Callee, std::move(Args))
>      .setSExtResult(isSigned).setZExtResult(!isSigned);
>  
>    std::pair<SDValue, SDValue> CallInfo = TLI.LowerCallTo(CLI);
> @@ -2255,7 +2255,7 @@
>    TargetLowering::CallLoweringInfo CLI(DAG);
>    CLI.setDebugLoc(dl).setChain(InChain)
>      .setCallee(TLI.getLibcallCallingConv(LC),
> -               Type::getVoidTy(*DAG.getContext()), Callee, std::move(Args), 0);
> +               Type::getVoidTy(*DAG.getContext()), Callee, std::move(Args));
>  
>    std::pair<SDValue, SDValue> CallInfo = TLI.LowerCallTo(CLI);
>  
> @@ -3760,7 +3760,7 @@
>          .setCallee(CallingConv::C, Type::getVoidTy(*DAG.getContext()),
>                     DAG.getExternalSymbol("__sync_synchronize",
>                                           TLI.getPointerTy(DAG.getDataLayout())),
> -                   std::move(Args), 0);
> +                   std::move(Args));
>  
>      std::pair<SDValue, SDValue> CallResult = TLI.LowerCallTo(CLI);
>  
> @@ -3800,7 +3800,7 @@
>          .setCallee(CallingConv::C, Type::getVoidTy(*DAG.getContext()),
>                     DAG.getExternalSymbol("abort",
>                                           TLI.getPointerTy(DAG.getDataLayout())),
> -                   std::move(Args), 0);
> +                   std::move(Args));
>      std::pair<SDValue, SDValue> CallResult = TLI.LowerCallTo(CLI);
>  
>      Results.push_back(CallResult.second);
> Index: include/llvm/Target/TargetLowering.h
> ===================================================================
> --- include/llvm/Target/TargetLowering.h
> +++ include/llvm/Target/TargetLowering.h
> @@ -2515,13 +2515,11 @@
>      }
>  
>      CallLoweringInfo &setCallee(CallingConv::ID CC, Type *ResultType,
> -                                SDValue Target, ArgListTy &&ArgsList,
> -                                unsigned FixedArgs = -1) {
> +                                SDValue Target, ArgListTy &&ArgsList) {
>        RetTy = ResultType;
>        Callee = Target;
>        CallConv = CC;
> -      NumFixedArgs =
> -        (FixedArgs == static_cast<unsigned>(-1) ? Args.size() : FixedArgs);
> +      NumFixedArgs = Args.size();
>        Args = std::move(ArgsList);
>        return *this;
>      }


More information about the llvm-commits mailing list