]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 29 Jul 2020 15:05:35 +0000 (17:05 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 29 Jul 2020 15:05:35 +0000 (17:05 +0200)
* PHP-7.3:
  Consider op1 literal of FETCH_OBJ_R

1  2 
ext/opcache/Optimizer/compact_literals.c

index 1db8116596e7c002afa59a99a9d9f1d16cb6f2cc,f90b8175c3f49dc72b0e213276e49273e13b1c8c..1751311e88aa967037f4574357225207b4b5dd93
@@@ -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);
                                        }