com php-src: Fixed cleanup after optimization passes: ext/opcache/Optimizer/compact_vars.c ext/opcache/Optimize r/dce.c
| From: | Dmitry Stogov | Date: | Tue, 10 Oct 2017 16:25:51 +0000 |
| Subject: | com php-src: Fixed cleanup after optimization passes: ext/opcache/Optimizer/compact_vars.c ext/opcache/Optimize r/dce.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99697@lists.php.net to get a copy of this message | ||
Commit: 2929110ce13619bdf61c8135075939c0c4e9b69c
Author: Dmitry Stogov <dmitry@zend.com> Tue, 10 Oct 2017 19:25:51 +0300
Parents: 6c3c18723c53e533259e9301d259e505a4b2e386
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2929110ce13619bdf61c8135075939c0c4e9b69c
Log:
Fixed cleanup after optimization passes
Changed paths:
M ext/opcache/Optimizer/compact_vars.c
M ext/opcache/Optimizer/dce.c
Diff:
diff --git a/ext/opcache/Optimizer/compact_vars.c b/ext/opcache/Optimizer/compact_vars.c
index c5a9b79..caf1219 100644
--- a/ext/opcache/Optimizer/compact_vars.c
+++ b/ext/opcache/Optimizer/compact_vars.c
@@ -93,7 +93,7 @@ void zend_optimizer_compact_vars(zend_op_array *op_array) {
}
/* 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) {
@@ -104,6 +104,12 @@ void zend_optimizer_compact_vars(zend_op_array *op_array) {
}
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;
diff --git a/ext/opcache/Optimizer/dce..c b/ext/opcache/Optimizer/dce.c
index db9a8a5..e2a70f9 100644
--- a/ext/opcache/Optimizer/dce.c
+++ b/ext/opcache/Optimizer/dce.c
@@ -611,6 +611,10 @@ static void dce_live_ranges(context *ctx, zend_op_array *op_array, zend_ssa
*ssa
i++;
}
op_array->last_live_range = j;
+ if (op_array->last_live_range == 0) {
+ efree(op_array->live_range);
+ op_array->live_range = NULL;
+ }
}
int dce_optimize_op_array(zend_op_array *op_array, zend_ssa *ssa, zend_bool reorder_dtor_effects) {