@@ -1046,13 +1046,8 @@ ZEND_API void function_add_ref(zend_function *function) /* {{{ */
1046
1046
(* op_array -> refcount )++ ;
1047
1047
}
1048
1048
1049
- if (CG (compiler_options ) & ZEND_COMPILE_PRELOAD ) {
1050
- ZEND_ASSERT (op_array -> fn_flags & ZEND_ACC_PRELOADED );
1051
- ZEND_MAP_PTR_NEW (op_array -> run_time_cache );
1052
- } else {
1053
- ZEND_MAP_PTR_INIT (op_array -> run_time_cache , zend_arena_alloc (& CG (arena ), sizeof (void * )));
1054
- ZEND_MAP_PTR_SET (op_array -> run_time_cache , NULL );
1055
- }
1049
+ ZEND_MAP_PTR_INIT (op_array -> run_time_cache , zend_arena_alloc (& CG (arena ), sizeof (void * )));
1050
+ ZEND_MAP_PTR_SET (op_array -> run_time_cache , NULL );
1056
1051
1057
1052
zend_init_static_variables_map_ptr (op_array );
1058
1053
}
@@ -7024,12 +7019,11 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, bool toplevel) /* {{{
7024
7019
7025
7020
if (CG (compiler_options ) & ZEND_COMPILE_PRELOAD ) {
7026
7021
op_array -> fn_flags |= ZEND_ACC_PRELOADED ;
7027
- ZEND_MAP_PTR_NEW (op_array -> run_time_cache );
7028
- } else {
7029
- ZEND_MAP_PTR_INIT (op_array -> run_time_cache , zend_arena_alloc (& CG (arena ), sizeof (void * )));
7030
- ZEND_MAP_PTR_SET (op_array -> run_time_cache , NULL );
7031
7022
}
7032
7023
7024
+ ZEND_MAP_PTR_INIT (op_array -> run_time_cache , zend_arena_alloc (& CG (arena ), sizeof (void * )));
7025
+ ZEND_MAP_PTR_SET (op_array -> run_time_cache , NULL );
7026
+
7033
7027
op_array -> fn_flags |= (orig_op_array -> fn_flags & ZEND_ACC_STRICT_TYPES );
7034
7028
op_array -> fn_flags |= decl -> flags ;
7035
7029
op_array -> line_start = decl -> start_lineno ;
0 commit comments