Skip to content

Commit ff2fbd0

Browse files
committed
Remove zend_make_printable_zval() use in debug code
This is an awkward API left from the PHP 5 times. Replacing it with zval_get_string().
1 parent d7eea8e commit ff2fbd0

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

Zend/Optimizer/compact_literals.c

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -319,19 +319,14 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
319319

320320
#if DEBUG_COMPACT_LITERALS
321321
{
322-
int i, use_copy;
323322
fprintf(stderr, "File %s func %s\n", op_array->filename->val,
324323
op_array->function_name ? op_array->function_name->val : "main");
325324
fprintf(stderr, "Literals table size %d\n", op_array->last_literal);
326325

327-
for (i = 0; i < op_array->last_literal; i++) {
328-
zval zv;
329-
ZVAL_COPY_VALUE(&zv, op_array->literals + i);
330-
use_copy = zend_make_printable_zval(op_array->literals + i, &zv);
331-
fprintf(stderr, "Literal %d, val (%zu):%s\n", i, Z_STRLEN(zv), Z_STRVAL(zv));
332-
if (use_copy) {
333-
zval_ptr_dtor_nogc(&zv);
334-
}
326+
for (int i = 0; i < op_array->last_literal; i++) {
327+
zend_string *str = zval_get_string(op_array->literals + i);
328+
fprintf(stderr, "Literal %d, val (%zu):%s\n", i, ZSTR_LEN(str), ZSTR_VAL(str));
329+
zend_string_release(str);
335330
}
336331
fflush(stderr);
337332
}
@@ -845,17 +840,12 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
845840

846841
#if DEBUG_COMPACT_LITERALS
847842
{
848-
int i, use_copy;
849843
fprintf(stderr, "Optimized literals table size %d\n", op_array->last_literal);
850844

851-
for (i = 0; i < op_array->last_literal; i++) {
852-
zval zv;
853-
ZVAL_COPY_VALUE(&zv, op_array->literals + i);
854-
use_copy = zend_make_printable_zval(op_array->literals + i, &zv);
855-
fprintf(stderr, "Literal %d, val (%zu):%s\n", i, Z_STRLEN(zv), Z_STRVAL(zv));
856-
if (use_copy) {
857-
zval_ptr_dtor_nogc(&zv);
858-
}
845+
for (int i = 0; i < op_array->last_literal; i++) {
846+
zend_string *str = zval_get_string(op_array->literals + i);
847+
fprintf(stderr, "Literal %d, val (%zu):%s\n", i, ZSTR_LEN(str), ZSTR_VAL(str));
848+
zend_string_release(str);
859849
}
860850
fflush(stderr);
861851
}

0 commit comments

Comments
 (0)