Fix zjit hir tests

Author: eightbitraptor

zjit/src/hir/opt_tests.rs

@@ -7791,22 +7791,23 @@ mod hir_opt_tests {
           v26:CInt64 = IntAnd v12, v23
           v27:CBool = IsBitEqual v26, v25
           IfTrue v27, bb6()
-          v31:BasicObject = GetIvar v11, :@foo
-          Jump bb4(v31)
+          v32:BasicObject = GetIvar v11, :@foo
+          Jump bb4(v32)
         bb5():
           v20:CPtr = LoadField v11, :_as_heap@0x1003
           v21:BasicObject = LoadField v20, :@foo@0x1004
           Jump bb4(v21)
         bb6():
-          v29:BasicObject = LoadField v11, :@foo@0x1003
-          Jump bb4(v29)
+          v29:CPtr = LoadField v11, :_as_heap@0x1003
+          v30:BasicObject = LoadField v29, :@foo@0x1000
+          Jump bb4(v30)
         bb4(v13:BasicObject):
-          v34:Fixnum[1] = Const Value(1)
+          v35:Fixnum[1] = Const Value(1)
           PatchPoint MethodRedefined(Integer@0x1008, +@0x1010, cme:0x1018)
-          v45:Fixnum = GuardType v13, Fixnum
-          v46:Fixnum = FixnumAdd v45, v34
+          v46:Fixnum = GuardType v13, Fixnum
+          v47:Fixnum = FixnumAdd v46, v35
           CheckInterrupts
-          Return v46
+          Return v47
         ");
     }
 
@@ -7861,30 +7862,32 @@ mod hir_opt_tests {
           v17:CInt64 = IntAnd v12, v14
           v18:CBool = IsBitEqual v17, v16
           IfTrue v18, bb5()
-          v22:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
-          v23:CPtr[CPtr(0x1002)] = Const CPtr(0x1002)
-          v24 = RefineType v23, CUInt64
-          v25:CInt64 = IntAnd v12, v22
-          v26:CBool = IsBitEqual v25, v24
-          IfTrue v26, bb6()
-          v44:CShape = LoadField v11, :_shape_id@0x1003
-          v45:CShape[0x1004] = GuardBitEquals v44, CShape(0x1004)
-          v46:BasicObject = LoadField v11, :@foo@0x1005
-          Jump bb4(v46)
+          v23:CUInt64[0xffffffff0000001f] = Const CUInt64(0xffffffff0000001f)
+          v24:CPtr[CPtr(0x1002)] = Const CPtr(0x1002)
+          v25 = RefineType v24, CUInt64
+          v26:CInt64 = IntAnd v12, v23
+          v27:CBool = IsBitEqual v26, v25
+          IfTrue v27, bb6()
+          v45:CShape = LoadField v11, :_shape_id@0x1003
+          v46:CShape[0x1004] = GuardBitEquals v45, CShape(0x1004)
+          v47:CPtr = LoadField v11, :_as_heap@0x1005
+          v48:BasicObject = LoadField v47, :@foo@0x1000
+          Jump bb4(v48)
         bb5():
-          v20:BasicObject = LoadField v11, :@foo@0x1005
-          Jump bb4(v20)
+          v20:CPtr = LoadField v11, :_as_heap@0x1005
+          v21:BasicObject = LoadField v20, :@foo@0x1000
+          Jump bb4(v21)
         bb6():
-          v28:CPtr = LoadField v11, :_as_heap@0x1005
-          v29:BasicObject = LoadField v28, :@foo@0x1006
-          Jump bb4(v29)
+          v29:CPtr = LoadField v11, :_as_heap@0x1005
+          v30:BasicObject = LoadField v29, :@foo@0x1006
+          Jump bb4(v30)
         bb4(v13:BasicObject):
-          v34:Fixnum[1] = Const Value(1)
+          v35:Fixnum[1] = Const Value(1)
           PatchPoint MethodRedefined(Integer@0x1008, +@0x1010, cme:0x1018)
-          v49:Fixnum = GuardType v13, Fixnum
-          v50:Fixnum = FixnumAdd v49, v34
+          v51:Fixnum = GuardType v13, Fixnum
+          v52:Fixnum = FixnumAdd v51, v35
           CheckInterrupts
-          Return v50
+          Return v52
         ");
     }