From a0790e6335094e0124bae3d5b53ed2264fc7a791 Mon Sep 17 00:00:00 2001 From: Noah Gibbs Date: Wed, 22 Sep 2021 16:04:37 +0100 Subject: Break up callsite_not_simple into multiple cases. --- yjit_codegen.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'yjit_codegen.c') diff --git a/yjit_codegen.c b/yjit_codegen.c index 29b9d21781..9045dffa2b 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -3574,8 +3574,16 @@ gen_send_general(jitstate_t *jit, ctx_t *ctx, struct rb_call_data *cd, rb_iseq_t // Don't JIT calls that aren't simple // Note, not using VM_CALL_ARGS_SIMPLE because sometimes we pass a block. - if ((vm_ci_flag(ci) & (VM_CALL_KW_SPLAT | VM_CALL_KWARG | VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) != 0) { - GEN_COUNTER_INC(cb, send_callsite_not_simple); + if ((vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) != 0) { + GEN_COUNTER_INC(cb, send_callsite_args_splat); + return YJIT_CANT_COMPILE; + } + if ((vm_ci_flag(ci) & VM_CALL_KWARG) != 0) { + GEN_COUNTER_INC(cb, send_kw_block_arg); + return YJIT_CANT_COMPILE; + } + if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) != 0) { + GEN_COUNTER_INC(cb, send_block_arg); return YJIT_CANT_COMPILE; } @@ -3745,8 +3753,20 @@ gen_invokesuper(jitstate_t* jit, ctx_t* ctx, codeblock_t* cb) // Don't JIT calls that aren't simple // Note, not using VM_CALL_ARGS_SIMPLE because sometimes we pass a block. - if ((vm_ci_flag(ci) & (VM_CALL_KW_SPLAT | VM_CALL_KWARG | VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) != 0) { - GEN_COUNTER_INC(cb, send_callsite_not_simple); + if ((vm_ci_flag(ci) & VM_CALL_ARGS_SPLAT) != 0) { + GEN_COUNTER_INC(cb, send_callsite_args_splat); + return YJIT_CANT_COMPILE; + } + if ((vm_ci_flag(ci) & VM_CALL_KWARG) != 0) { + GEN_COUNTER_INC(cb, send_kw_block_arg); + return YJIT_CANT_COMPILE; + } + if ((vm_ci_flag(ci) & VM_CALL_KW_SPLAT) != 0) { + GEN_COUNTER_INC(cb, send_kw_splat); + return YJIT_CANT_COMPILE; + } + if ((vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) != 0) { + GEN_COUNTER_INC(cb, send_block_arg); return YJIT_CANT_COMPILE; } -- cgit v1.2.3