Skip to content

Commit 5d62837

Browse files
committed
Merge branch 'master' into opcodefy-call
* master: Fixed GOTO executor Fixed typo Changed ArrayIterator implementation using zend_hash_iterator_... API. Allowed modification of itterated ArrayObject using the same behavior as proposed in `Fix "foreach" behavior`. Removed "Array was modified outside object and internal position is no longer valid" hack.
2 parents 83e749f + 690843f commit 5d62837

File tree

8 files changed

+70
-139
lines changed

8 files changed

+70
-139
lines changed

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
. Implemented the RFC `Group Use Declarations`. (Marcio)
6969
. Implemented the RFC `Continue Output Buffering`. (Mike)
7070
. Implemented the RFC `Constructor behaviour of internal classes`. (Dan, Dmitry)
71+
. Implemented the RFC `Fix "foreach" behavior`. (Dmitry)
7172

7273
- Curl:
7374
. Fixed bug #68937 (Segfault in curl_multi_exec). (Laruence)
@@ -163,6 +164,10 @@
163164
. Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes). (Laruence)
164165

165166
- SPL:
167+
. Changed ArrayIterator implementation using zend_hash_iterator_... API.
168+
Allowed modification of iterated ArrayObject using the same behavior
169+
as proposed in `Fix "foreach" behavior`. Removed "Array was modified
170+
outside object and internal position is no longer valid" hack. (Dmitry)
166171
. Implemented #67886 (SplPriorityQueue/SplHeap doesn't expose extractFlags
167172
nor curruption state). (Julien)
168173
. Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME

Zend/zend_vm_gen.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,6 +1531,12 @@ function gen_vm($def, $skel) {
15311531
out($f, "#endif\n");
15321532
out($f, "\treturn ret;\n");
15331533
out($f, "}\n\n");
1534+
} else {
1535+
out($f, "ZEND_API int zend_vm_call_opcode_handler(zend_execute_data* ex)\n");
1536+
out($f, "{\n");
1537+
out($f, "\tzend_error_noreturn(E_CORE_ERROR, \"zend_vm_call_opcode_handler() is not supported\");\n");
1538+
out($f, "\treturn 0;\n");
1539+
out($f, "}\n\n");
15341540
}
15351541

15361542
// Export handlers and helpers

0 commit comments

Comments
 (0)