summaryrefslogtreecommitdiff
path: root/ext/opcache
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-07-29 17:05:35 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-07-29 17:05:35 +0200
commitf8ff8bb76774d45f8387ea0dd8d188269aad56d7 (patch)
tree6d8856bde29bf9d4c4096559e53ba9b339e572f7 /ext/opcache
parentc6d539ae018db94c97d352ca23a57f29f63bc2f0 (diff)
parent57ad5b34325db883726ec96c0683c7c1bd874cc4 (diff)
downloadphp-git-f8ff8bb76774d45f8387ea0dd8d188269aad56d7.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Consider op1 literal of FETCH_OBJ_R
Diffstat (limited to 'ext/opcache')
-rw-r--r--ext/opcache/Optimizer/compact_literals.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c
index 1db8116596..1751311e88 100644
--- a/ext/opcache/Optimizer/compact_literals.c
+++ b/ext/opcache/Optimizer/compact_literals.c
@@ -231,6 +231,9 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
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);
}