archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ZJIT: Don't eliminate NewHash with operands

Browse source 
Hashing and checking operands for equality is re-entrant. We could later
optimize this to check for hash/eq methods on operands and eliminate if
they don't have side effects, but this is fine for now.
This commit is contained in:
Max Bernstein 2025-08-13 12:18:59 -04:00
parent 2083fa89fc
commit 943d9f828d
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zjit/src/hir.rs
View file

@ -604,7 +604,9 @@ impl Insn {
Insn::Param { .. } => false, Insn::Param { .. } => false,
Insn::StringCopy { .. } => false, Insn::StringCopy { .. } => false,
Insn::NewArray { .. } => false, Insn::NewArray { .. } => false,
Insn::NewHash { .. } => false, // NewHash's operands may be hashed and compared for equality, which could have
// side-effects.
Insn::NewHash { elements, .. } => elements.len() > 0,
Insn::NewRange { .. } => false, Insn::NewRange { .. } => false,
Insn::ArrayDup { .. } => false, Insn::ArrayDup { .. } => false,
Insn::HashDup { .. } => false, Insn::HashDup { .. } => false,
@ -6089,7 +6091,7 @@ mod opt_tests {
} }
#[test] #[test]
fn test_eliminate_new_hash_with_elements() { fn test_no_eliminate_new_hash_with_elements() {
eval(" eval("
def test(aval, bval) def test(aval, bval)
c = {a: aval, b: bval} c = {a: aval, b: bval}
@ -6099,6 +6101,10 @@ mod opt_tests {
assert_optimized_method_hir("test", expect![[r#" assert_optimized_method_hir("test", expect![[r#"
fn test@<compiled>:3: fn test@<compiled>:3:
bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject): bb0(v0:BasicObject, v1:BasicObject, v2:BasicObject):
v3:NilClass = Const Value(nil)
v5:StaticSymbol[:a] = Const Value(VALUE(0x1000))
v6:StaticSymbol[:b] = Const Value(VALUE(0x1008))
v8:HashExact = NewHash v5: v1, v6: v2
v9:Fixnum[5] = Const Value(5) v9:Fixnum[5] = Const Value(5)
Return v9 Return v9
"#]]); "#]]);