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

[Bug #20927] Fix compile_shareable_literal_constant for hash with keyword splat

Browse Source 
Compilation of NODE_HASH in compile_shareable_literal_constant does not support hash that contains keyword splat.
If there is a keyword splat, fallback to default case.
This commit is contained in:
tompng 2024-12-13 02:19:58 +09:00 committed by Nobuyoshi Nakada
parent 730731cc86
commit e06b3b5ad1
Notes: git 2024-12-15 07:55:48 +00:00 
Merged: https://github.com/ruby/ruby/pull/12338
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compile.c
View File

@ -10473,6 +10473,12 @@ compile_shareable_literal_constant(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_pa
*shareable_literal_p = 0; *shareable_literal_p = 0;
return COMPILE_OK; return COMPILE_OK;
} }
for (NODE *n = RNODE_HASH(node)->nd_head; n; n = RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_next) {
if (!RNODE_LIST(n)->nd_head) {
// If the hash node have a keyword splat, fall back to the default case.
goto compile_shareable;
}
}
INIT_ANCHOR(anchor); INIT_ANCHOR(anchor);
lit = rb_hash_new(); lit = rb_hash_new();
@ -10482,25 +10488,21 @@ compile_shareable_literal_constant(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_pa
int shareable_literal_p2; int shareable_literal_p2;
NODE *key = RNODE_LIST(n)->nd_head; NODE *key = RNODE_LIST(n)->nd_head;
NODE *val = RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_head; NODE *val = RNODE_LIST(RNODE_LIST(n)->nd_next)->nd_head;
if (key) { CHECK(compile_shareable_literal_constant_next(key, anchor, &key_val, &shareable_literal_p2));
CHECK(compile_shareable_literal_constant_next(key, anchor, &key_val, &shareable_literal_p2)); if (shareable_literal_p2) {
if (shareable_literal_p2) { /* noop */
/* noop */
}
else if (RTEST(lit)) {
rb_hash_clear(lit);
lit = Qfalse;
}
} }
if (val) { else if (RTEST(lit)) {
CHECK(compile_shareable_literal_constant_next(val, anchor, &value_val, &shareable_literal_p2)); rb_hash_clear(lit);
if (shareable_literal_p2) { lit = Qfalse;
/* noop */ }
} CHECK(compile_shareable_literal_constant_next(val, anchor, &value_val, &shareable_literal_p2));
else if (RTEST(lit)) { if (shareable_literal_p2) {
rb_hash_clear(lit); /* noop */
lit = Qfalse; }
} else if (RTEST(lit)) {
rb_hash_clear(lit);
lit = Qfalse;
} }
if (RTEST(lit)) { if (RTEST(lit)) {
if (!UNDEF_P(key_val) && !UNDEF_P(value_val)) { if (!UNDEF_P(key_val) && !UNDEF_P(value_val)) {
@ -10516,6 +10518,8 @@ compile_shareable_literal_constant(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_pa
} }
default: default:
compile_shareable:
if (shareable == rb_parser_shareable_literal && if (shareable == rb_parser_shareable_literal &&
(SHAREABLE_BARE_EXPRESSION || level > 0)) { (SHAREABLE_BARE_EXPRESSION || level > 0)) {
CHECK(compile_ensure_shareable_node(iseq, ret, dest, node)); CHECK(compile_ensure_shareable_node(iseq, ret, dest, node));
@ -10529,7 +10533,7 @@ compile_shareable_literal_constant(rb_iseq_t *iseq, LINK_ANCHOR *ret, enum rb_pa
return COMPILE_OK; return COMPILE_OK;
} }
/* Array or Hash */ /* Array or Hash that does not have keyword splat */
if (!lit) { if (!lit) {
if (nd_type(node) == NODE_LIST) { if (nd_type(node) == NODE_LIST) {
ADD_INSN1(anchor, node, newarray, INT2FIX(RNODE_LIST(node)->as.nd_alen)); ADD_INSN1(anchor, node, newarray, INT2FIX(RNODE_LIST(node)->as.nd_alen));

21
test/ruby/test_parse.rb
View File

@ -2,6 +2,7 @@
# frozen_string_literal: false # frozen_string_literal: false
require 'test/unit' require 'test/unit'
require 'stringio' require 'stringio'
require_relative '../lib/parser_support'
class TestParse < Test::Unit::TestCase class TestParse < Test::Unit::TestCase
def setup def setup
@ -1609,6 +1610,26 @@ x = __ENCODING__
assert_ractor_shareable(a[0]) assert_ractor_shareable(a[0])
end end
def test_shareable_constant_value_hash_with_keyword_splat
# Prism compiler does not support keyword splat in Ractor constant [Bug #20916]
omit if ParserSupport.prism_enabled?
a, b = eval_separately("#{<<~"begin;"}\n#{<<~'end;'}")
begin;
# shareable_constant_value: experimental_everything
# [Bug #20927]
x = { x: {} }
y = { y: {} }
A = { **x }
B = { x: {}, **y }
[A, B]
end;
assert_ractor_shareable(a)
assert_ractor_shareable(b)
assert_equal({ x: {}}, a)
assert_equal({ x: {}, y: {}}, b)
end
def test_shareable_constant_value_unshareable_literal def test_shareable_constant_value_unshareable_literal
assert_raise_separately(Ractor::IsolationError, /unshareable object to C/, assert_raise_separately(Ractor::IsolationError, /unshareable object to C/,
"#{<<~"begin;"}\n#{<<~'end;'}") "#{<<~"begin;"}\n#{<<~'end;'}")