diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-22 12:15:06 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-02-05 13:23:50 +0100 |
| commit | 80b17a73ae2e203f26bb3f0da423508596d71f1f (patch) | |
| tree | b9333b9653220aa4a3e92b36f0f7b5ab5600a4df | |
| parent | 5cce13ed67005f2a51e92d19340e9c97215d3d30 (diff) | |
| download | php-git-80b17a73ae2e203f26bb3f0da423508596d71f1f.tar.gz | |
Fixed bug #77287
There may be an EXT_NOP opcode before the parameter list, we should
skip over it.
(cherry picked from commit 76760901fabf8ff53c8dfb4ddf7ca703c5a12b79)
| -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++; |