@@ -398,13 +398,13 @@ static bool variable_defined_or_used_in_range(zend_ssa *ssa, int var, int start,
398398 return false;
399399}
400400
401- int zend_dfa_optimize_calls (zend_op_array * op_array , zend_ssa * ssa )
401+ static uint32_t zend_dfa_optimize_calls (zend_op_array * op_array , zend_ssa * ssa )
402402{
403- zend_func_info * func_info = ZEND_FUNC_INFO (op_array );
404- int removed_ops = 0 ;
403+ const zend_func_info * func_info = ZEND_FUNC_INFO (op_array );
404+ uint32_t removed_ops = 0 ;
405405
406406 if (func_info -> callee_info ) {
407- zend_call_info * call_info = func_info -> callee_info ;
407+ const zend_call_info * call_info = func_info -> callee_info ;
408408
409409 do {
410410 zend_op * op = call_info -> caller_init_opline ;
@@ -413,7 +413,6 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
413413 || (op -> opcode == ZEND_FRAMELESS_ICALL_3 && (op + 1 )-> op1_type == IS_CONST ))
414414 && call_info -> callee_func
415415 && zend_string_equals_literal_ci (call_info -> callee_func -> common .function_name , "in_array" )) {
416-
417416 bool strict = false;
418417 bool has_opdata = op -> opcode == ZEND_FRAMELESS_ICALL_3 ;
419418 ZEND_ASSERT (!call_info -> is_prototype );
@@ -428,7 +427,7 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
428427 && Z_TYPE_P (CT_CONSTANT_EX (op_array , op -> op2 .constant )) == IS_ARRAY ) {
429428 bool ok = true;
430429
431- HashTable * src = Z_ARRVAL_P (CT_CONSTANT_EX (op_array , op -> op2 .constant ));
430+ const HashTable * src = Z_ARRVAL_P (CT_CONSTANT_EX (op_array , op -> op2 .constant ));
432431 HashTable * dst ;
433432 zval * val , tmp ;
434433 zend_ulong idx ;
0 commit comments