Improve the names

diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
index 24a9157f2c84ca364acf469d4899eef0fb2c1e70..9ee28ab35fdfde5cdc5ff2ddd1f425f7cdd197eb 100644 (file)
--- a/ext/opcache/Optimizer/block_pass.c
+++ b/ext/opcache/Optimizer/block_pass.c
@@ -1736,7 +1736,7 @@ static void zend_merge_blocks(zend_op_array *op_array, zend_cfg *cfg)
 
 #define PASSES 3
 
-void optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 {
        zend_cfg cfg;
        zend_basic_block *blocks, *end, *b;

diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c
index 7c71e535b4329e5d270f33721c14e360642e0b1c..3d8b2b6b0037b6e12127ce65a5862f947d918606 100644 (file)
--- a/ext/opcache/Optimizer/dfa_pass.c
+++ b/ext/opcache/Optimizer/dfa_pass.c
@@ -221,7 +221,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
        }
 }
 
-void optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 {
        void *checkpoint = zend_arena_checkpoint(ctx->arena);
        uint32_t flags = 0;

diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c
index 21896277c5a07753a655f3487e5b2f15743cc146..a9fb259428d06becef72b90592fb684660461e2c 100644 (file)
--- a/ext/opcache/Optimizer/optimize_func_calls.c
+++ b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -38,7 +38,7 @@ typedef struct _optimizer_call_info {
        zend_op       *opline;
 } optimizer_call_info;
 
-void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 {
        zend_op *opline = op_array->opcodes;
        zend_op *end = opline + op_array->last;

diff --git a/ext/opcache/Optimizer/optimize_temp_vars_5.c b/ext/opcache/Optimizer/optimize_temp_vars_5.c
index eb0e7686a610bd0f72af6762dc1b9611f0a465da..31a825e0b952a66139a6a0676f0c5908fb194d5a 100644 (file)
--- a/ext/opcache/Optimizer/optimize_temp_vars_5.c
+++ b/ext/opcache/Optimizer/optimize_temp_vars_5.c
@@ -39,7 +39,7 @@
                max = i;                                                        \
        }
 
-void optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx)
+void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 {
        int T = op_array->T;
        int offset = op_array->last_var;

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 1a1cebda9e7ddf1c18ca2b641b28cbf9dfe33c7a..47c76207a32e9755050790b2352eb6c8f6e221d3 100644 (file)
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -595,7 +595,7 @@ static void zend_optimize(zend_op_array      *op_array,
         * - INIT_FCALL_BY_NAME -> DO_FCALL
         */
        if (ZEND_OPTIMIZER_PASS_4 & ctx->optimization_level) {
-               optimize_func_calls(op_array, ctx);
+               zend_optimize_func_calls(op_array, ctx);
                if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_4) {
                        zend_dump_op_array(op_array, 0, "after pass 1", NULL);
                }
@@ -605,7 +605,7 @@ static void zend_optimize(zend_op_array      *op_array,
         * - CFG optimization
         */
        if (ZEND_OPTIMIZER_PASS_5 & ctx->optimization_level) {
-               optimize_cfg(op_array, ctx);
+               zend_optimize_cfg(op_array, ctx);
                if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_5) {
                        zend_dump_op_array(op_array, 0, "after pass 5", NULL);
                }
@@ -617,7 +617,7 @@ static void zend_optimize(zend_op_array      *op_array,
         */
        if ((ZEND_OPTIMIZER_PASS_6 & ctx->optimization_level) &&
            !(ZEND_OPTIMIZER_PASS_7 & ctx->optimization_level)) {
-               optimize_dfa(op_array, ctx);
+               zend_optimize_dfa(op_array, ctx);
                if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_6) {
                        zend_dump_op_array(op_array, 0, "after pass 6", NULL);
                }
@@ -628,7 +628,7 @@ static void zend_optimize(zend_op_array      *op_array,
         * - Optimize temp variables usage
         */
        if (ZEND_OPTIMIZER_PASS_9 & ctx->optimization_level) {
-               optimize_temporary_variables(op_array, ctx);
+               zend_optimize_temporary_variables(op_array, ctx);
                if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_9) {
                        zend_dump_op_array(op_array, 0, "after pass 9", NULL);
                }

diff --git a/ext/opcache/Optimizer/zend_optimizer_internal.h b/ext/opcache/Optimizer/zend_optimizer_internal.h
index 2efb0b203037094a09302fb4c4f0dd88adf7bc79..6483d0bc0a24f34c6a2cdb9a305064ab0e0cbc55 100644 (file)
--- a/ext/opcache/Optimizer/zend_optimizer_internal.h
+++ b/ext/opcache/Optimizer/zend_optimizer_internal.h
@@ -97,12 +97,12 @@ void zend_optimizer_remove_live_range(zend_op_array *op_array, uint32_t var);
 void zend_optimizer_pass1(zend_op_array *op_array, zend_optimizer_ctx *ctx);
 void zend_optimizer_pass2(zend_op_array *op_array);
 void zend_optimizer_pass3(zend_op_array *op_array);
-void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx);
-void optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx);
-void optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_dfa(zend_op_array *op_array, zend_optimizer_ctx *ctx);
 int  zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, zend_ssa *ssa, uint32_t *flags);
 void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, zend_ssa *ssa);
-void optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx);
+void zend_optimize_temporary_variables(zend_op_array *op_array, zend_optimizer_ctx *ctx);
 void zend_optimizer_nop_removal(zend_op_array *op_array);
 void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx *ctx);
 int zend_optimizer_is_disabled_func(const char *name, size_t len);