com php-src: Reset op_array->live_range if it is removed all by optimization: ext/opcache/Optimizer/ze nd_optimizer.c
| From: | Xinchen Hui | Date: | Mon, 15 Feb 2016 04:09:52 +0000 |
| Subject: | com php-src: Reset op_array->live_range if it is removed all by optimization: ext/opcache/Optimizer/ze nd_optimizer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91030@lists.php.net to get a copy of this message | ||
Commit: b3f5f5f1bee0e4b52290c519007e801f427ec9df
Author: Xinchen Hui <laruence@gmail.com> Mon, 15 Feb 2016 12:09:52 +0800
Parents: ab3a820aa37062c7c307a706c06bce8606206942
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b3f5f5f1bee0e4b52290c519007e801f427ec9df
Log:
Reset op_array->live_range if it is removed all by optimization
Changed paths:
M ext/opcache/Optimizer/zend_optimizer.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index e2a12de..e16bef2 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -379,6 +379,10 @@ void zend_optimizer_remove_live_range(zend_op_array *op_array, uint32_t var)
}
opline++;
}
+ if (j == 0) {
+ efree(op_array->live_range);
+ op_array->live_range = NULL;
+ }
}
free_alloca(map, use_heap);
}