Fix build

diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c
index 63f14634cb896355660b507dd2718e099f93429e..f0127d5ed0ad5de7d45bf5f086e292093f8ee79d 100644 (file)
--- a/ext/opcache/Optimizer/zend_cfg.c
+++ b/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);

diff --git a/ext/opcache/Optimizer/zend_dfg.c b/ext/opcache/Optimizer/zend_dfg.c
index e72afd170177f60e90443d0a2ec414493bd0d221..78c534af2936e9f036b2cdef6a0bb474c9e41a22 100644 (file)
--- a/ext/opcache/Optimizer/zend_dfg.c
+++ b/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);

diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
index 01772151bf9b65b3a63bfe22f91dc55a77262686..c07a0d0907ca141e29ca342c2763ae8dce6f0294 100644 (file)
--- a/ext/opcache/Optimizer/zend_inference.c
+++ b/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);

diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c
index 0da793918c5511e973efeff026d05811074e9d18..1144d89fb36a21c4ece7c566347c5afe52184acd 100644 (file)
--- a/ext/opcache/Optimizer/zend_ssa.c
+++ b/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));