diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-03 10:19:31 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-03 12:49:41 +0200 |
| commit | 21465ec0e1c1401751b35a21f45f1d57255d5be9 (patch) | |
| tree | fd9bfa66fddbd9cd8a918afd4a3885f8a544e252 | |
| parent | 813279f4b4154d18eb9b6038b19decb27349e680 (diff) | |
| download | php-git-PHP-7.3.7.tar.gz | |
(cherry picked from commit 4892bbc167dfa0ea188baebbce538225f4a0455a)
| -rw-r--r-- | ext/opcache/Optimizer/sccp.c | 1 | ||||
| -rw-r--r-- | ext/opcache/tests/bug78230.phpt | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index ac3247076e..1ec3a51532 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -2204,6 +2204,7 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var, if (opline->opcode == ZEND_DO_ICALL) { removed_ops = remove_call(ctx, opline, ssa_op); } else if (opline->opcode == ZEND_TYPE_CHECK + && opline->op1_type & (IS_VAR|IS_TMP_VAR) && !value_known(&ctx->values[ssa_op->op1_use])) { /* For TYPE_CHECK we may compute the result value without knowing the * operand, based on type inference information. Make sure the operand is diff --git a/ext/opcache/tests/bug78230.phpt b/ext/opcache/tests/bug78230.phpt new file mode 100644 index 0000000000..38cc684995 --- /dev/null +++ b/ext/opcache/tests/bug78230.phpt @@ -0,0 +1,29 @@ +--TEST-- +Bug #78230: Incorrect type check optimization +--FILE-- +<?php + +function test($x) { + $y = (array) $x; + var_dump(is_array($y)); +} + +$ary = [1, 2]; +$ary[] = 3; +test($ary); +$ary[] = 4; +var_dump($ary); + +?> +--EXPECT-- +bool(true) +array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) +} |