diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-05 11:40:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-05 11:40:45 +0200 |
| commit | 920283ff2b02de4a8affc48c75e5481c381ca56e (patch) | |
| tree | ccab590be85c7a4c81e628983af15a451f70453f | |
| parent | 3ec87769408cf21d7b1d399cc6b62c1e9b9bf451 (diff) | |
| parent | c353f17d4251f185d8fdb756991782671b0e2ac6 (diff) | |
| download | php-git-920283ff2b02de4a8affc48c75e5481c381ca56e.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 10 | ||||
| -rw-r--r-- | ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt | 20 |
2 files changed, 28 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index b352ab0889..e37ab32681 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -3227,6 +3227,9 @@ static int zend_update_type_info(const zend_op_array *op_array, case ZEND_FETCH_DIM_RW: case ZEND_FETCH_DIM_FUNC_ARG: case ZEND_FETCH_LIST_W: + case ZEND_ASSIGN_DIM: + tmp |= MAY_BE_ARRAY | MAY_BE_ARRAY_OF_ARRAY; + break; case ZEND_ASSIGN_ADD: case ZEND_ASSIGN_SUB: case ZEND_ASSIGN_MUL: @@ -3239,8 +3242,11 @@ static int zend_update_type_info(const zend_op_array *op_array, case ZEND_ASSIGN_BW_AND: case ZEND_ASSIGN_BW_XOR: case ZEND_ASSIGN_POW: - case ZEND_ASSIGN_DIM: - tmp |= MAY_BE_ARRAY | MAY_BE_ARRAY_OF_ARRAY; + if (op_array->opcodes[j].extended_value == ZEND_ASSIGN_DIM) { + tmp |= MAY_BE_ARRAY | MAY_BE_ARRAY_OF_ARRAY; + } else if (op_array->opcodes[j].extended_value == ZEND_ASSIGN_OBJ) { + tmp |= MAY_BE_ARRAY_OF_OBJECT; + } break; case ZEND_FETCH_OBJ_W: case ZEND_FETCH_OBJ_RW: diff --git a/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt b/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt new file mode 100644 index 0000000000..c89d0bea62 --- /dev/null +++ b/ext/opcache/tests/assign_obj_op_of_fetch_dim.phpt @@ -0,0 +1,20 @@ +--TEST-- +Type inference for $ary[$idx]->prop += +--FILE-- +<?php + +function test() { + $ary = []; + $ary[0]->y += 2; + var_dump(is_object($ary[0])); +} +test(); + +?> +--EXPECTF-- +Notice: Undefined offset: 0 in %s on line %d + +Warning: Creating default object from empty value in %s on line %d + +Notice: Undefined property: stdClass::$y in %s on line %d +bool(true) |