summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2016-05-12 16:46:37 +0300
committerDmitry Stogov <dmitry@zend.com>2016-05-12 16:46:37 +0300
commit4652fe18c7d8c4c9a692c006f81febf38bdf4cb9 (patch)
treecc22687de8b6f4fcfdfbac91d08ff08ee07eca0f /Zend/zend_execute.h
parent468b2e673f11e5a52aab6f111ec4cd71394efd30 (diff)
downloadphp-git-4652fe18c7d8c4c9a692c006f81febf38bdf4cb9.tar.gz
Removed useless code
Diffstat (limited to 'Zend/zend_execute.h')
-rw-r--r--Zend/zend_execute.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 9cca85c4cf..88c9461dc5 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -260,20 +260,15 @@ static zend_always_inline void zend_vm_stack_free_call_frame_ex(uint32_t call_in
ZEND_ASSERT_VM_STACK_GLOBAL;
if (UNEXPECTED(call_info & ZEND_CALL_ALLOCATED)) {
- if (UNEXPECTED(call != (zend_execute_data*)ZEND_VM_STACK_ELEMENTS(EG(vm_stack)))) {
- /* This is a generator's stack frame */
- efree(call);
- return;
- }
- zend_vm_stack p = EG(vm_stack);
+ ZEND_ASSERT(call == (zend_execute_data*)ZEND_VM_STACK_ELEMENTS(EG(vm_stack)));
+ zend_vm_stack p = EG(vm_stack);
zend_vm_stack prev = p->prev;
EG(vm_stack_top) = prev->top;
EG(vm_stack_end) = prev->end;
EG(vm_stack) = prev;
efree(p);
-
} else {
EG(vm_stack_top) = (zval*)call;
}