Commit 3079a72
committed
JIT: Resolve escape_if_undef orig_handler via jit->current_op_array
zend_jit_escape_if_undef received an op_array pointer captured at
parent-trace compile time. That pointer can go stale by the time a
side trace compiles for the exit. Drop the parameter and read
jit->current_op_array instead; zend_jit_trace_start sets it for
trace compilation, and zend_jit_trace_exit_to_vm now seeds it from
exit_info->op_array so the deoptimizer path has it too.
Closes GH-217101 parent 05afc37 commit 3079a72
2 files changed
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8068 | 8068 | | |
8069 | 8069 | | |
8070 | 8070 | | |
8071 | | - | |
| 8071 | + | |
8072 | 8072 | | |
8073 | 8073 | | |
8074 | 8074 | | |
| |||
8094 | 8094 | | |
8095 | 8095 | | |
8096 | 8096 | | |
8097 | | - | |
| 8097 | + | |
8098 | 8098 | | |
8099 | 8099 | | |
8100 | 8100 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3606 | 3606 | | |
3607 | 3607 | | |
3608 | 3608 | | |
3609 | | - | |
| 3609 | + | |
3610 | 3610 | | |
3611 | 3611 | | |
3612 | 3612 | | |
| |||
7377 | 7377 | | |
7378 | 7378 | | |
7379 | 7379 | | |
| 7380 | + | |
| 7381 | + | |
7380 | 7382 | | |
7381 | 7383 | | |
7382 | 7384 | | |
| |||
0 commit comments