- Second part of removing temp solution

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index dda89e9a4a1862cca4c16d6b54102dfbfe11d1ae..89ca48fb57b6efaa2bde144f71972c60203c9032 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2081,9 +2081,6 @@ static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
 
-       if (EG(exception)) {
-               ZEND_VM_RETURN();
-       }
        if (IS_CONST != IS_UNUSED) {
                zval *ptr;
                zend_free_op free_op1;
@@ -4543,9 +4540,6 @@ static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
 
-       if (EG(exception)) {
-               ZEND_VM_RETURN();
-       }
        if (IS_TMP_VAR != IS_UNUSED) {
                zval *ptr;
                zend_free_op free_op1;
@@ -7758,9 +7752,6 @@ static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
 
-       if (EG(exception)) {
-               ZEND_VM_RETURN();
-       }
        if (IS_VAR != IS_UNUSED) {
                zval *ptr;
                zend_free_op free_op1;
@@ -13300,9 +13291,6 @@ static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
 
-       if (EG(exception)) {
-               ZEND_VM_RETURN();
-       }
        if (IS_UNUSED != IS_UNUSED) {
                zval *ptr;
                zend_free_op free_op1;
@@ -18416,9 +18404,6 @@ static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
 
-       if (EG(exception)) {
-               ZEND_VM_RETURN();
-       }
        if (IS_CV != IS_UNUSED) {
                zval *ptr;
                zend_free_op free_op1;
@@ -30975,9 +30960,6 @@ static int ZEND_EXIT_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
 
-       if (EG(exception)) {
-               ZEND_VM_RETURN();
-       }
        if (opline->op1.op_type != IS_UNUSED) {
                zval *ptr;
                zend_free_op free_op1;