summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ruby_vm/rjit/insn_compiler.rb6
-rw-r--r--rjit_c.h4
-rw-r--r--rjit_c.rb4
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/ruby_vm/rjit/insn_compiler.rb b/lib/ruby_vm/rjit/insn_compiler.rb
index f3448ec426..8281511e97 100644
--- a/lib/ruby_vm/rjit/insn_compiler.rb
+++ b/lib/ruby_vm/rjit/insn_compiler.rb
@@ -4765,12 +4765,12 @@ module RubyVM::RJIT
end
if iseq.body.param.flags.has_rest || iseq.body.param.flags.has_post
- asm.incr_counter(:send_iseq_complex_has_rest_or_post)
+ asm.incr_counter(iseq.body.param.flags.has_rest ? :send_iseq_complex_has_rest : :send_iseq_complex_has_pos)
return CantCompile
end
if iseq.body.param.flags.has_post
- asm.incr_counter(:send_iseq_complex_has_rest_or_post)
+ asm.incr_counter(:send_iseq_complex_has_post)
return CantCompile
end
@@ -4780,7 +4780,7 @@ module RubyVM::RJIT
end
if iseq.body.param.flags.has_rest
- asm.incr_counter(:send_iseq_complex_has_rest_or_post)
+ asm.incr_counter(:send_iseq_complex_has_rest)
return CantCompile
end
diff --git a/rjit_c.h b/rjit_c.h
index 384b517480..41208129ca 100644
--- a/rjit_c.h
+++ b/rjit_c.h
@@ -58,7 +58,8 @@ RJIT_RUNTIME_COUNTERS(
send_iseq_complex_arg_setup_block,
send_iseq_complex_arity,
send_iseq_complex_has_lead,
- send_iseq_complex_has_rest_or_post,
+ send_iseq_complex_has_rest,
+ send_iseq_complex_has_post,
send_iseq_complex_has_opt,
send_iseq_complex_has_kw,
send_iseq_complex_has_kwrest,
@@ -92,7 +93,6 @@ RJIT_RUNTIME_COUNTERS(
send_bmethod_blockarg,
invokesuper_me_changed,
- invokesuper_same_me,
invokeblock_none,
invokeblock_symbol,
diff --git a/rjit_c.rb b/rjit_c.rb
index 9a7999f18b..4c95716b36 100644
--- a/rjit_c.rb
+++ b/rjit_c.rb
@@ -1307,7 +1307,8 @@ module RubyVM::RJIT # :nodoc: all
send_iseq_complex_arg_setup_block: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_arg_setup_block)")],
send_iseq_complex_arity: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_arity)")],
send_iseq_complex_has_lead: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_lead)")],
- send_iseq_complex_has_rest_or_post: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_rest_or_post)")],
+ send_iseq_complex_has_rest: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_rest)")],
+ send_iseq_complex_has_post: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_post)")],
send_iseq_complex_has_opt: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_opt)")],
send_iseq_complex_has_kw: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_kw)")],
send_iseq_complex_has_kwrest: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_iseq_complex_has_kwrest)")],
@@ -1335,7 +1336,6 @@ module RubyVM::RJIT # :nodoc: all
send_bmethod_not_iseq: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_bmethod_not_iseq)")],
send_bmethod_blockarg: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), send_bmethod_blockarg)")],
invokesuper_me_changed: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokesuper_me_changed)")],
- invokesuper_same_me: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokesuper_same_me)")],
invokeblock_none: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_none)")],
invokeblock_symbol: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_symbol)")],
invokeblock_proc: [CType::Immediate.parse("size_t"), Primitive.cexpr!("OFFSETOF((*((struct rb_rjit_runtime_counters *)NULL)), invokeblock_proc)")],