diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-05-18 20:51:37 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-18 20:51:37 +0400 |
| commit | 0019b512ff624d2fed722022b7c4688be10653ff (patch) | |
| tree | bdefe5c968be894acbd02a434d74b374c9122cc0 /ext/opcache | |
| parent | 4f8a84b2e70af341560e271a824159bf9b814cf9 (diff) | |
| parent | 3fff53fc5790918bea9a8c04a04a9d8c79ebdbf6 (diff) | |
| download | php-git-0019b512ff624d2fed722022b7c4688be10653ff.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Optimize ZEND_POW (Rouven Weßling)
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Conflicts:
ext/opcache/ZendAccelerator.h
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/Optimizer/pass1_5.c | 3 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/pass3.c | 8 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/pass1_5.c b/ext/opcache/Optimizer/pass1_5.c index 577d1b6609..30705ff18a 100644 --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@ -25,6 +25,9 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) { case ZEND_MUL: case ZEND_DIV: case ZEND_MOD: +#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO + case ZEND_POW: +#endif case ZEND_SL: case ZEND_SR: case ZEND_CONCAT: diff --git a/ext/opcache/Optimizer/pass3.c b/ext/opcache/Optimizer/pass3.c index fd2a190009..1ee641ca52 100644 --- a/ext/opcache/Optimizer/pass3.c +++ b/ext/opcache/Optimizer/pass3.c @@ -45,6 +45,9 @@ if (ZEND_OPTIMIZER_PASS_3 & OPTIMIZATION_LEVEL) { case ZEND_MUL: case ZEND_DIV: case ZEND_MOD: +#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO + case ZEND_POW: +#endif case ZEND_CONCAT: case ZEND_SL: case ZEND_SR: @@ -104,6 +107,11 @@ if (ZEND_OPTIMIZER_PASS_3 & OPTIMIZATION_LEVEL) { case ZEND_MOD: opline->opcode = ZEND_ASSIGN_MOD; break; +#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO + case ZEND_POW: + opline->opcode = ZEND_ASSIGN_POW; + break; +#endif case ZEND_CONCAT: opline->opcode = ZEND_ASSIGN_CONCAT; break; diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 6479a6ff40..a25e766244 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -93,7 +93,7 @@ #define PHP_5_3_X_API_NO 220090626 #define PHP_5_4_X_API_NO 220100525 #define PHP_5_5_X_API_NO 220121212 -#define PHP_5_6_X_API_NO 220131106 +#define PHP_5_6_X_API_NO 220131226 /*** file locking ***/ #ifndef ZEND_WIN32 |