Skip to content

Commit c207efa

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Tracing: Prevent recording types of variables used to pass zend_class_entry
2 parents 50bd8ba + 7ff71a0 commit c207efa

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

ext/opcache/jit/zend_jit_vm_helpers.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,20 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
654654
if (opline->op2_type & (IS_TMP_VAR|IS_VAR|IS_CV)
655655
&& opline->opcode != ZEND_INSTANCEOF
656656
&& opline->opcode != ZEND_UNSET_STATIC_PROP
657+
&& opline->opcode != ZEND_ISSET_ISEMPTY_STATIC_PROP
658+
&& opline->opcode != ZEND_ASSIGN_STATIC_PROP
659+
&& opline->opcode != ZEND_ASSIGN_STATIC_PROP_REF
660+
&& opline->opcode != ZEND_ASSIGN_STATIC_PROP_OP
661+
&& opline->opcode != ZEND_PRE_INC_STATIC_PROP
662+
&& opline->opcode != ZEND_POST_INC_STATIC_PROP
663+
&& opline->opcode != ZEND_PRE_DEC_STATIC_PROP
664+
&& opline->opcode != ZEND_POST_DEC_STATIC_PROP
665+
&& opline->opcode != ZEND_FETCH_STATIC_PROP_R
666+
&& opline->opcode != ZEND_FETCH_STATIC_PROP_W
667+
&& opline->opcode != ZEND_FETCH_STATIC_PROP_RW
668+
&& opline->opcode != ZEND_FETCH_STATIC_PROP_IS
669+
&& opline->opcode != ZEND_FETCH_STATIC_PROP_FUNC_ARG
670+
&& opline->opcode != ZEND_FETCH_STATIC_PROP_UNSET
657671
&& (opline->op2_type == IS_CV
658672
|| (opline->opcode != ZEND_FE_FETCH_R
659673
&& opline->opcode != ZEND_FE_FETCH_RW))) {

0 commit comments

Comments
 (0)