diff --git a/Zend/Optimizer/compact_literals.c b/Zend/Optimizer/compact_literals.c index 74dcfbb9973..bda09ded025 100644 --- a/Zend/Optimizer/compact_literals.c +++ b/Zend/Optimizer/compact_literals.c @@ -319,19 +319,14 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx #if DEBUG_COMPACT_LITERALS { - int i, use_copy; fprintf(stderr, "File %s func %s\n", op_array->filename->val, op_array->function_name ? op_array->function_name->val : "main"); fprintf(stderr, "Literals table size %d\n", op_array->last_literal); - for (i = 0; i < op_array->last_literal; i++) { - zval zv; - ZVAL_COPY_VALUE(&zv, op_array->literals + i); - use_copy = zend_make_printable_zval(op_array->literals + i, &zv); - fprintf(stderr, "Literal %d, val (%zu):%s\n", i, Z_STRLEN(zv), Z_STRVAL(zv)); - if (use_copy) { - zval_ptr_dtor_nogc(&zv); - } + for (int i = 0; i < op_array->last_literal; i++) { + zend_string *str = zval_get_string(op_array->literals + i); + fprintf(stderr, "Literal %d, val (%zu):%s\n", i, ZSTR_LEN(str), ZSTR_VAL(str)); + zend_string_release(str); } fflush(stderr); } @@ -845,17 +840,12 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx #if DEBUG_COMPACT_LITERALS { - int i, use_copy; fprintf(stderr, "Optimized literals table size %d\n", op_array->last_literal); - for (i = 0; i < op_array->last_literal; i++) { - zval zv; - ZVAL_COPY_VALUE(&zv, op_array->literals + i); - use_copy = zend_make_printable_zval(op_array->literals + i, &zv); - fprintf(stderr, "Literal %d, val (%zu):%s\n", i, Z_STRLEN(zv), Z_STRVAL(zv)); - if (use_copy) { - zval_ptr_dtor_nogc(&zv); - } + for (int i = 0; i < op_array->last_literal; i++) { + zend_string *str = zval_get_string(op_array->literals + i); + fprintf(stderr, "Literal %d, val (%zu):%s\n", i, ZSTR_LEN(str), ZSTR_VAL(str)); + zend_string_release(str); } fflush(stderr); }