com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/opcache/Optimizer/sccp.c
| From: | Nikita Popov | Date: | Tue, 21 May 2019 15:17:45 +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-106272@lists.php.net to get a copy of this message | ||
Commit: 436a47428bcc91a55b11bdb8acbb6fae763ff9e0
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 21 May 2019 17:17:30 +0200
Parents: a87448bb55e939e5bb792958eb1ab196c42b783e 30f1b172625030c78d564ceede46e7490152fcb4
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=436a47428bcc91a55b11bdb8acbb6fae763ff9e0
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 b81c155,1791f6a..c9b6f4f
--- a/ext/opcache/Optimizer/sccp.c
+++ b/ext/opcache/Optimizer/sccp.c
@@@ -1400,31 -1360,6 +1400,31 @@@ static void sccp_visit_instr(scdf_ctx *
}
return;
}
+ case ZEND_ADD_ARRAY_UNPACK: {
+ zval *result = &ctx->values[ssa_op->result_use];
+ if (IS_BOT(result) || IS_BOT(op1)) {
+ SET_RESULT_BOT(result);
+ return;
+ }
+ SKIP_IF_TOP(result);
+ SKIP_IF_TOP(op1);
+
+ /* See comment for ADD_ARRAY_ELEMENT. */
- if (Z_TYPE(ctx->values[ssa_op->result_def]) == IS_NULL) {
++ if (Z_TYPE_P(result) == IS_NULL) {
+ SET_RESULT_BOT(result);
+ return;
+ }
+ ZVAL_COPY_VALUE(&zv, result);
+ ZVAL_NULL(result);
+
+ if (ct_eval_add_array_unpack(&zv, op1) == SUCCESS) {
+ SET_RESULT(result, &zv);
+ } else {
+ SET_RESULT_BOT(result);
+ }
+ zval_ptr_dtor_nogc(&zv);
+ return;
+ }
case ZEND_NEW:
if (ssa_op->result_def >= 0
&& ctx->scdf.ssa->vars[ssa_op->result_def].escape_state ==
ESCAPE_STATE_NO_ESCAPE) {