archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Typo (ASSESS->ACCESS)

Browse source
This commit is contained in:
Dmitry Stogov 2016-01-19 15:54:44 +03:00
parent a2ff3a46a4
commit a8900b5636
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/opcache/Optimizer/dfa_pass.c
View file

@ -46,7 +46,7 @@ int zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx,
return FAILURE; 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 ??? */ /* TODO: we can't analyze functions with indirect variable access ??? */
return FAILURE; return FAILURE;
} }

18
ext/opcache/Optimizer/zend_cfg.c
View file

@ -264,7 +264,7 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b
} }
break; break;
case ZEND_INCLUDE_OR_EVAL: case ZEND_INCLUDE_OR_EVAL:
flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
case ZEND_YIELD: case ZEND_YIELD:
case ZEND_YIELD_FROM: case ZEND_YIELD_FROM:
if (build_flags & ZEND_CFG_STACKLESS) { 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 = zend_hash_find_ptr(EG(function_table), Z_STR_P(zv))) != NULL) {
if (fn->type == ZEND_INTERNAL_FUNCTION) { if (fn->type == ZEND_INTERNAL_FUNCTION) {
if (zend_string_equals_literal(Z_STR_P(zv), "extract")) { 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")) { } 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") && } else if (zend_string_equals_literal(Z_STR_P(zv), "parse_str") &&
opline->extended_value == 1) { 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") && } else if (zend_string_equals_literal(Z_STR_P(zv), "mb_parse_str") &&
opline->extended_value == 1) { 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")) { } 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")) { } else if (zend_string_equals_literal(Z_STR_P(zv), "func_num_args")) {
flags |= ZEND_FUNC_VARARG; flags |= ZEND_FUNC_VARARG;
} else if (zend_string_equals_literal(Z_STR_P(zv), "func_get_arg")) { } 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; break;
case ZEND_UNSET_VAR: case ZEND_UNSET_VAR:
if (!(opline->extended_value & ZEND_QUICK_SET)) { if (!(opline->extended_value & ZEND_QUICK_SET)) {
flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
} }
break; break;
case ZEND_FETCH_R: 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_IS:
case ZEND_FETCH_UNSET: case ZEND_FETCH_UNSET:
if ((opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_LOCAL) { 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 || } else if (((opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL ||
(opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL_LOCK) && (opline->extended_value & ZEND_FETCH_TYPE_MASK) == ZEND_FETCH_GLOBAL_LOCK) &&
!op_array->function_name) { !op_array->function_name) {
flags |= ZEND_FUNC_INDIRECT_VAR_ASSESS; flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
} }
break; break;
} }

2
ext/opcache/Optimizer/zend_dump.c
View file

@ -853,7 +853,7 @@ void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, cons
if (ssa) { if (ssa) {
fprintf(stderr, ", ssa_vars=%d", ssa->vars_count); 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"); fprintf(stderr, ", dynamic");
} }
if (func_flags & ZEND_FUNC_RECURSIVE) { if (func_flags & ZEND_FUNC_RECURSIVE) {

2
ext/opcache/Optimizer/zend_func_info.h
View file

@ -22,7 +22,7 @@
#include "zend_ssa.h" #include "zend_ssa.h"
/* func flags */ /* 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_HAS_CALLS (1<<1)
#define ZEND_FUNC_VARARG (1<<2) #define ZEND_FUNC_VARARG (1<<2)
#define ZEND_FUNC_NO_LOOPS (1<<3) #define ZEND_FUNC_NO_LOOPS (1<<3)