Skip to content

Commit a1cd010

Browse files
committed
Fix mistakes introduced in 886dd7c
1 parent 1f6770a commit a1cd010

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3937,7 +3937,7 @@ static int zend_jit_find_ssa_var(const zend_op_array *op_array,
39373937
zend_worklist_push(&worklist, b);
39383938
}
39393939
}
3940-
return -1;
3940+
ssa_var = -1;
39413941

39423942
found:
39433943
ZEND_WORKLIST_FREE_ALLOCA(&worklist, use_heap);
@@ -6974,9 +6974,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
69746974
|| p->stop == ZEND_JIT_TRACE_STOP_INTERPRETER) {
69756975
if (ra
69766976
&& (p-1)->op != ZEND_JIT_TRACE_ENTER
6977+
&& (p-1)->op != ZEND_JIT_TRACE_BACK
69776978
&& opline->opcode != ZEND_DO_UCALL
69786979
&& opline->opcode != ZEND_DO_FCALL
6979-
&& opline->opcode != ZEND_DO_FCALL_BY_NAME) {
6980+
&& opline->opcode != ZEND_DO_FCALL_BY_NAME
6981+
&& opline->opcode != ZEND_INCLUDE_OR_EVAL) {
69806982
for (i = 0; i < op_array->last_var + op_array->T; i++) {
69816983
int32_t ref = STACK_REF(stack, i);
69826984
uint8_t type = STACK_TYPE(stack, i);

0 commit comments

Comments
 (0)