Skip to content

Commit 60bcc3b

Browse files
committed
zend_jit_trace: Consolidate result type invalidation (Fixes #25480)
1 parent 418b9e1 commit 60bcc3b

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

‎ext/opcache/jit/zend_jit_trace.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6582,10 +6582,8 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
65826582
}
65836583
}
65846584
}
6585-
if (ssa->var_info[ssa_op->result_def].type & MAY_BE_INDIRECT) {
6586-
RESET_STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->result.var));
6587-
}
6588-
if (opline->opcode == ZEND_FETCH_OBJ_R
6585+
if ((ssa->var_info[ssa_op->result_def].type & MAY_BE_INDIRECT)
6586+
|| opline->opcode == ZEND_FETCH_OBJ_R
65896587
|| opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG
65906588
|| opline->opcode == ZEND_FETCH_OBJ_IS) {
65916589
RESET_STACK_MEM_TYPE(stack, EX_VAR_TO_NUM(opline->result.var));

0 commit comments

Comments
 (0)