diff options
| author | Nikita Popov <nikic@php.net> | 2016-07-14 18:39:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-07-14 18:39:48 +0200 |
| commit | 0bda0422af0a9a920135bf3d7b7b4784eb0df802 (patch) | |
| tree | 53c9577143b24f034fb560c97f904077c2f63ba1 /Zend/zend_execute.c | |
| parent | 5aaffb79084ba929675a7e8543f91ff324439939 (diff) | |
| parent | 411eee7b5ae8b529b10184f98e3f9b02d93ba864 (diff) | |
| download | php-git-0bda0422af0a9a920135bf3d7b7b4784eb0df802.tar.gz | |
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_vm_execute.h
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index d1c73917ca..a81ebba418 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2380,9 +2380,12 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL || opline->opcode == ZEND_INIT_FCALL_BY_NAME || + opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || opline->opcode == ZEND_INIT_DYNAMIC_CALL || + opline->opcode == ZEND_INIT_USER_CALL || opline->opcode == ZEND_INIT_METHOD_CALL || - opline->opcode == ZEND_INIT_STATIC_METHOD_CALL)) { + opline->opcode == ZEND_INIT_STATIC_METHOD_CALL || + opline->opcode == ZEND_NEW)) { ZEND_ASSERT(op_num); opline--; } |