com php-src: Check for user defined classes: ext/opcache/Optimi zer/dfa_pass.c ext/opcache/Optimizer/escape_analysis. c
ext/opcache/Optimizer/zend_optimizer_internal.h

From: Date: Tue, 29 Aug 2017 09:09:49 +0000
Subject: com php-src: Check for user defined classes: ext/opcache/Optimi zer/dfa_pass.c ext/opcache/Optimizer/escape_analysis. c
ext/opcache/Optimizer/zend_optimizer_internal.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99183@lists.php.net to get a copy of this message
Commit: 5155bf1f90172bc9272d669130a6250e429454c2 Author: Dmitry Stogov <dmitry@zend.com> Tue, 29 Aug 2017 12:09:49 +0300 Parents: 37adfcce8b91ad5fd2516bab357b34e91645da36 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5155bf1f90172bc9272d669130a6250e429454c2 Log: Check for user defined classes Changed paths: M ext/opcache/Optimizer/dfa_pass.c M ext/opcache/Optimizer/escape_analysis.c M ext/opcache/Optimizer/zend_optimizer_internal.h Diff: diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index 2317fa0..19ab324 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -107,7 +107,7 @@ int zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, return FAILURE; } - if (zend_ssa_escape_analysis(op_array, ssa) != SUCCESS) { + if (zend_ssa_escape_analysis(ctx->script, op_array, ssa) != SUCCESS) { return FAILURE; } diff --git a/ext/opcache/Optimizer/escape_analysis.c b/ext/opcache/Optimizer/escape_analysis.c index f1151c6..caab74f 100644 --- a/ext/opcache/Optimizer/escape_analysis.c +++ b/ext/opcache/Optimizer/escape_analysis.c @@ -163,7 +163,7 @@ static inline zend_class_entry *get_class_entry(const zend_script *script, zend_ } /* }}} */ -static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, int var) /* {{{ */ +static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, int var, const zend_script *script) /* {{{ */ { zend_ssa_op *op = ssa->ops + def; zend_op *opline = op_array->opcodes + def; @@ -175,9 +175,10 @@ static int is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, in case ZEND_NEW: /* objects with destructors should escape */ if (opline->op1_type == IS_CONST) { - zend_class_entry *ce = get_class_entry(NULL, Z_STR_P(CRT_CONSTANT_EX(op_array, opline->op1, ssa->rt_constants)+1)); + zend_class_entry *ce = get_class_entry(script, Z_STR_P(CRT_CONSTANT_EX(op_array, opline->op1, ssa->rt_constants)+1)); if (ce && !ce->create_object && - !ce->destructor && !ce->__get && !ce->__set) { + !ce->destructor && !ce->__get && !ce->__set && + !(ce->ce_flags & ZEND_ACC_INHERITED)) { return 1; } } @@ -316,7 +317,7 @@ static int is_escape_use(zend_op_array *op_array, zend_ssa *ssa, int use, int va } /* }}} */ -int zend_ssa_escape_analysis(zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ +int zend_ssa_escape_analysis(const zend_script *script, zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ { zend_ssa_var *ssa_vars = ssa->vars; int ssa_vars_count = ssa->vars_count; @@ -333,7 +334,7 @@ int zend_ssa_escape_analysis(zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ has_allocations = 0; for (i = 0; i < ssa_vars_count; i++) { if (ssa_vars[i].definition >= 0) { - if (is_allocation_def(op_array, ssa, ssa_vars[i].definition, i)) { + if (is_allocation_def(op_array, ssa, ssa_vars[i].definition, i, script)) { has_allocations = 1; } } @@ -362,7 +363,7 @@ int zend_ssa_escape_analysis(zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ } else if (ssa_vars[i].definition >= 0) { root = ees[i]; if (ssa_vars[root].escape_state == ESCAPE_STATE_UNKNOWN) { - if (is_allocation_def(op_array, ssa, ssa_vars[i].definition, i)) { + if (is_allocation_def(op_array, ssa, ssa_vars[i].definition, i, script)) { ssa_vars[root].escape_state = ESCAPE_STATE_NO_ESCAPE; num_non_escaped++; } else { diff --git a/ext/opcache/Optimizer/zend_optimizer_internal.h b/ext/opcache/Optimizer/zend_optimizer_internal.h index 657be9b..1ab0fb5 100644 --- a/ext/opcache/Optimizer/zend_optimizer_internal.h +++ b/ext/opcache/Optimizer/zend_optimizer_internal.h @@ -114,6 +114,6 @@ void zend_optimizer_shift_jump(zend_op_array *op_array, zend_op *opline, uint32_ zend_uchar zend_compound_assign_to_binary_op(zend_uchar opcode); int sccp_optimize_op_array(zend_optimizer_ctx *ctx, zend_op_array *op_arrya, zend_ssa *ssa, zend_call_info **call_map); int dce_optimize_op_array(zend_op_array *op_array, zend_ssa *ssa, zend_bool reorder_dtor_effects); -int zend_ssa_escape_analysis(zend_op_array *op_array, zend_ssa *ssa); +int zend_ssa_escape_analysis(const zend_script *script, zend_op_array *op_array, zend_ssa *ssa); #endif

« previous php.cvs (#99183) next »