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

[PRISM] Fix compiling popped opt_str_uminus and opt_str_freeze

Browse Source 
Put a pop as needed. This example currently causes [BUG]:

	$ ruby --parser=prism -e'1.times{"".freeze;nil}'
	-e:1: [BUG] Stack consistency error (sp: 15, bp: 14)
	ruby 3.4.0dev (2024-12-20T00:48:01Z master 978df259ca) +PRISM [x86_64-linux]
This commit is contained in:
Kazuki Yamaguchi 2024-12-20 15:37:10 +09:00 committed by Kevin Newton
parent b53a75230f
commit 0397bfa2c8
Notes: git 2024-12-20 13:19:27 +00:00 
Merged: https://github.com/ruby/ruby/pull/12410
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prism_compile.c
View File

@ -6913,6 +6913,7 @@ pm_compile_call_node(rb_iseq_t *iseq, const pm_call_node_t *node, LINK_ANCHOR *c
VALUE value = parse_static_literal_string(iseq, scope_node, node->receiver, &((const pm_string_node_t * ) node->receiver)->unescaped);
const struct rb_callinfo *callinfo = new_callinfo(iseq, idUMinus, 0, 0, NULL, FALSE);
PUSH_INSN2(ret, location, opt_str_uminus, value, callinfo);
if (popped) PUSH_INSN(ret, location, pop);
return;
}
break;
@ -6922,6 +6923,7 @@ pm_compile_call_node(rb_iseq_t *iseq, const pm_call_node_t *node, LINK_ANCHOR *c
VALUE value = parse_static_literal_string(iseq, scope_node, node->receiver, &((const pm_string_node_t * ) node->receiver)->unescaped);
const struct rb_callinfo *callinfo = new_callinfo(iseq, idFreeze, 0, 0, NULL, FALSE);
PUSH_INSN2(ret, location, opt_str_freeze, value, callinfo);
if (popped) PUSH_INSN(ret, location, pop);
return;
}
break;

4
test/ruby/test_compile_prism.rb
View File

@ -1993,6 +1993,10 @@ end
end
test_prism_call_node
CODE
# Specialized instructions
assert_prism_eval(%{-"literal"})
assert_prism_eval(%{"literal".freeze})
end
def test_CallAndWriteNode