com php-src: Cleanup: Zend/zend_vm_def.h Zend/zend_vm _execute.h
| From: | Dmitry Stogov | Date: | Fri, 21 Mar 2014 17:48:38 +0000 |
| Subject: | com php-src: Cleanup: Zend/zend_vm_def.h Zend/zend_vm _execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77564@lists.php.net to get a copy of this message | ||
Commit: c36294c4daa419d6e31f1deb47ab2009bdd3fa3a
Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Mar 2014 21:48:38 +0400
Parents: b4b728fe85445eba99f3811f3ce1141ae83c503e
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c36294c4daa419d6e31f1deb47ab2009bdd3fa3a
Log:
Cleanup
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 9634815..37bd910 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5597,7 +5597,7 @@ ZEND_VM_HANDLER(159, ZEND_DISCARD_EXCEPTION, ANY, ANY)
{
if (EX(delayed_exception) != NULL) {
/* discard the previously thrown exception */
-//??? zval_ptr_dtor(EX(delayed_exception));
+ OBJ_RELEASE(EX(delayed_exception));
EX(delayed_exception) = NULL;
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 46394f4..c61ad64 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1323,7 +1323,7 @@ static int ZEND_FASTCALL
ZEND_DISCARD_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLE
{
if (EX(delayed_exception) != NULL) {
/* discard the previously thrown exception */
-//??? zval_ptr_dtor(EX(delayed_exception));
+ OBJ_RELEASE(EX(delayed_exception));
EX(delayed_exception) = NULL;
}