clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed support for references

Browse Source
This commit is contained in:
Dmitry Stogov 2014-07-29 15:29:22 +04:00
parent cad6408a3f
commit 507e3b9193
2 changed files with 66 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_vm_def.h
View File

@ -4840,7 +4840,8 @@ ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -4937,6 +4938,9 @@ ZEND_VM_C_LABEL(num_index_prop):
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (OP1_TYPE == IS_CV || OP1_TYPE == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {

72
Zend/zend_vm_execute.h
View File

@ -4454,7 +4454,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_CONST_HANDLER(ZEND_O
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -6248,7 +6249,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPC
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -6929,7 +6931,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -9840,7 +9843,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPC
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -11515,7 +11519,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCOD
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -12080,7 +12085,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_UNUSED_HANDLER(ZEND_OP
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -16612,7 +16618,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_CONST_HANDLER(ZEND_OPC
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -16709,6 +16716,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -18692,6 +18702,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -20945,7 +20958,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_VAR_HANDLER(ZEND_OPCOD
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -21042,6 +21056,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -22269,7 +22286,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_UNUSED_HANDLER(ZEND_OP
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -24265,6 +24283,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_VAR == IS_CV || IS_VAR == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -25722,6 +25743,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -26998,6 +27022,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -28276,6 +28303,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -30063,6 +30093,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_UNUSED == IS_CV || IS_UNUSED == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -33559,7 +33592,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCO
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -33656,6 +33690,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -35550,6 +35587,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -37683,7 +37723,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -37780,6 +37821,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
@ -38889,7 +38933,8 @@ static int ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPC
} }
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
if (isset && Z_TYPE_P(value) != IS_NULL) { if (isset && Z_TYPE_P(value) != IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1); ZVAL_BOOL(EX_VAR(opline->result.var), 1);
} else { } else {
ZVAL_BOOL(EX_VAR(opline->result.var), 0); ZVAL_BOOL(EX_VAR(opline->result.var), 0);
@ -40747,6 +40792,9 @@ num_index_prop:
result = 0; result = 0;
if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) { if (UNEXPECTED(Z_TYPE_P(offset) != IS_LONG)) {
if (IS_CV == IS_CV || IS_CV == IS_VAR) {
ZVAL_DEREF(offset);
}
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */ if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */ || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) { && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {