@@ -301,13 +301,14 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
301301#if DEBUG_COMPACT_LITERALS
302302 {
303303 int i , use_copy ;
304- fprintf (stderr , "File %s func %s\n" , op_array -> filename ,
305- op_array -> function_name ? op_array -> function_name : "main" );
304+ fprintf (stderr , "File %s func %s\n" , op_array -> filename -> val ,
305+ op_array -> function_name ? op_array -> function_name -> val : "main" );
306306 fprintf (stderr , "Literlas table size %d\n" , op_array -> last_literal );
307307
308308 for (i = 0 ; i < op_array -> last_literal ; i ++ ) {
309- zval zv = op_array -> literals [i ].constant ;
310- use_copy = zend_make_printable_zval (& op_array -> literals [i ].constant , & zv );
309+ zval zv ;
310+ ZVAL_COPY_VALUE (& zv , op_array -> literals + i );
311+ use_copy = zend_make_printable_zval (op_array -> literals + i , & zv );
311312 fprintf (stderr , "Literal %d, val (%d):%s\n" , i , Z_STRLEN (zv ), Z_STRVAL (zv ));
312313 if (use_copy ) {
313314 zval_dtor (& zv );
@@ -487,8 +488,9 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
487488 fprintf (stderr , "Optimized literlas table size %d\n" , op_array -> last_literal );
488489
489490 for (i = 0 ; i < op_array -> last_literal ; i ++ ) {
490- zval zv = op_array -> literals [i ].constant ;
491- use_copy = zend_make_printable_zval (& op_array -> literals [i ].constant , & zv );
491+ zval zv ;
492+ ZVAL_COPY_VALUE (& zv , op_array -> literals + i );
493+ use_copy = zend_make_printable_zval (op_array -> literals + i , & zv );
492494 fprintf (stderr , "Literal %d, val (%d):%s\n" , i , Z_STRLEN (zv ), Z_STRVAL (zv ));
493495 if (use_copy ) {
494496 zval_dtor (& zv );
0 commit comments