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

Fixed support for references

Browse source
This commit is contained in:
Dmitry Stogov 2014-08-14 22:44:25 +04:00
parent e7ffdb2654
commit 773d80c6df
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_vm_def.h
View file

@ -4924,7 +4924,8 @@ ZEND_VM_C_LABEL(num_index_prop):
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }

36
Zend/zend_vm_execute.h
View file

@ -16724,7 +16724,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -18710,7 +18711,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -21067,7 +21069,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -24297,7 +24300,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -25757,7 +25761,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -27036,7 +27041,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -28317,7 +28323,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -30107,7 +30114,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -33709,7 +33717,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -35606,7 +35615,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -37843,7 +37853,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }
@ -40817,7 +40828,8 @@ num_index_prop:
if (opline->extended_value & ZEND_ISSET) { if (opline->extended_value & ZEND_ISSET) {
/* > IS_NULL means not IS_UNDEF and not IS_NULL */ /* > IS_NULL means not IS_UNDEF and not IS_NULL */
result = (value != NULL && Z_TYPE_P(value) > IS_NULL); result = value != NULL && Z_TYPE_P(value) > IS_NULL &&
(!Z_ISREF_P(value) || Z_TYPE_P(Z_REFVAL_P(value)) != IS_NULL);
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ { } else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
result = (value == NULL || !i_zend_is_true(value TSRMLS_CC)); result = (value == NULL || !i_zend_is_true(value TSRMLS_CC));
} }