]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 21 May 2019 15:03:52 +0000 (17:03 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 21 May 2019 15:03:52 +0000 (17:03 +0200)
1  2 
ext/opcache/Optimizer/sccp.c

index 94bba35a658111c5c5785dbcaf61fedba0c350c5,22f835527b9f5ce1738ed22ece14b677a9e58f1a..b81c155bb678dff8898e9b160a0746dae7f8a781
@@@ -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);