diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-22 12:15:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-22 12:15:06 +0100 |
| commit | 76760901fabf8ff53c8dfb4ddf7ca703c5a12b79 (patch) | |
| tree | 1ffdbe212589eb874a0f46dfcb44d9347c265e09 | |
| parent | 6a0a600176bb709496ac5571be01b0709b30d4a4 (diff) | |
| download | php-git-76760901fabf8ff53c8dfb4ddf7ca703c5a12b79.tar.gz | |
Fixed bug #77287
There may be an EXT_NOP opcode before the parameter list, we should
skip over it.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/compact_literals.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -61,6 +61,8 @@ PHP NEWS (Nikita) . Fixed bug #77361 (configure fails on 64-bit AIX when opcache enabled). (Kevin Adler) + . Fixed bug #77287 (Opcache literal compaction is incompatible with EXT + opcodes). (Nikita) - PCRE: . Fixed bug #77338 (get_browser with empty string). (Nikita) diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index 10bdf54011..fdab0068a4 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -810,7 +810,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx Z_CACHE_SLOT_P(val) = op_array->cache_size; op_array->cache_size += sizeof(zval); } - } else if (opline->opcode != ZEND_RECV) { + } else if (opline->opcode != ZEND_RECV && opline->opcode != ZEND_EXT_NOP) { break; } opline++; |