Skip to content

Commit 5eb3e30

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Tracing JIT: Remove incorrect assertion
2 parents c9762be + 4304542 commit 5eb3e30

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
@@ -6478,7 +6478,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
64786478
|| p->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_CALL
64796479
|| p->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
64806480
if (p->stop != ZEND_JIT_TRACE_STOP_RECURSIVE_RET) {
6481-
ZEND_ASSERT(!parent_trace);
64826481
if ((t->flags & ZEND_JIT_TRACE_USES_INITIAL_IP)
64836482
&& !zend_jit_set_ip(&dasm_state, p->opline)) {
64846483
goto jit_failure;

0 commit comments

Comments
 (0)