php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 01:23:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

ifixed foreach() by reference

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-26 15:38:58 +04:00
parent ff1778a89f
commit 6829be6c26
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_vm_def.h
View File

@@ -4200,6 +4200,7 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
SEPARATE_ZVAL(array_ptr);
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ZVAL_NEW_REF(array_ptr, array_ptr);
array_ptr = Z_REFVAL_P(array_ptr);
}
}
}
@@ -4448,12 +4449,9 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
}
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
SEPARATE_ZVAL_IF_NOT_REF(value);
ZVAL_NEW_REF(value, value);
Z_ADDREF_P(value);
} else {
ZVAL_COPY(EX_VAR(opline->result.var), value);
SEPARATE_ZVAL_TO_MAKE_IS_REF(value);
}
ZVAL_COPY(EX_VAR(opline->result.var), value);
CHECK_EXCEPTION();
ZEND_VM_INC_OPCODE();

11
Zend/zend_vm_execute.h
View File

@@ -2991,6 +2991,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
SEPARATE_ZVAL(array_ptr);
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ZVAL_NEW_REF(array_ptr, array_ptr);
array_ptr = Z_REFVAL_P(array_ptr);
}
}
}
@@ -8045,6 +8046,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
SEPARATE_ZVAL(array_ptr);
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ZVAL_NEW_REF(array_ptr, array_ptr);
array_ptr = Z_REFVAL_P(array_ptr);
}
}
}
@@ -13151,6 +13153,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
SEPARATE_ZVAL(array_ptr);
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ZVAL_NEW_REF(array_ptr, array_ptr);
array_ptr = Z_REFVAL_P(array_ptr);
}
}
}
@@ -13399,12 +13402,9 @@ static int ZEND_FASTCALL ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
}
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
SEPARATE_ZVAL_IF_NOT_REF(value);
ZVAL_NEW_REF(value, value);
Z_ADDREF_P(value);
} else {
ZVAL_COPY(EX_VAR(opline->result.var), value);
SEPARATE_ZVAL_TO_MAKE_IS_REF(value);
}
ZVAL_COPY(EX_VAR(opline->result.var), value);
CHECK_EXCEPTION();
ZEND_VM_INC_OPCODE();
@@ -30045,6 +30045,7 @@ static int ZEND_FASTCALL ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
SEPARATE_ZVAL(array_ptr);
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ZVAL_NEW_REF(array_ptr, array_ptr);
array_ptr = Z_REFVAL_P(array_ptr);
}
}
}