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

Fix empty hash instruction

Browse Source 
When we have an empty hash the iseq should have a `newhash` but instead
had a `duphash`. To fix, check if the node's elements are equal to `0`.
If so we want a `newhash`, otherwise use the original `duphash`
instructions.

Before:

```
== disasm: #<ISeq:<main>@test2.rb:1 (1,0)-(1,2)>
0000 duphash                                {}                        (   1)[Li]
0002 leave
```

After:

```
== disasm: #<ISeq:<main>@test2.rb:1 (1,0)-(1,2)>
0000 newhash                                0                         (   1)[Li]
0002 leave
```

Fixes the test `TestYJIT#test_compile_newhash`. Related to ruby/prism#2935
This commit is contained in:
eileencodes 2024-07-17 13:26:02 -04:00 committed by Kevin Newton
parent c304bf13b5
commit aa3030ac24
Notes: git 2024-07-18 14:12:37 +00:00 
Merged: https://github.com/ruby/ruby/pull/11190
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
prism_compile.c
View File

@ -7164,9 +7164,16 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
// is popped, then we know we don't need to do anything since it's
// statically known.
if (!popped) {
VALUE value = pm_static_literal_value(iseq, node, scope_node);
PUSH_INSN1(ret, location, duphash, value);
RB_OBJ_WRITTEN(iseq, Qundef, value);
const pm_hash_node_t *cast = (const pm_hash_node_t *) node;
if (cast->elements.size == 0) {
PUSH_INSN1(ret, location, newhash, INT2FIX(0));
}
else {
VALUE value = pm_static_literal_value(iseq, node, scope_node);
PUSH_INSN1(ret, location, duphash, value);
RB_OBJ_WRITTEN(iseq, Qundef, value);
}
}
}
else {