Fixed bug #77287

nikic · nikic · commit 76760901fabf · 2019-01-22T12:15:06.000+01:00
There may be an EXT_NOP opcode before the parameter list, we should
skip over it.
diff --git a/NEWS b/NEWS
@@ -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
@@ -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++;

Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx`
`810`	`810`	`Z_CACHE_SLOT_P(val) = op_array->cache_size;`
`811`	`811`	`op_array->cache_size += sizeof(zval);`
`812`	`812`	`}`
`813`		`- } else if (opline->opcode != ZEND_RECV) {`
	`813`	`+ } else if (opline->opcode != ZEND_RECV && opline->opcode != ZEND_EXT_NOP) {`
`814`	`814`	`break;`
`815`	`815`	`}`
`816`	`816`	`opline++;`