Commit:    d5c2da57560017c2b4f8951f600d8e6a839568ec
Author:    Dmitry Stogov <dmi...@zend.com>         Thu, 13 Dec 2012 17:51:04 
+0400
Parents:   438cd863783ad4b72fa5ef0df23665b84f97c33f
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=d5c2da57560017c2b4f8951f600d8e6a839568ec

Log:
Removed unreachable code

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 ab40e0b..fedd720 100644
--- 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 7f3420f..50a3ab5 100644
--- 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)) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to