diff options
| -rw-r--r-- | ext/opcache/Optimizer/dfa_pass.c | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_cfg.c | 18 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_dump.c | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_func_info.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index 9dbfb7a56e..02dfdd5b7e 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -46,7 +46,7 @@ int zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, return FAILURE; } - if (*flags & ZEND_FUNC_INDIRECT_VAR_ASSESS) { + if (*flags & ZEND_FUNC_INDIRECT_VAR_ACCESS) { /* TODO: we can't analyze functions with indirect variable access ??? */ return FAILURE; } diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c index 8258e0e25a..9dd0367776 100644 --- a/ext/opcache/Optimizer/zend_cfg.c +++ b/ext/opcache/Optimizer/zend_cfg.c @@ -264,7 +264,7 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b } break; case ZEND_INCLUDE_OR_EVAL: - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; case ZEND_YIELD: case ZEND_YIELD_FROM: if (build_flags & ZEND_CFG_STACKLESS) { @@ -292,17 +292,17 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b if ((fn = zend_hash_find_ptr(EG(function_table), Z_STR_P(zv))) != NULL) { if (fn->type == ZEND_INTERNAL_FUNCTION) { if (zend_string_equals_literal(Z_STR_P(zv), "extract")) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "compact")) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "parse_str") && opline->extended_value == 1) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "mb_parse_str") && opline->extended_value == 1) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "get_defined_vars")) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (zend_string_equals_literal(Z_STR_P(zv), "func_num_args")) { flags |= ZEND_FUNC_VARARG; } else if (zend_string_equals_literal(Z_STR_P(zv), "func_get_arg")) { @@ -366,7 +366,7 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b break; case ZEND_UNSET_VAR: if (!(opline->extended_value & ZEND_QUICK_SET)) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } break; case ZEND_FETCH_R: @@ -376,11 +376,11 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b case ZEND_FETCH_IS: case ZEND_FETCH_UNSET: if ((opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_LOCAL) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } else if (((opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL || (opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL_LOCK) && !op_array->function_name) { - flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; + flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS; } break; } diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c index 06f4423a1b..fddc5a9741 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -853,7 +853,7 @@ void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, cons if (ssa) { fprintf(stderr, ", ssa_vars=%d", ssa->vars_count); } - if (func_flags & ZEND_FUNC_INDIRECT_VAR_ASSESS) { + if (func_flags & ZEND_FUNC_INDIRECT_VAR_ACCESS) { fprintf(stderr, ", dynamic"); } if (func_flags & ZEND_FUNC_RECURSIVE) { diff --git a/ext/opcache/Optimizer/zend_func_info.h b/ext/opcache/Optimizer/zend_func_info.h index ee4afebf8c..8fcf00d26a 100644 --- a/ext/opcache/Optimizer/zend_func_info.h +++ b/ext/opcache/Optimizer/zend_func_info.h @@ -22,7 +22,7 @@ #include "zend_ssa.h" /* func flags */ -#define ZEND_FUNC_INDIRECT_VAR_ASSESS (1<<0) +#define ZEND_FUNC_INDIRECT_VAR_ACCESS (1<<0) #define ZEND_FUNC_HAS_CALLS (1<<1) #define ZEND_FUNC_VARARG (1<<2) #define ZEND_FUNC_NO_LOOPS (1<<3) |