com php-src: Merge branch 'PHP-7.2': ext/opcache/Optimizer/comp act_vars.c ext/opcache/Optimizer/dce.c

From: Date: Tue, 10 Oct 2017 16:37:40 +0000
Subject: com php-src: Merge branch 'PHP-7.2': ext/opcache/Optimizer/comp act_vars.c ext/opcache/Optimizer/dce.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99698@lists.php.net to get a copy of this message
Commit: 70b2ec58744f372141de434184b4ce12b0c7bf32 Author: Dmitry Stogov <dmitry@zend.com> Tue, 10 Oct 2017 19:37:40 +0300 Parents: 0c4f4af107256932950847551da7e2e4785bdbe6 2929110ce13619bdf61c8135075939c0c4e9b69c Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=70b2ec58744f372141de434184b4ce12b0c7bf32 Log: Merge branch 'PHP-7.2' * PHP-7.2: Fixed cleanup after optimization passes Changed paths: MM ext/opcache/Optimizer/compact_vars.c MM ext/opcache/Optimizer/dce.c Diff: diff --cc ext/opcache/Optimizer/compact_vars.c index 016fbff,caf1219..7bcf0b8 --- a/ext/opcache/Optimizer/compact_vars.c +++ b/ext/opcache/Optimizer/compact_vars.c @@@ -105,21 -93,26 +105,29 @@@ void zend_optimizer_compact_vars(zend_o } /* Update CV name table */ - if (num_cvs) { - zend_string **names = safe_emalloc(sizeof(zend_string *), num_cvs, 0); - for (i = 0; i < op_array->last_var; i++) { - if (cv_map[i] != (uint32_t) -1) { - names[cv_map[i]] = op_array->vars[i]; - } else { + if (num_cvs != op_array->last_var) { - zend_string **names = safe_emalloc(sizeof(zend_string *), num_cvs, 0); - for (i = 0; i < op_array->last_var; i++) { - if (vars_map[i] != (uint32_t) -1) { - names[vars_map[i]] = op_array->vars[i]; - } else { ++ if (num_cvs) { ++ zend_string **names = safe_emalloc(sizeof(zend_string *), num_cvs, 0); ++ for (i = 0; i < op_array->last_var; i++) { ++ if (vars_map[i] != (uint32_t) -1) { ++ names[vars_map[i]] = op_array->vars[i]; ++ } else { ++ zend_string_release(op_array->vars[i]); ++ } ++ } ++ efree(op_array->vars); ++ op_array->vars = names; ++ } else { ++ for (i = 0; i < op_array->last_var; i++) { zend_string_release(op_array->vars[i]); } ++ efree(op_array->vars); ++ op_array->vars = NULL; } -- efree(op_array->vars); -- op_array->vars = names; - } else { - for (i = 0; i < op_array->last_var; i++) { - zend_string_release(op_array->vars[i]); - } - efree(op_array->vars); - op_array->vars = NULL; ++ op_array->last_var = num_cvs; } -- op_array->last_var = num_cvs; + op_array->T = num_tmps; - free_alloca(cv_map, use_heap2); + free_alloca(vars_map, use_heap2); }

« previous php.cvs (#99698) next »