Skip to content

Revert "[Bug #21256] Fix it parameter when splatting and define_method is used" #13947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 18, 2025
Merged

Revert "[Bug #21256] Fix it parameter when splatting and define_method is used" #13947

merged 1 commit into from
Jul 18, 2025
+0 −24

Conversation

mame
Copy link
Member

@mame mame commented Jul 18, 2025

Reverts #13108

That change caused the following ASAN error:

https://ci.rvm.jp/results/trunk_asan@ruby-sp1/5837210

=================================================================
--
  | ==178168==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffe1edb26b0 at pc 0x5e3d13c2362d bp 0x7ffe1edb2670 sp 0x7ffe1edb2668
  | WRITE of size 8 at 0x7ffe1edb26b0 thread T0
  | #0 0x5e3d13c2362c in pm_insert_local_index /tmp/ruby/src/trunk_asan/prism_compile.c:4681:44
  | #1 0x5e3d13c2362c in pm_compile_scope_node /tmp/ruby/src/trunk_asan/prism_compile.c:6784:9
  | #2 0x5e3d13b38b6e in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10253:9
  | #3 0x5e3d13b30165 in pm_iseq_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10564:9
  | #4 0x5e3d135a4b8a in pm_iseq_new_with_opt_try /tmp/ruby/src/trunk_asan/iseq.c:1057:5
  | #5 0x5e3d134b2b07 in rb_protect /tmp/ruby/src/trunk_asan/eval.c:1060:18
  | #6 0x5e3d135a3110 in pm_iseq_new_with_opt /tmp/ruby/src/trunk_asan/iseq.c:1110:5
  | #7 0x5e3d13c2f1a1 in pm_new_child_iseq /tmp/ruby/src/trunk_asan/prism_compile.c:1261:27
  | #8 0x5e3d13c2f1a1 in pm_compile_call /tmp/ruby/src/trunk_asan/prism_compile.c:3703:22
  | #9 0x5e3d13bd70d8 in pm_compile_call_node /tmp/ruby/src/trunk_asan/prism_compile.c:7476:5
  | #10 0x5e3d13b3650a in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:8848:9
  | #11 0x5e3d13b3bab6 in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c
  | #12 0x5e3d13c1d23c in pm_compile_scope_node /tmp/ruby/src/trunk_asan/prism_compile.c:7026:13
  | #13 0x5e3d13b38b6e in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10253:9
  | #14 0x5e3d13b30165 in pm_iseq_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10564:9
  | #15 0x5e3d135a4b8a in pm_iseq_new_with_opt_try /tmp/ruby/src/trunk_asan/iseq.c:1057:5
  | #16 0x5e3d134b2b07 in rb_protect /tmp/ruby/src/trunk_asan/eval.c:1060:18
  | #17 0x5e3d135a3110 in pm_iseq_new_with_opt /tmp/ruby/src/trunk_asan/iseq.c:1110:5
  | #18 0x5e3d13be3d22 in pm_new_child_iseq /tmp/ruby/src/trunk_asan/prism_compile.c:1261:27
  | #19 0x5e3d13b35cfc in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:9127:34
  | #20 0x5e3d13b3ba45 in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10380:17
  | #21 0x5e3d13c1c52a in pm_compile_scope_node /tmp/ruby/src/trunk_asan/prism_compile.c:7064:13
  | #22 0x5e3d13b38b6e in pm_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10253:9
  | #23 0x5e3d13b2ffff in pm_iseq_compile_node /tmp/ruby/src/trunk_asan/prism_compile.c:10554:9
  | #24 0x5e3d135a4b8a in pm_iseq_new_with_opt_try /tmp/ruby/src/trunk_asan/iseq.c:1057:5
  | #25 0x5e3d134b2b07 in rb_protect /tmp/ruby/src/trunk_asan/eval.c:1060:18
  | #26 0x5e3d135a3110 in pm_iseq_new_with_opt /tmp/ruby/src/trunk_asan/iseq.c:1110:5
  | #27 0x5e3d135b7038 in pm_iseq_compile_with_option /tmp/ruby/src/trunk_asan/iseq.c:1379:16
  | #28 0x5e3d135b7038 in iseqw_s_compile_parser /tmp/ruby/src/trunk_asan/iseq.c:1588:16
  | #29 0x5e3d138ded57 in vm_call_cfunc_with_frame_ /tmp/ruby/src/trunk_asan/vm_insnhelper.c:3784:11
  | #30 0x5e3d138823ab in vm_sendish /tmp/ruby/src/trunk_asan/vm_insnhelper.c:5991:15
  | #31 0x5e3d138823ab in vm_exec_core /tmp/ruby/build/trunk_asan/../../src/trunk_asan/insns.def:899:11
  | #32 0x5e3d13870d8a in rb_vm_exec /tmp/ruby/src/trunk_asan/vm.c:2621:22
  | #33 0x5e3d138fea81 in invoke_iseq_block_from_c /tmp/ruby/src/trunk_asan/vm.c:1651:12
  | #34 0x5e3d138fea81 in invoke_block_from_c_bh /tmp/ruby/src/trunk_asan/vm.c:1665:20
  | #35 0x5e3d138a1f47 in vm_yield_with_cref /tmp/ruby/src/trunk_asan/vm.c:1702:12
  | #36 0x5e3d138a1f47 in vm_yield /tmp/ruby/src/trunk_asan/vm.c:1710:12
  | #37 0x5e3d138a1f47 in rb_yield_0 /tmp/ruby/src/trunk_asan/vm_eval.c:1362:12
  | #38 0x5e3d138a1f47 in rb_yield /tmp/ruby/src/trunk_asan/vm_eval.c
  | #39 0x5e3d13a64c62 in rb_ary_collect /tmp/ruby/src/trunk_asan/array.c:3654:30
  | #40 0x5e3d138ded57 in vm_call_cfunc_with_frame_ /tmp/ruby/src/trunk_asan/vm_insnhelper.c:3784:11
  | #41 0x5e3d1387cc79 in vm_sendish /tmp/ruby/src/trunk_asan/vm_insnhelper.c:5991:15
  | #42 0x5e3d1387cc79 in vm_exec_core /tmp/ruby/build/trunk_asan/../../src/trunk_asan/insns.def:851:11
  | #43 0x5e3d1387117a in vm_exec_loop /tmp/ruby/src/trunk_asan/vm.c:2648:22
  | #44 0x5e3d1387117a in rb_vm_exec /tmp/ruby/src/trunk_asan/vm.c:2627:18
  | #45 0x5e3d138fea81 in invoke_iseq_block_from_c /tmp/ruby/src/trunk_asan/vm.c:1651:12
  | #46 0x5e3d138fea81 in invoke_block_from_c_bh /tmp/ruby/src/trunk_asan/vm.c:1665:20
  | #47 0x5e3d138a1f47 in vm_yield_with_cref /tmp/ruby/src/trunk_asan/vm.c:1702:12
  | #48 0x5e3d138a1f47 in vm_yield /tmp/ruby/src/trunk_asan/vm.c:1710:12
  | #49 0x5e3d138a1f47 in rb_yield_0 /tmp/ruby/src/trunk_asan/vm_eval.c:1362:12
  | #50 0x5e3d138a1f47 in rb_yield /tmp/ruby/src/trunk_asan/vm_eval.c
  | #51 0x5e3d13a64c62 in rb_ary_collect /tmp/ruby/src/trunk_asan/array.c:3654:30
  | #52 0x5e3d138ded57 in vm_call_cfunc_with_frame_ /tmp/ruby/src/trunk_asan/vm_insnhelper.c:3784:11
  | #53 0x5e3d1387cc79 in vm_sendish /tmp/ruby/src/trunk_asan/vm_insnhelper.c:5991:15
  | #54 0x5e3d1387cc79 in vm_exec_core /tmp/ruby/build/trunk_asan/../../src/trunk_asan/insns.def:851:11
  | #55 0x5e3d1387117a in vm_exec_loop /tmp/ruby/src/trunk_asan/vm.c:2648:22
  | #56 0x5e3d1387117a in rb_vm_exec /tmp/ruby/src/trunk_asan/vm.c:2627:18
  | #57 0x5e3d138b8db7 in rb_iseq_eval_main /tmp/ruby/src/trunk_asan/vm.c:2901:11
  | #58 0x5e3d134aed94 in rb_ec_exec_node /tmp/ruby/src/trunk_asan/eval.c:282:9
  | #59 0x5e3d134aed94 in ruby_run_node /tmp/ruby/src/trunk_asan/eval.c:320:30
  | #60 0x5e3d134a7c36 in rb_main /tmp/ruby/src/trunk_asan/main.c:42:12
  | #61 0x5e3d134a7c36 in main /tmp/ruby/src/trunk_asan/main.c:62:12
  | #62 0x7fdf6ea2a1c9 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16
  | #63 0x7fdf6ea2a28a in __libc_start_main csu/../csu/libc-start.c:360:3
  | #64 0x5e3d133cba04 in _start (/tmp/ruby/build/trunk_asan/ruby+0x16ba04) (BuildId: 9b3561139ee9b38241d6a8b17d91f5e8f9fa8415)

