diff options
| -rw-r--r-- | llvm/lib/Target/BPF/BPFISelLowering.cpp | 9 | ||||
| -rw-r--r-- | llvm/lib/Target/BPF/BPFISelLowering.h | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/BPF/many_args1.ll | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/llvm/lib/Target/BPF/BPFISelLowering.cpp b/llvm/lib/Target/BPF/BPFISelLowering.cpp index 066dc5e31e1..d5ace85b8e5 100644 --- a/llvm/lib/Target/BPF/BPFISelLowering.cpp +++ b/llvm/lib/Target/BPF/BPFISelLowering.cpp @@ -209,6 +209,8 @@ SDValue BPFTargetLowering::LowerFormalArguments( return Chain; } +const unsigned long BPFTargetLowering::MaxArgs = 5; + SDValue BPFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI, SmallVectorImpl<SDValue> &InVals) const { SelectionDAG &DAG = CLI.DAG; @@ -241,9 +243,8 @@ SDValue BPFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI, unsigned NumBytes = CCInfo.getNextStackOffset(); - if (Outs.size() >= 6) { + if (Outs.size() > MaxArgs) fail(CLI.DL, DAG, "too many args to ", Callee); - } for (auto &Arg : Outs) { ISD::ArgFlagsTy Flags = Arg.Flags; @@ -257,10 +258,10 @@ SDValue BPFTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI, Chain = DAG.getCALLSEQ_START( Chain, DAG.getConstant(NumBytes, CLI.DL, PtrVT, true), CLI.DL); - SmallVector<std::pair<unsigned, SDValue>, 5> RegsToPass; + SmallVector<std::pair<unsigned, SDValue>, MaxArgs> RegsToPass; // Walk arg assignments - for (unsigned i = 0, e = ArgLocs.size(); i != e; ++i) { + for (unsigned i = 0, e = std::min(ArgLocs.size(), MaxArgs); i != e; ++i) { CCValAssign &VA = ArgLocs[i]; SDValue Arg = OutVals[i]; diff --git a/llvm/lib/Target/BPF/BPFISelLowering.h b/llvm/lib/Target/BPF/BPFISelLowering.h index ec71dca2fae..8663b67a7f0 100644 --- a/llvm/lib/Target/BPF/BPFISelLowering.h +++ b/llvm/lib/Target/BPF/BPFISelLowering.h @@ -58,6 +58,9 @@ private: SelectionDAG &DAG, SmallVectorImpl<SDValue> &InVals) const; + // Maximum number of arguments to a call + static const unsigned long MaxArgs; + // Lower a call into CALLSEQ_START - BPFISD:CALL - CALLSEQ_END chain SDValue LowerCall(TargetLowering::CallLoweringInfo &CLI, SmallVectorImpl<SDValue> &InVals) const override; diff --git a/llvm/test/CodeGen/BPF/many_args1.ll b/llvm/test/CodeGen/BPF/many_args1.ll index a5500dad1ed..08218f452d0 100644 --- a/llvm/test/CodeGen/BPF/many_args1.ll +++ b/llvm/test/CodeGen/BPF/many_args1.ll @@ -1,4 +1,4 @@ -; RUN: not llc -march=bpf -exit-on-error < %s 2> %t1 +; RUN: not llc -march=bpf < %s 2> %t1 ; RUN: FileCheck %s < %t1 ; CHECK: too many args |
