Removed unreachable code

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ab40e0bb21a7d3e3ff888db6a426ffed41ee1969..fedd7204b8ef15cc083349216dfd00498a8c5416 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1880,15 +1880,6 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                zend_throw_exception_internal(NULL TSRMLS_CC);
                                HANDLE_EXCEPTION_LEAVE();
-                       } else if (RETURN_VALUE_USED(opline)) {
-                               if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                                       zval *retval;
-
-                                       ALLOC_ZVAL(retval);
-                                       ZVAL_BOOL(retval, 1);
-                                       INIT_PZVAL(retval);
-                                       EX_T(opline->result.var).var.ptr = retval;
-                               }
                        }
 
                        ZEND_VM_INC_OPCODE();
@@ -3857,15 +3848,6 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
                if (UNEXPECTED(EG(exception) != NULL)) {
                        zend_throw_exception_internal(NULL TSRMLS_CC);
                        HANDLE_EXCEPTION();
-               } else if (RETURN_VALUE_USED(opline)) {
-                       if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                               zval *retval;
-
-                               ALLOC_ZVAL(retval);
-                               ZVAL_BOOL(retval, 1);
-                               INIT_PZVAL(retval);
-                               EX_T(opline->result.var).var.ptr = retval;
-                       }
                }
 
        } else if (RETURN_VALUE_USED(opline)) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7f3420f93a8591366272ba4bf72a1f17eb0cb6c3..50a3ab525eb21a9f2d4763e81865b43b9a3e69a2 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -421,15 +421,6 @@ static int ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                zend_throw_exception_internal(NULL TSRMLS_CC);
                                HANDLE_EXCEPTION_LEAVE();
-                       } else if (RETURN_VALUE_USED(opline)) {
-                               if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                                       zval *retval;
-
-                                       ALLOC_ZVAL(retval);
-                                       ZVAL_BOOL(retval, 1);
-                                       INIT_PZVAL(retval);
-                                       EX_T(opline->result.var).var.ptr = retval;
-                               }
                        }
 
                        ZEND_VM_INC_OPCODE();
@@ -2735,15 +2726,6 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA
                if (UNEXPECTED(EG(exception) != NULL)) {
                        zend_throw_exception_internal(NULL TSRMLS_CC);
                        HANDLE_EXCEPTION();
-               } else if (RETURN_VALUE_USED(opline)) {
-                       if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                               zval *retval;
-
-                               ALLOC_ZVAL(retval);
-                               ZVAL_BOOL(retval, 1);
-                               INIT_PZVAL(retval);
-                               EX_T(opline->result.var).var.ptr = retval;
-                       }
                }
 
        } else if (RETURN_VALUE_USED(opline)) {
@@ -8058,15 +8040,6 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HAND
                if (UNEXPECTED(EG(exception) != NULL)) {
                        zend_throw_exception_internal(NULL TSRMLS_CC);
                        HANDLE_EXCEPTION();
-               } else if (RETURN_VALUE_USED(opline)) {
-                       if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                               zval *retval;
-
-                               ALLOC_ZVAL(retval);
-                               ZVAL_BOOL(retval, 1);
-                               INIT_PZVAL(retval);
-                               EX_T(opline->result.var).var.ptr = retval;
-                       }
                }
 
        } else if (RETURN_VALUE_USED(opline)) {
@@ -13393,15 +13366,6 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND
                if (UNEXPECTED(EG(exception) != NULL)) {
                        zend_throw_exception_internal(NULL TSRMLS_CC);
                        HANDLE_EXCEPTION();
-               } else if (RETURN_VALUE_USED(opline)) {
-                       if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                               zval *retval;
-
-                               ALLOC_ZVAL(retval);
-                               ZVAL_BOOL(retval, 1);
-                               INIT_PZVAL(retval);
-                               EX_T(opline->result.var).var.ptr = retval;
-                       }
                }
 
        } else if (RETURN_VALUE_USED(opline)) {
@@ -30967,15 +30931,6 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
                if (UNEXPECTED(EG(exception) != NULL)) {
                        zend_throw_exception_internal(NULL TSRMLS_CC);
                        HANDLE_EXCEPTION();
-               } else if (RETURN_VALUE_USED(opline)) {
-                       if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
-                               zval *retval;
-
-                               ALLOC_ZVAL(retval);
-                               ZVAL_BOOL(retval, 1);
-                               INIT_PZVAL(retval);
-                               EX_T(opline->result.var).var.ptr = retval;
-                       }
                }
 
        } else if (RETURN_VALUE_USED(opline)) {