PM_IT_PARAMETERS_NODE is already handled here:

ruby/prism_compile.c

Lines 6421 to 6424 in 81515ac

if (scope_node->parameters != NULL && PM_NODE_TYPE_P(scope_node->parameters, PM_IT_PARAMETERS_NODE)) {
ID local = rb_make_temporary_id(local_index);
local_table_for_iseq->ids[local_index++] = local;
}

That change adds another handling code for PM_IT_PARAMETERS_NODE, which results in adding two local variable entries.

ruby/prism_compile.c

Lines 6780 to 6789 in 81515ac

if (scope_node->parameters && PM_NODE_TYPE_P(scope_node->parameters, PM_IT_PARAMETERS_NODE)) {
const uint8_t param_name[] = { 'i', 't' };
pm_constant_id_t constant_id = pm_constant_pool_find(&scope_node->parser->constant_pool, param_name, 2);
RUBY_ASSERT(constant_id && "parser should fill in `it` parameter");
pm_insert_local_index(constant_id, local_index, index_lookup_table, local_table_for_iseq, scope_node);
local_index++;
body->param.lead_num = 1;
body->param.flags.has_lead = true;
}

I tried to revert the first, old handling code, but it caused the following errors:

  1) Failure:
TestProc#test_parameters_lambda [/home/mame/work/ruby/test/ruby/test_proc.rb:1445]:
<[[:req]]> expected but was
<[[:req, :it]]>.

  2) Failure:
TestProc#test_parameters [/home/mame/work/ruby/test/ruby/test_proc.rb:1395]:
<[[:opt]]> expected but was
<[[:opt, :it]]>.

  3) Failure:
TestProc#test_it_is_not_local_variable [/home/mame/work/ruby/test/ruby/test_proc.rb:1691]:
<[]> expected but was
<[:it]>.

  4) Failure:
TestSyntax#test_it [/home/mame/work/ruby/test/ruby/test_syntax.rb:1943]:
<[:a]> expected but was
<[0]>.

Looks like the proper fix is not trivial, so I revert that change for now.

@mame mame enabled auto-merge (rebase) July 18, 2025 03:27
@mame mame mentioned this pull request Jul 18, 2025
Merged
@mame mame merged commit dc8ae24 into master Jul 18, 2025
149 checks passed
@mame mame deleted the revert-13108-it-splat-define-method branch July 18, 2025 04:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@mame
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy