From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 21 May 2019 15:03:52 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a87448bb55e939e5bb792958eb1ab196c42b783e;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

a87448bb55e939e5bb792958eb1ab196c42b783e
diff --cc ext/opcache/Optimizer/sccp.c
index 94bba35a65,22f835527b..b81c155bb6
--- a/ext/opcache/Optimizer/sccp.c
+++ b/ext/opcache/Optimizer/sccp.c
@@@ -1461,8 -1431,8 +1496,8 @@@ static void sccp_visit_instr(scdf_ctx *
  			if (op2) {
  				SKIP_IF_TOP(op2);
  			}
 -			if (!opline->extended_value) {
 +			if (opline->extended_value == 0) {
- 				if (zend_optimizer_eval_binary_op(&zv, zend_compound_assign_to_binary_op(opline->opcode), op1, op2) == SUCCESS) {
+ 				if (ct_eval_binary_op(&zv, zend_compound_assign_to_binary_op(opline->opcode), op1, op2) == SUCCESS) {
  					SET_RESULT(op1, &zv);
  					SET_RESULT(result, &zv);
  					zval_ptr_dtor_nogc(&zv);