diff options
| author | Max Bernstein <[email protected]> | 2025-04-28 14:54:39 -0400 |
|---|---|---|
| committer | Aaron Patterson <[email protected]> | 2025-04-29 09:13:25 -0700 |
| commit | b42c8398ba84437cd6e96cbf6ccaf5ac5eff32b6 (patch) | |
| tree | a4b50fdaa42e9dca1e11e4f6fb90a021683df660 | |
| parent | 6052b12de484eb675fd3cdb6c6ff32a3e1b90b72 (diff) | |
Don't support blockarg in opt_new
We don't calculate the correct argc so the bookkeeping slot is something
else (unexpected) instead of Qnil (expected).
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/13198
| -rw-r--r-- | insns.def | 4 | ||||
| -rw-r--r-- | prism_compile.c | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -916,11 +916,13 @@ opt_new VALUE argc = vm_ci_argc(cd->ci); VALUE val = TOPN(argc); + // The bookkeeping slot should be empty. + RUBY_ASSERT(TOPN(argc + 1) == Qnil); + if (vm_method_cfunc_is(GET_ISEQ(), cd, val, rb_class_new_instance_pass_kw) && !(ruby_vm_event_flags & ISEQ_TRACE_EVENTS)) { RB_DEBUG_COUNTER_INC(opt_new_hit); val = rb_obj_alloc(val); TOPN(argc) = val; - RUBY_ASSERT(TOPN(argc + 1) == Qnil); TOPN(argc + 1) = val; } else { diff --git a/prism_compile.c b/prism_compile.c index 3688a1e515..71361e9aa9 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -3722,7 +3722,8 @@ pm_compile_call(rb_iseq_t *iseq, const pm_call_node_t *call_node, LINK_ANCHOR *c bool inline_new = ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction && method_id == rb_intern("new") && - call_node->block == NULL; + call_node->block == NULL && + (flags & VM_CALL_ARGS_BLOCKARG) == 0; if (inline_new) { if (LAST_ELEMENT(ret) == opt_new_prelude) { |