diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-05-04 23:59:17 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-05-04 23:59:17 +0300 |
| commit | 172d8552fc2ddb4e70a03f463f695de174aacf5c (patch) | |
| tree | 8fc637490f4446d077e5a12cf7aaf6bbd0662d67 | |
| parent | 660e88c19d98b8353995d750940d8513bfeca85f (diff) | |
| download | php-git-172d8552fc2ddb4e70a03f463f695de174aacf5c.tar.gz | |
Fixed type inference rules.
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index b853a2e55c..5f039b68dc 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2425,12 +2425,12 @@ static void zend_update_type_info(const zend_op_array *op_array, orig = 0; if (opline->extended_value == ZEND_ASSIGN_OBJ) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = MAY_BE_ANY; t2 = OP1_DATA_INFO(); } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { @@ -2524,7 +2524,7 @@ static void zend_update_type_info(const zend_op_array *op_array, goto unknown_opcode; } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { @@ -2587,7 +2587,7 @@ static void zend_update_type_info(const zend_op_array *op_array, goto unknown_opcode; } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { @@ -2641,7 +2641,7 @@ static void zend_update_type_info(const zend_op_array *op_array, goto unknown_opcode; } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { @@ -2689,7 +2689,7 @@ static void zend_update_type_info(const zend_op_array *op_array, goto unknown_opcode; } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { @@ -2736,7 +2736,7 @@ static void zend_update_type_info(const zend_op_array *op_array, goto unknown_opcode; } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { @@ -2785,7 +2785,7 @@ static void zend_update_type_info(const zend_op_array *op_array, goto unknown_opcode; } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1; + orig = t1 & ~MAY_BE_UNDEF; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { |