Skip to content

Commit adc0365

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Tracing JIT: Remove incorrect assertion
2 parents 2157d11 + 5eb3e30 commit adc0365

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6476,7 +6476,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
64766476
|| p->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_CALL
64776477
|| p->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
64786478
if (p->stop != ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
6479-
ZEND_ASSERT(!parent_trace);
64806479
if ((t->flags & ZEND_JIT_TRACE_USES_INITIAL_IP)
64816480
&& !zend_jit_set_ip(&dasm_state, p->opline)) {
64826481
goto jit_failure;

0 commit comments

Comments
 (0)