Skip to content

Commit

Permalink
Fixed not to make non-literal expression shareable [Feature #17273]
Browse files Browse the repository at this point in the history
Non-literal expression which is not a part of a literal expression
is not a subject of `shareable_literal_value: literal`.
  • Loading branch information
nobu committed Dec 18, 2020
1 parent 6945597 commit 19a98a8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
18 changes: 10 additions & 8 deletions parse.y
Expand Up @@ -11033,8 +11033,11 @@ shareable_literal_value(NODE *node)
VALUE rb_ractor_make_shareable(VALUE obj);

static NODE *
shareable_literal_constant(struct parser_params *p, NODE *value, enum shareability shareable, const YYLTYPE *loc)
shareable_literal_constant(struct parser_params *p, enum shareability shareable,
NODE *value, const YYLTYPE *loc, size_t level)
{
# define shareable_literal_constant_next(n) \
shareable_literal_constant(p, shareable, (n), &(n)->nd_loc, level+1)
VALUE lit;

if (!value) return 0;
Expand Down Expand Up @@ -11062,12 +11065,11 @@ shareable_literal_constant(struct parser_params *p, NODE *value, enum shareabili
lit = rb_ary_new();
for (NODE *n = value; n; n = n->nd_next) {
NODE *elt = n->nd_head;
if (elt && !(elt = shareable_literal_constant(p, elt, shareable, &elt->nd_loc))) {
if (elt && !(elt = shareable_literal_constant_next(elt))) {
if (lit) {
rb_ary_clear(lit);
lit = Qfalse;
}
continue;
}
if (lit) {
VALUE e = shareable_literal_value(elt);
Expand All @@ -11091,13 +11093,12 @@ shareable_literal_constant(struct parser_params *p, NODE *value, enum shareabili
for (NODE *n = value->nd_head; n; n = n->nd_next->nd_next) {
NODE *key = n->nd_head;
NODE *val = n->nd_next->nd_head;
if ((key && !(key = shareable_literal_constant(p, key, shareable, &key->nd_loc))) ||
(val && !(val = shareable_literal_constant(p, val, shareable, &val->nd_loc)))) {
if ((key && !(key = shareable_literal_constant_next(key))) ||
(val && !(val = shareable_literal_constant_next(val)))) {
if (lit) {
rb_hash_clear(lit);
lit = Qfalse;
}
continue;
}
if (lit) {
VALUE k = shareable_literal_value(key);
Expand All @@ -11117,11 +11118,12 @@ shareable_literal_constant(struct parser_params *p, NODE *value, enum shareabili
break;

default:
if (shareable == shareable_literal)
if (shareable == shareable_literal && level > 0)
yyerror1(loc, "unshareable expression");
return 0;
}
return value;
# undef shareable_literal_constant_next
}

static NODE *
Expand All @@ -11135,7 +11137,7 @@ shareable_constant_value(struct parser_params *p, NODE *value, enum shareability
case shareable_literal:
case shareable_everything:
{
NODE *lit = shareable_literal_constant(p, value, shareable, loc);
NODE *lit = shareable_literal_constant(p, shareable, value, loc, 0);
if (lit) return lit;
}
break;
Expand Down
1 change: 1 addition & 0 deletions test/ruby/test_parse.rb
Expand Up @@ -1189,6 +1189,7 @@ def test_shareable_constant_value
B = [[2]]
# shareable_constant_value: literal
C = [["shareable", "constant#{nil}"]]
D = A
[A, B, C]
end;
Expand Down

0 comments on commit 19a98a8

Please sign in to comment.