1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't support blockarg in opt_new

Browse Source 
We don't calculate the correct argc so the bookkeeping slot is something
else (unexpected) instead of Qnil (expected).
This commit is contained in:
Max Bernstein 2025-04-28 14:54:39 -04:00 committed by Aaron Patterson
parent 6052b12de4
commit b42c8398ba
Notes: git 2025-04-29 16:13:40 +00:00 
Merged: https://github.com/ruby/ruby/pull/13198
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
insns.def
View File

@ -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 {

3
prism_compile.c
View File

@ -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) {