com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/Optimizer/sccp.c

From: Date: Tue, 21 May 2019 15:03:52 +0000
Subject: com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/Optimizer/sccp.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106268@lists.php.net to get a copy of this message
Commit: a87448bb55e939e5bb792958eb1ab196c42b783e Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 21 May 2019 17:03:52 +0200 Parents: 9ef03a94ba68be0f8bae36f46c4763ba3c88a02a fc4836b193666958844e50bc35b93cc2da08b91c Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a87448bb55e939e5bb792958eb1ab196c42b783e Log: Merge branch 'PHP-7.3' into PHP-7.4 Changed paths: MM ext/opcache/Optimizer/sccp.c Diff: diff --cc ext/opcache/Optimizer/sccp.c index 94bba35,22f8355..b81c155 --- 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);

« previous php.cvs (#106268) next »