Fixed support for possible indirect variable modification (ext/standard/tests/array...

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 0d2e187f0d22a33c2192bb873e773c2eba54cda4..d86e1d10b9f5aecc6a3c36e6883f9d6ee1cba4b6 100644 (file)
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -4585,6 +4585,10 @@ done:
                        if (p->func) {
                                if (p->func->type == ZEND_USER_FUNCTION) {
                                        if (JIT_G(opt_level) >= ZEND_JIT_LEVEL_INLINE) {
+                                               zend_jit_op_array_trace_extension *jit_extension =
+                                                       (zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(p->op_array);
+                                               zend_ssa *op_array_ssa = &jit_extension->func_info.ssa;
+
                                                i = 0;
                                                while (i < p->op_array->num_args) {
                                                        /* Types of arguments are going to be stored in abstract stack when processing SEV instruction */
@@ -4592,7 +4596,11 @@ done:
                                                        i++;
                                                }
                                                while (i < p->op_array->last_var) {
-                                                       SET_STACK_TYPE(call->stack, i, IS_UNDEF);
+                                                       if (zend_jit_var_may_be_modified_indirectly(p->op_array, op_array_ssa, i)) {
+                                                               SET_STACK_TYPE(call->stack, i, IS_UNKNOWN);
+                                                       } else {
+                                                               SET_STACK_TYPE(call->stack, i, IS_UNDEF);
+                                                       }
                                                        i++;
                                                }
                                                while (i < p->op_array->last_var + p->op_array->T) {