From 2ecc597259ffd564f4e644b540cd9ad0e548c35a Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 3 Jul 2020 13:40:11 +0300 Subject: [PATCH] Removed already implemented TODO comment --- ext/opcache/jit/zend_jit_trace.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index 04f3a1b793..e207aa35d1 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -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)) { -- 2.50.1