com php-src: Fixed SCCP support for ZEND_ASSIGN_OBJ_REF : ext/opcache/Optimizer/sccp.c ext/opcache/tests/opt/sc cp_027.phpt
| From: | Dmitry Stogov | Date: | Wed, 03 Apr 2019 08:22:59 +0000 |
| Subject: | com php-src: Fixed SCCP support for ZEND_ASSIGN_OBJ_REF : ext/opcache/Optimizer/sccp.c ext/opcache/tests/opt/sc cp_027.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105506@lists.php.net to get a copy of this message | ||
Commit: c941f1d8c7a1418d65d01803b421dfe746eb69a0
Author: Dmitry Stogov <dmitry@zend.com> Wed, 3 Apr 2019 11:22:59 +0300
Parents: e03f5328298791a34afdfb64f21163b71a57ac31
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c941f1d8c7a1418d65d01803b421dfe746eb69a0
Log:
Fixed SCCP support for ZEND_ASSIGN_OBJ_REF
Changed paths:
M ext/opcache/Optimizer/sccp.c
A ext/opcache/tests/opt/sccp_027.phpt
Diff:
diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c
index 3cbaa87..9358afd 100644
--- a/ext/opcache/Optimizer/sccp.c
+++ b/ext/opcache/Optimizer/sccp.c
@@ -1803,6 +1803,16 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op
*ssa_o
SET_RESULT_BOT(result);
break;
}
+ case ZEND_ASSIGN_STATIC_PROP_REF:
+ case ZEND_ASSIGN_OBJ_REF:
+ SET_RESULT_BOT(result);
+ SET_RESULT_BOT(op1);
+ SET_RESULT_BOT(op2);
+ opline++;
+ ssa_op++;
+ op1 = get_op1_value(ctx, opline, ssa_op);
+ SET_RESULT_BOT(op1);
+ break;
default:
{
/* If we have no explicit implementation return BOT */
diff --git a/ext/opcache/tests/opt/sccp_027.phpt b/ext/opcache/tests/opt/sccp_027.phpt
new file mode 100644
index 0000000..3818959
--- /dev/null
+++ b/ext/opcache/tests/opt/sccp_027.phpt
@@ -0,0 +1,27 @@
+--TEST--
+SCCP 027: Support for ASSIGN_OBJ_REF
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.preload=
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+class Foo {
+ protected $arr;
+ public function init($a) {
+ $this->arr =& $a;
+ if (isset($a[0])) {
+ return 1;
+ } else {
+ return 2;
+ }
+ }
+}
+$x = new Foo();
+var_dump($x->init([1]));
+?>
+--EXPECT--
+int(1)