]> granicus.if.org Git - php/commitdiff
Removed already implemented TODO comment
authorDmitry Stogov <dmitry@zend.com>
Fri, 3 Jul 2020 10:40:11 +0000 (13:40 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 3 Jul 2020 10:40:11 +0000 (13:40 +0300)
ext/opcache/jit/zend_jit_trace.c

index 04f3a1b79353a6f6eac6315ae0b0265b05a18fa3..e207aa35d13fc7b12611f52d97331a2648150794 100644 (file)
@@ -3591,6 +3591,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
                                                                goto jit_failure;
                                                    }
                                                        for (j = 0 ; j < op_array->last_var; j++) {
+                                                               uint32_t info;
+                                                               zend_uchar type;
+
                                                                if (opline->op1_type == IS_CV
                                                                 && EX_VAR_TO_NUM(opline->op1.var) == j
                                                                 && !(op1_info & MAY_BE_REF)
@@ -3598,10 +3601,8 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
                                                                 && TRACE_FRAME_IS_RETURN_VALUE_USED(JIT_G(current_frame))) {
                                                                        continue;
                                                                }
-                                                               // TODO: get info from trace ???
-                                                               uint32_t info = zend_ssa_cv_info(opline, op_array, op_array_ssa, j);
-                                                               zend_uchar type = STACK_TYPE(stack, j);
-
+                                                               info = zend_ssa_cv_info(opline, op_array, op_array_ssa, j);
+                                                               type = STACK_TYPE(stack, j);
                                                                info = zend_jit_trace_type_to_info_ex(type, info);
                                                                if (info & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF)) {
                                                                        if (!zend_jit_free_cv(&dasm_state, opline, op_array, info, j)) {