From: Marcus Boerger <helly@php.net>
Date: Thu, 24 Mar 2005 23:56:14 +0000 (+0000)
Subject: - Second part of removing temp solution
X-Git-Tag: php-5.0.1b1~688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f16ad98c9626a022c0ce25ec0bf91961f324966;p=php

- Second part of removing temp solution
---

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index dda89e9a4a..89ca48fb57 100644
--- 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;