Skip to content

Commit 645ff9c

Browse files
committed
Revert "Fixed tracing JIT for CALL VM"
This reverts commit 7f3a296.
1 parent 1764964 commit 645ff9c

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,11 +2433,7 @@ static int zend_jit_trace_exit_stub(dasm_State **Dst)
24332433
}
24342434

24352435
|1:
2436-
if (zend_jit_vm_kind == ZEND_VM_KIND_HYBRID) {
2437-
| jl ->trace_halt
2438-
} else {
2439-
| jl >2
2440-
}
2436+
| jl ->trace_halt
24412437

24422438
| // execute_data = EG(current_execute_data)
24432439
| MEM_OP2_2_ZTS mov, FP, aword, executor_globals, current_execute_data, r0
@@ -2460,9 +2456,6 @@ static int zend_jit_trace_exit_stub(dasm_State **Dst)
24602456
| mov r0, aword [r0 + offsetof(zend_op_array, reserved[zend_func_info_rid])]
24612457
| mov r0, aword [r0 + offsetof(zend_jit_op_array_trace_extension, offset)]
24622458
| jmp aword [IP + r0]
2463-
|2:
2464-
| add r4, SPAD // stack alignment
2465-
| ret
24662459
} else {
24672460
| mov IP, aword EX->opline
24682461
| mov FCARG1a, FP
@@ -2475,9 +2468,6 @@ static int zend_jit_trace_exit_stub(dasm_State **Dst)
24752468
| add r4, NR_SPAD // stack alignment
24762469
| mov r0, 1 // ZEND_VM_ENTER
24772470
| ret
2478-
|2:
2479-
| add r4, NR_SPAD // stack alignment
2480-
| ret
24812471
}
24822472

24832473
return 1;

0 commit comments

Comments
 (0)