1
0
mirror of https://github.com/php/php-src.git synced 2026-04-11 10:03:18 +02:00

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix type inference for assign to string offset with invalid index.
This commit is contained in:
Dmitry Stogov
2022-01-10 16:05:01 +03:00

View File

@@ -2667,7 +2667,7 @@ static zend_always_inline int _zend_update_type_info(
if (ssa_op->result_def >= 0) {
tmp = 0;
if (t1 & MAY_BE_STRING) {
tmp |= MAY_BE_STRING;
tmp |= MAY_BE_STRING | MAY_BE_NULL;
}
if (t1 & (MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL|MAY_BE_UNDEF)) {
tmp |= (OP1_DATA_INFO() & (MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF));