Merge branch 'PHP-7.3'

nikic · nikic · commit d3e5a2487f59 · 2019-01-22T12:28:44.000+01:00
diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c
@@ -827,7 +827,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
`@@ -827,7 +827,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx`
`827`	`827`	`Z_CACHE_SLOT_P(val) = op_array->cache_size;`
`828`	`828`	`op_array->cache_size += sizeof(zval);`
`829`	`829`	`}`
`830`		`- } else if (opline->opcode != ZEND_RECV) {`
	`830`	`+ } else if (opline->opcode != ZEND_RECV && opline->opcode != ZEND_EXT_NOP) {`
`831`	`831`	`break;`
`832`	`832`	`}`
`833`	`833`	`opline++;`