@@ -319,19 +319,14 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
319
319
320
320
#if DEBUG_COMPACT_LITERALS
321
321
{
322
- int i , use_copy ;
323
322
fprintf (stderr , "File %s func %s\n" , op_array -> filename -> val ,
324
323
op_array -> function_name ? op_array -> function_name -> val : "main" );
325
324
fprintf (stderr , "Literals table size %d\n" , op_array -> last_literal );
326
325
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 );
335
330
}
336
331
fflush (stderr );
337
332
}
@@ -845,17 +840,12 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
845
840
846
841
#if DEBUG_COMPACT_LITERALS
847
842
{
848
- int i , use_copy ;
849
843
fprintf (stderr , "Optimized literals table size %d\n" , op_array -> last_literal );
850
844
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 );
859
849
}
860
850
fflush (stderr );
861
851
}
0 commit comments