Skip to content

Commit 37248c5

Browse files
committed
ZJIT: Fix rebase issue with tests
1 parent 40bb476 commit 37248c5

File tree

1 file changed

+26
-10
lines changed

1 file changed

+26
-10
lines changed

zjit/src/hir.rs

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12165,13 +12165,21 @@ mod opt_tests {
1216512165
");
1216612166
assert_snapshot!(hir_string("test"), @r"
1216712167
fn test@<compiled>:6:
12168-
bb0(v0:BasicObject, v1:BasicObject):
12169-
v6:Fixnum[5] = Const Value(5)
12168+
bb0():
12169+
EntryPoint interpreter
12170+
v1:BasicObject = LoadSelf
12171+
v2:BasicObject = GetLocal l0, SP@4
12172+
Jump bb2(v1, v2)
12173+
bb1(v5:BasicObject, v6:BasicObject):
12174+
EntryPoint JIT(0)
12175+
Jump bb2(v5, v6)
12176+
bb2(v8:BasicObject, v9:BasicObject):
12177+
v14:Fixnum[5] = Const Value(5)
1217012178
PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010)
12171-
v15:HeapObject[class_exact:C] = GuardType v1, HeapObject[class_exact:C]
12172-
SetIvar v15, :@foo, v6
12179+
v23:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C]
12180+
SetIvar v23, :@foo, v14
1217312181
CheckInterrupts
12174-
Return v6
12182+
Return v14
1217512183
");
1217612184
}
1217712185

@@ -12188,13 +12196,21 @@ mod opt_tests {
1218812196
");
1218912197
assert_snapshot!(hir_string("test"), @r"
1219012198
fn test@<compiled>:6:
12191-
bb0(v0:BasicObject, v1:BasicObject):
12192-
v6:Fixnum[5] = Const Value(5)
12199+
bb0():
12200+
EntryPoint interpreter
12201+
v1:BasicObject = LoadSelf
12202+
v2:BasicObject = GetLocal l0, SP@4
12203+
Jump bb2(v1, v2)
12204+
bb1(v5:BasicObject, v6:BasicObject):
12205+
EntryPoint JIT(0)
12206+
Jump bb2(v5, v6)
12207+
bb2(v8:BasicObject, v9:BasicObject):
12208+
v14:Fixnum[5] = Const Value(5)
1219312209
PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010)
12194-
v15:HeapObject[class_exact:C] = GuardType v1, HeapObject[class_exact:C]
12195-
SetIvar v15, :@foo, v6
12210+
v23:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C]
12211+
SetIvar v23, :@foo, v14
1219612212
CheckInterrupts
12197-
Return v6
12213+
Return v14
1219812214
");
1219912215
}
1220012216
}

0 commit comments

Comments
 (0)