diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-22 16:39:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-22 16:39:03 +0800 |
| commit | d0928b7f97b7882e0dca5faa26b85a8d43121c07 (patch) | |
| tree | f57e70bd7e4494752c2aa32c91d96a0fece35269 | |
| parent | e242f871df901d5a346eccb679d463c1d683d247 (diff) | |
| parent | 251745c012a42ca131767d02d06ef373a790e115 (diff) | |
| download | php-git-d0928b7f97b7882e0dca5faa26b85a8d43121c07.tar.gz | |
Merge branch 'PHP-5.5' into 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 649d613317..113a41c0b4 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -381,7 +381,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; |