archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed type inference rules.

Browse source
This commit is contained in:
Dmitry Stogov 2016-05-04 23:59:17 +03:00
parent 660e88c19d
commit 172d8552fc
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/opcache/Optimizer/zend_inference.c
View file

@ -2425,12 +2425,12 @@ static void zend_update_type_info(const zend_op_array *op_array,
orig = 0; orig = 0;
if (opline->extended_value == ZEND_ASSIGN_OBJ) { if (opline->extended_value == ZEND_ASSIGN_OBJ) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = MAY_BE_ANY; t1 = MAY_BE_ANY;
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {
@ -2524,7 +2524,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
goto unknown_opcode; goto unknown_opcode;
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {
@ -2587,7 +2587,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
goto unknown_opcode; goto unknown_opcode;
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {
@ -2641,7 +2641,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
goto unknown_opcode; goto unknown_opcode;
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {
@ -2689,7 +2689,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
goto unknown_opcode; goto unknown_opcode;
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {
@ -2736,7 +2736,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
goto unknown_opcode; goto unknown_opcode;
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {
@ -2785,7 +2785,7 @@ static void zend_update_type_info(const zend_op_array *op_array,
goto unknown_opcode; goto unknown_opcode;
} else if (opline->extended_value == ZEND_ASSIGN_DIM) { } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
tmp = MAY_BE_RC1; tmp = MAY_BE_RC1;
orig = t1; orig = t1 & ~MAY_BE_UNDEF;
t1 = zend_array_element_type(t1, 1, 0); t1 = zend_array_element_type(t1, 1, 0);
t2 = OP1_DATA_INFO(); t2 = OP1_DATA_INFO();
} else { } else {