diff options
Diffstat (limited to 'ext/opcache/Optimizer/zend_cfg.h')
| -rw-r--r-- | ext/opcache/Optimizer/zend_cfg.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ext/opcache/Optimizer/zend_cfg.h b/ext/opcache/Optimizer/zend_cfg.h index c93308f3e4..b7604c9eda 100644 --- a/ext/opcache/Optimizer/zend_cfg.h +++ b/ext/opcache/Optimizer/zend_cfg.h @@ -90,11 +90,7 @@ typedef struct _zend_cfg { zend_basic_block *blocks; /* array of basic blocks */ int *predecessors; uint32_t *map; - unsigned int split_at_live_ranges : 1; - unsigned int split_at_calls : 1; - unsigned int split_at_recv : 1; - unsigned int dynamic : 1; /* accesses varables by name */ - unsigned int vararg : 1; /* uses func_get_args() */ + uint32_t flags; } zend_cfg; /* Build Flags */ @@ -109,26 +105,26 @@ typedef struct _zend_cfg { #define ZEND_CALL_TREE (1<<23) #define ZEND_SSA_USE_CV_RESULTS (1<<22) -#define CRT_CONSTANT_EX(op_array, node, rt_constants) \ +#define CRT_CONSTANT_EX(op_array, opline, node, rt_constants) \ ((rt_constants) ? \ - RT_CONSTANT(op_array, (node)) \ + RT_CONSTANT(opline, (node)) \ : \ CT_CONSTANT_EX(op_array, (node).constant) \ ) #define CRT_CONSTANT(node) \ - CRT_CONSTANT_EX(op_array, node, (build_flags & ZEND_RT_CONSTANTS)) + CRT_CONSTANT_EX(op_array, opline, node, (build_flags & ZEND_RT_CONSTANTS)) #define RETURN_VALUE_USED(opline) \ ((opline)->result_type != IS_UNUSED) BEGIN_EXTERN_C() -int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t build_flags, zend_cfg *cfg, uint32_t *func_flags); +int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t build_flags, zend_cfg *cfg); void zend_cfg_remark_reachable_blocks(const zend_op_array *op_array, zend_cfg *cfg); int zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg); int zend_cfg_compute_dominators_tree(const zend_op_array *op_array, zend_cfg *cfg); -int zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg, uint32_t *flags); +int zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg); END_EXTERN_C() |