Browse Source

Fix build

pull/1825/head
Kalle Sommer Nielsen 10 years ago
parent
commit
fc49f1c411
  1. 4
      ext/opcache/Optimizer/zend_cfg.c
  2. 3
      ext/opcache/Optimizer/zend_dfg.c
  3. 6
      ext/opcache/Optimizer/zend_inference.c
  4. 4
      ext/opcache/Optimizer/zend_ssa.c

4
ext/opcache/Optimizer/zend_cfg.c

@ -715,8 +715,8 @@ int zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg, uint32
int *dj_spanning_tree;
zend_worklist work;
int flag = ZEND_FUNC_NO_LOOPS;
ALLOCA_FLAG(list_use_heap);
ALLOCA_FLAG(tree_use_heap);
ALLOCA_FLAG(list_use_heap)
ALLOCA_FLAG(tree_use_heap)
ZEND_WORKLIST_ALLOCA(&work, cfg->blocks_count, list_use_heap);
dj_spanning_tree = do_alloca(sizeof(int) * cfg->blocks_count, tree_use_heap);

3
ext/opcache/Optimizer/zend_dfg.c

@ -200,8 +200,9 @@ op2_use:
/* Calculate "in" and "out" sets */
{
uint32_t worklist_len = zend_bitset_len(blocks_count);
zend_bitset worklist;
ALLOCA_FLAG(use_heap);
zend_bitset worklist = ZEND_BITSET_ALLOCA(worklist_len, use_heap);
worklist = ZEND_BITSET_ALLOCA(worklist_len, use_heap);
memset(worklist, 0, worklist_len * ZEND_BITSET_ELM_SIZE);
for (j = 0; j < blocks_count; j++) {
zend_bitset_incl(worklist, j);

6
ext/opcache/Optimizer/zend_inference.c

@ -158,9 +158,9 @@ int zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */
int index = 0, *dfs, *root;
zend_worklist_stack stack;
int j;
ALLOCA_FLAG(dfs_use_heap);
ALLOCA_FLAG(root_use_heap);
ALLOCA_FLAG(stack_use_heap);
ALLOCA_FLAG(dfs_use_heap)
ALLOCA_FLAG(root_use_heap)
ALLOCA_FLAG(stack_use_heap)
dfs = do_alloca(sizeof(int) * ssa->vars_count, dfs_use_heap);
memset(dfs, -1, sizeof(int) * ssa->vars_count);

4
ext/opcache/Optimizer/zend_ssa.c

@ -759,8 +759,8 @@ int zend_build_ssa(zend_arena **arena, const zend_op_array *op_array, uint32_t b
int *var = NULL;
int i, j, k, changed;
zend_dfg dfg;
ALLOCA_FLAG(dfg_use_heap);
ALLOCA_FLAG(var_use_heap);
ALLOCA_FLAG(dfg_use_heap)
ALLOCA_FLAG(var_use_heap)
ssa->rt_constants = (build_flags & ZEND_RT_CONSTANTS);
ssa_blocks = zend_arena_calloc(arena, blocks_count, sizeof(zend_ssa_block));

Loading…
Cancel
Save