Skip to content

Commit 30e3148

Browse files
authored
ZJIT: Fix land race (ruby#16686)
Just update some HIR tests.
1 parent 6d6f927 commit 30e3148

File tree

2 files changed

+38
-36
lines changed

2 files changed

+38
-36
lines changed

zjit/src/hir/opt_tests.rs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4872,30 +4872,31 @@ mod hir_opt_tests {
48724872
bb3(v9:BasicObject, v10:BasicObject):
48734873
v14:Fixnum[0] = Const Value(0)
48744874
v18:CPtr = GetEP 0
4875-
v19:CBool = IsBlockParamModified v18
4876-
IfTrue v19, bb4()
4877-
v24:CInt64 = LoadField v18, :_env_data_index_specval@0x1001
4878-
v25:CInt64[1] = Const CInt64(1)
4879-
v26:CInt64 = IntAnd v24, v25
4880-
v27:CBool = IsBitEqual v26, v25
4881-
IfTrue v27, bb7()
4882-
v31:CInt64[0] = Const CInt64(0)
4883-
v32:CBool = IsBitEqual v24, v31
4884-
IfTrue v32, bb8()
4875+
v19:CUInt64 = LoadField v18, :_ep_flags@0x1001
4876+
v20:CBool = IsBlockParamModified v19
4877+
IfTrue v20, bb4()
4878+
v25:CInt64 = LoadField v18, :_env_data_index_specval@0x1002
4879+
v26:CInt64[1] = Const CInt64(1)
4880+
v27:CInt64 = IntAnd v25, v26
4881+
v28:CBool = IsBitEqual v27, v26
4882+
IfTrue v28, bb7()
4883+
v32:CInt64[0] = Const CInt64(0)
4884+
v33:CBool = IsBitEqual v25, v32
4885+
IfTrue v33, bb8()
48854886
SideExit BlockParamProxyProfileNotCovered
48864887
bb4():
4887-
v22:BasicObject = LoadField v18, :block@0x1002
4888-
Jump bb6(v22, v22)
4888+
v23:BasicObject = LoadField v18, :block@0x1003
4889+
Jump bb6(v23, v23)
48894890
bb7():
4890-
v29:ObjectSubclass[BlockParamProxy] = Const Value(VALUE(0x1008))
4891-
Jump bb6(v29, v10)
4891+
v30:ObjectSubclass[BlockParamProxy] = Const Value(VALUE(0x1008))
4892+
Jump bb6(v30, v10)
48924893
bb8():
4893-
v34:NilClass = Const Value(nil)
4894-
Jump bb6(v34, v10)
4894+
v35:NilClass = Const Value(nil)
4895+
Jump bb6(v35, v10)
48954896
bb6(v16:BasicObject, v17:BasicObject):
4896-
v38:BasicObject = Send v14, &block, :then, v16 # SendFallbackReason: Complex argument passing
4897+
v39:BasicObject = Send v14, &block, :then, v16 # SendFallbackReason: Complex argument passing
48974898
CheckInterrupts
4898-
Return v38
4899+
Return v39
48994900
");
49004901
}
49014902

zjit/src/hir/tests.rs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3587,32 +3587,33 @@ pub(crate) mod hir_build_tests {
35873587
bb3(v9:BasicObject, v10:BasicObject):
35883588
v14:Fixnum[0] = Const Value(0)
35893589
v18:CPtr = GetEP 0
3590-
v19:CBool = IsBlockParamModified v18
3591-
IfTrue v19, bb4()
3590+
v19:CUInt64 = LoadField v18, :_ep_flags@0x1001
3591+
v20:CBool = IsBlockParamModified v19
3592+
IfTrue v20, bb4()
35923593
Jump bb5()
35933594
bb4():
3594-
v22:BasicObject = LoadField v18, :block@0x1001
3595-
Jump bb6(v22, v22)
3595+
v23:BasicObject = LoadField v18, :block@0x1002
3596+
Jump bb6(v23, v23)
35963597
bb5():
3597-
v24:CInt64 = LoadField v18, :_env_data_index_specval@0x1002
3598-
v25:CInt64[1] = Const CInt64(1)
3599-
v26:CInt64 = IntAnd v24, v25
3600-
v27:CBool = IsBitEqual v26, v25
3601-
IfTrue v27, bb7()
3602-
v31:CInt64[0] = Const CInt64(0)
3603-
v32:CBool = IsBitEqual v24, v31
3604-
IfTrue v32, bb8()
3598+
v25:CInt64 = LoadField v18, :_env_data_index_specval@0x1003
3599+
v26:CInt64[1] = Const CInt64(1)
3600+
v27:CInt64 = IntAnd v25, v26
3601+
v28:CBool = IsBitEqual v27, v26
3602+
IfTrue v28, bb7()
3603+
v32:CInt64[0] = Const CInt64(0)
3604+
v33:CBool = IsBitEqual v25, v32
3605+
IfTrue v33, bb8()
36053606
SideExit BlockParamProxyProfileNotCovered
36063607
bb7():
3607-
v29:ObjectSubclass[BlockParamProxy] = Const Value(VALUE(0x1008))
3608-
Jump bb6(v29, v10)
3608+
v30:ObjectSubclass[BlockParamProxy] = Const Value(VALUE(0x1008))
3609+
Jump bb6(v30, v10)
36093610
bb8():
3610-
v34:NilClass = Const Value(nil)
3611-
Jump bb6(v34, v10)
3611+
v35:NilClass = Const Value(nil)
3612+
Jump bb6(v35, v10)
36123613
bb6(v16:BasicObject, v17:BasicObject):
3613-
v38:BasicObject = Send v14, &block, :then, v16 # SendFallbackReason: Uncategorized(send)
3614+
v39:BasicObject = Send v14, &block, :then, v16 # SendFallbackReason: Uncategorized(send)
36143615
CheckInterrupts
3615-
Return v38
3616+
Return v39
36163617
");
36173618
}
36183619

0 commit comments

Comments
 (0)