From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 29 Jul 2020 15:05:35 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8ff8bb76774d45f8387ea0dd8d188269aad56d7;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Consider op1 literal of FETCH_OBJ_R
---

f8ff8bb76774d45f8387ea0dd8d188269aad56d7
diff --cc ext/opcache/Optimizer/compact_literals.c
index 1db8116596,f90b8175c3..1751311e88
--- a/ext/opcache/Optimizer/compact_literals.c
+++ b/ext/opcache/Optimizer/compact_literals.c
@@@ -230,7 -223,9 +230,10 @@@ void zend_optimizer_compact_literals(ze
  				case ZEND_POST_INC_OBJ:
  				case ZEND_POST_DEC_OBJ:
  				case ZEND_ISSET_ISEMPTY_PROP_OBJ:
 +				case ZEND_ASSIGN_OBJ_OP:
+ 					if (opline->op1_type == IS_CONST) {
+ 						LITERAL_INFO(opline->op1.constant, LITERAL_VALUE, 1);
+ 					}
  					if (opline->op2_type == IS_CONST) {
  						LITERAL_INFO(opline->op2.constant, LITERAL_PROPERTY, 1);
  					}