Skip to content

Commit 5341dc8

Browse files
committed
Remove useless zend_exception_save() from ZEND_THROW
We're executing in the VM, so EG(exception) has to be unset. ZEND_THROW itself already has HANDLE_EXCEPTION() calls when it throws, i.e. when the subject is not a throwable object.
1 parent 0b145f5 commit 5341dc8

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Zend/zend_vm_def.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4797,7 +4797,7 @@ ZEND_VM_COLD_CONST_HANDLER(108, ZEND_THROW, CONST|TMPVAR|CV, ANY)
47974797
}
47984798
} while (0);
47994799

4800-
zend_exception_save();
4800+
ZEND_ASSERT(!EG(exception));
48014801
Z_TRY_ADDREF_P(value);
48024802
zend_throw_exception_object(value);
48034803
zend_exception_restore();

Zend/zend_vm_execute.h

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)