com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/O ptimizer/compact_literals.c
| From: | Nikita Popov | Date: | Wed, 29 Jul 2020 15:05:35 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/O ptimizer/compact_literals.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112442@lists.php.net to get a copy of this message | ||
Commit: f8ff8bb76774d45f8387ea0dd8d188269aad56d7
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 29 Jul 2020 17:05:35 +0200
Parents: c6d539ae018db94c97d352ca23a57f29f63bc2f0 57ad5b34325db883726ec96c0683c7c1bd874cc4
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8ff8bb76774d45f8387ea0dd8d188269aad56d7
Log:
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Consider op1 literal of FETCH_OBJ_R
Changed paths:
MM ext/opcache/Optimizer/compact_literals.c
Diff:
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);
}