archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove zend_make_printable_zval() use in debug code

Browse source 
This is an awkward API left from the PHP 5 times. Replacing it
with zval_get_string().
This commit is contained in:
Nikita Popov 2021-06-09 10:18:09 +02:00
parent d7eea8e1be
commit ff2fbd0ecb
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Zend/Optimizer/compact_literals.c
View file

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