Skip to content

Commit d5c2da5

Browse files
committed
Removed unreachable code
1 parent 438cd86 commit d5c2da5

File tree

2 files changed

+0
-63
lines changed

2 files changed

+0
-63
lines changed

Zend/zend_vm_def.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,15 +1880,6 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
18801880
if (UNEXPECTED(EG(exception) != NULL)) {
18811881
zend_throw_exception_internal(NULL TSRMLS_CC);
18821882
HANDLE_EXCEPTION_LEAVE();
1883-
} else if (RETURN_VALUE_USED(opline)) {
1884-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
1885-
zval *retval;
1886-
1887-
ALLOC_ZVAL(retval);
1888-
ZVAL_BOOL(retval, 1);
1889-
INIT_PZVAL(retval);
1890-
EX_T(opline->result.var).var.ptr = retval;
1891-
}
18921883
}
18931884

18941885
ZEND_VM_INC_OPCODE();
@@ -3857,15 +3848,6 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
38573848
if (UNEXPECTED(EG(exception) != NULL)) {
38583849
zend_throw_exception_internal(NULL TSRMLS_CC);
38593850
HANDLE_EXCEPTION();
3860-
} else if (RETURN_VALUE_USED(opline)) {
3861-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
3862-
zval *retval;
3863-
3864-
ALLOC_ZVAL(retval);
3865-
ZVAL_BOOL(retval, 1);
3866-
INIT_PZVAL(retval);
3867-
EX_T(opline->result.var).var.ptr = retval;
3868-
}
38693851
}
38703852

38713853
} else if (RETURN_VALUE_USED(opline)) {

Zend/zend_vm_execute.h

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -421,15 +421,6 @@ static int ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
421421
if (UNEXPECTED(EG(exception) != NULL)) {
422422
zend_throw_exception_internal(NULL TSRMLS_CC);
423423
HANDLE_EXCEPTION_LEAVE();
424-
} else if (RETURN_VALUE_USED(opline)) {
425-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
426-
zval *retval;
427-
428-
ALLOC_ZVAL(retval);
429-
ZVAL_BOOL(retval, 1);
430-
INIT_PZVAL(retval);
431-
EX_T(opline->result.var).var.ptr = retval;
432-
}
433424
}
434425

435426
ZEND_VM_INC_OPCODE();
@@ -2735,15 +2726,6 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA
27352726
if (UNEXPECTED(EG(exception) != NULL)) {
27362727
zend_throw_exception_internal(NULL TSRMLS_CC);
27372728
HANDLE_EXCEPTION();
2738-
} else if (RETURN_VALUE_USED(opline)) {
2739-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
2740-
zval *retval;
2741-
2742-
ALLOC_ZVAL(retval);
2743-
ZVAL_BOOL(retval, 1);
2744-
INIT_PZVAL(retval);
2745-
EX_T(opline->result.var).var.ptr = retval;
2746-
}
27472729
}
27482730

27492731
} else if (RETURN_VALUE_USED(opline)) {
@@ -8058,15 +8040,6 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HAND
80588040
if (UNEXPECTED(EG(exception) != NULL)) {
80598041
zend_throw_exception_internal(NULL TSRMLS_CC);
80608042
HANDLE_EXCEPTION();
8061-
} else if (RETURN_VALUE_USED(opline)) {
8062-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
8063-
zval *retval;
8064-
8065-
ALLOC_ZVAL(retval);
8066-
ZVAL_BOOL(retval, 1);
8067-
INIT_PZVAL(retval);
8068-
EX_T(opline->result.var).var.ptr = retval;
8069-
}
80708043
}
80718044

80728045
} else if (RETURN_VALUE_USED(opline)) {
@@ -13393,15 +13366,6 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND
1339313366
if (UNEXPECTED(EG(exception) != NULL)) {
1339413367
zend_throw_exception_internal(NULL TSRMLS_CC);
1339513368
HANDLE_EXCEPTION();
13396-
} else if (RETURN_VALUE_USED(opline)) {
13397-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
13398-
zval *retval;
13399-
13400-
ALLOC_ZVAL(retval);
13401-
ZVAL_BOOL(retval, 1);
13402-
INIT_PZVAL(retval);
13403-
EX_T(opline->result.var).var.ptr = retval;
13404-
}
1340513369
}
1340613370

1340713371
} else if (RETURN_VALUE_USED(opline)) {
@@ -30967,15 +30931,6 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
3096730931
if (UNEXPECTED(EG(exception) != NULL)) {
3096830932
zend_throw_exception_internal(NULL TSRMLS_CC);
3096930933
HANDLE_EXCEPTION();
30970-
} else if (RETURN_VALUE_USED(opline)) {
30971-
if (!EX_T(opline->result.var).var.ptr) { /* there was no return statement */
30972-
zval *retval;
30973-
30974-
ALLOC_ZVAL(retval);
30975-
ZVAL_BOOL(retval, 1);
30976-
INIT_PZVAL(retval);
30977-
EX_T(opline->result.var).var.ptr = retval;
30978-
}
3097930934
}
3098030935

3098130936
} else if (RETURN_VALUE_USED(opline)) {

0 commit comments

Comments
 (0)