diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-22 16:39:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-22 16:39:22 +0800 |
| commit | 201f660ae11488eeacd16ee7adbe79fc8a28e27d (patch) | |
| tree | 8dc85da6d008b77c8776894c7cdcf83135311396 | |
| parent | 56c5b8e399683754323016dc5d9732aaea8beee6 (diff) | |
| parent | d0928b7f97b7882e0dca5faa26b85a8d43121c07 (diff) | |
| download | php-git-201f660ae11488eeacd16ee7adbe79fc8a28e27d.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | ext/opcache/Optimizer/block_pass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 3f30ef53c4..7948990f81 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -384,7 +384,7 @@ static inline void del_source(zend_code_block *from, zend_code_block *to) return; } - if (to->sources->next == NULL) { + if (!to->protected && to->sources->next == NULL) { /* source to only one block */ zend_code_block *from_block = to->sources->from; |