Skip to content

Commit 27dfd6c

Browse files
committed
feat: Remove unreachable code after zend_error_noreturn calls.
1 parent 270c894 commit 27dfd6c

File tree

6 files changed

+0
-12
lines changed

6 files changed

+0
-12
lines changed

Zend/zend_API.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,8 +2429,6 @@ ZEND_API zend_result zend_startup_module_ex(zend_module_entry *module) /* {{{ */
24292429
EG(current_module) = module;
24302430
if (module->module_startup_func(module->type, module->module_number)==FAILURE) {
24312431
zend_error_noreturn(E_CORE_ERROR,"Unable to start %s module", module->name);
2432-
EG(current_module) = NULL;
2433-
return FAILURE;
24342432
}
24352433
EG(current_module) = NULL;
24362434
}

Zend/zend_compile.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10281,7 +10281,6 @@ static bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */
1028110281
goto fail;
1028210282
default:
1028310283
zend_error_noreturn(E_COMPILE_ERROR, "Illegal offset type");
10284-
break;
1028510284
}
1028610285
} else if (!zend_hash_next_index_insert(Z_ARRVAL_P(result), value)) {
1028710286
fail:

Zend/zend_vm_execute.h

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/pdo/pdo.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,9 @@ PDO_API zend_result php_pdo_register_driver(const pdo_driver_t *driver) /* {{{ *
115115
if (driver->api_version != PDO_DRIVER_API) {
116116
zend_error_noreturn(E_ERROR, "PDO: driver %s requires PDO API version " ZEND_ULONG_FMT "; this is PDO version %d",
117117
driver->driver_name, driver->api_version, PDO_DRIVER_API);
118-
return FAILURE;
119118
}
120119
if (!zend_hash_str_exists(&module_registry, "pdo", sizeof("pdo") - 1)) {
121120
zend_error_noreturn(E_ERROR, "The PDO extension must be loaded first in order to load PDO drivers");
122-
return FAILURE; /* NOTREACHED */
123121
}
124122

125123
return zend_hash_str_add_ptr(&pdo_driver_hash, driver->driver_name, driver->driver_name_len, (void*)driver) != NULL ? SUCCESS : FAILURE;
@@ -141,7 +139,6 @@ PDO_API zend_result php_pdo_register_driver_specific_ce(const pdo_driver_t *driv
141139
{
142140
if (!zend_hash_str_exists(&module_registry, "pdo", sizeof("pdo") - 1)) {
143141
zend_error_noreturn(E_ERROR, "The PDO extension must be loaded first in order to load PDO drivers");
144-
return FAILURE; /* NOTREACHED */
145142
}
146143

147144
return zend_hash_str_add_ptr(&pdo_driver_specific_ce_hash, driver->driver_name,

ext/pgsql/pgsql.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3676,7 +3676,6 @@ PHP_FUNCTION(pg_unescape_bytea)
36763676
tmp = (char *)PQunescapeBytea((unsigned char*)from, &to_len);
36773677
if (!tmp) {
36783678
zend_error_noreturn(E_ERROR, "Out of memory");
3679-
return;
36803679
}
36813680

36823681
RETVAL_STRINGL(tmp, to_len);

main/output.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ PHPAPI zend_result php_output_handler_conflict_register(const char *name, size_t
605605

606606
if (!EG(current_module)) {
607607
zend_error_noreturn(E_ERROR, "Cannot register an output handler conflict outside of MINIT");
608-
return FAILURE;
609608
}
610609
str = zend_string_init_interned(name, name_len, 1);
611610
zend_hash_update_ptr(&php_output_handler_conflicts, str, check_func);
@@ -622,7 +621,6 @@ PHPAPI zend_result php_output_handler_reverse_conflict_register(const char *name
622621

623622
if (!EG(current_module)) {
624623
zend_error_noreturn(E_ERROR, "Cannot register a reverse output handler conflict outside of MINIT");
625-
return FAILURE;
626624
}
627625

628626
if (NULL != (rev_ptr = zend_hash_str_find_ptr(&php_output_handler_reverse_conflicts, name, name_len))) {
@@ -659,7 +657,6 @@ PHPAPI zend_result php_output_handler_alias_register(const char *name, size_t na
659657

660658
if (!EG(current_module)) {
661659
zend_error_noreturn(E_ERROR, "Cannot register an output handler alias outside of MINIT");
662-
return FAILURE;
663660
}
664661
str = zend_string_init_interned(name, name_len, 1);
665662
zend_hash_update_ptr(&php_output_handler_aliases, str, func);

0 commit comments

Comments
 (0)