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

[PRISM] Recurse use_deconstructed_cache in Alternation Nodes

Browse Source 
This fixes the behavioural difference between Prism and parse.y when
evaluating the following code

```ruby
1 in [1 | [1]]
```

Fixes [Bug #20956]
This commit is contained in:
Matt Valentine-House 2024-12-17 12:13:20 +00:00
parent c25dd4ee47
commit 86cf18e01e
Notes: git 2024-12-17 15:14:11 +00:00 
Merged: https://github.com/ruby/ruby/pull/12370
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prism_compile.c
View File

@ -2991,7 +2991,7 @@ pm_compile_pattern(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t
// First, we're going to attempt to match against the left pattern. If // First, we're going to attempt to match against the left pattern. If
// that pattern matches, then we'll skip matching the right pattern. // that pattern matches, then we'll skip matching the right pattern.
PUSH_INSN(ret, location, dup); PUSH_INSN(ret, location, dup);
CHECK(pm_compile_pattern(iseq, scope_node, cast->left, ret, matched_left_label, unmatched_left_label, in_single_pattern, true, true, base_index + 1)); CHECK(pm_compile_pattern(iseq, scope_node, cast->left, ret, matched_left_label, unmatched_left_label, in_single_pattern, true, use_deconstructed_cache, base_index + 1));
// If we get here, then we matched on the left pattern. In this case we // If we get here, then we matched on the left pattern. In this case we
// should pop out the duplicate value that we preemptively added to // should pop out the duplicate value that we preemptively added to
@ -3004,7 +3004,7 @@ pm_compile_pattern(rb_iseq_t *iseq, pm_scope_node_t *scope_node, const pm_node_t
// If we get here, then we didn't match on the left pattern. In this // If we get here, then we didn't match on the left pattern. In this
// case we attempt to match against the right pattern. // case we attempt to match against the right pattern.
PUSH_LABEL(ret, unmatched_left_label); PUSH_LABEL(ret, unmatched_left_label);
CHECK(pm_compile_pattern(iseq, scope_node, cast->right, ret, matched_label, unmatched_label, in_single_pattern, true, true, base_index)); CHECK(pm_compile_pattern(iseq, scope_node, cast->right, ret, matched_label, unmatched_label, in_single_pattern, true, use_deconstructed_cache, base_index));
break; break;
} }
case PM_PARENTHESES_NODE: case PM_PARENTHESES_NODE:

3
test/ruby/test_compile_prism.rb
View File

@ -2485,6 +2485,9 @@ end
assert_prism_eval("5 in foo") assert_prism_eval("5 in foo")
assert_prism_eval("1 in 2") assert_prism_eval("1 in 2")
# Bug: https://bugs.ruby-lang.org/issues/20956
assert_prism_eval("1 in [1 | [1]]")
end end
def test_MatchRequiredNode def test_MatchRequiredNode