]> granicus.if.org Git - php/commitdiff
Removed useless code
authorDmitry Stogov <dmitry@zend.com>
Thu, 12 May 2016 13:46:37 +0000 (16:46 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 12 May 2016 13:46:37 +0000 (16:46 +0300)
Zend/zend_execute.h

index 9cca85c4cf5274c24af401d1c247982f88943157..88c9461dc5a24f02b961847800766135f5f3a639 100644 (file)
@@ -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;
        }