Skip to content

Commit 38956a3

Browse files
authored
Drop unused class_cleanup_handlers (#23696)
This is only ever written to, but never read, and since this is static, no other translation unit or module can access this too.
1 parent 073853e commit 38956a3

1 file changed

Lines changed: 0 additions & 29 deletions

File tree

Zend/zend_API.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ static zend_module_entry **module_request_shutdown_handlers;
4747
static zend_module_entry **module_post_deactivate_handlers;
4848
static zend_module_entry **modules_dl_loaded;
4949

50-
static zend_class_entry **class_cleanup_handlers;
51-
5250
ZEND_API void zend_set_dl_use_deepbind(bool use_deepbind)
5351
{
5452
zend_dl_use_deepbind = use_deepbind;
@@ -2561,8 +2559,6 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
25612559
int shutdown_count = 0;
25622560
int post_deactivate_count = 0;
25632561
int dl_loaded_count = 0;
2564-
zend_class_entry *ce;
2565-
int class_count = 0;
25662562

25672563
/* Collect extensions with request startup/shutdown handlers */
25682564
ZEND_HASH_MAP_FOREACH_PTR(&module_registry, module) {
@@ -2609,29 +2605,6 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
26092605
modules_dl_loaded[--dl_loaded_count] = module;
26102606
}
26112607
} ZEND_HASH_FOREACH_END();
2612-
2613-
/* Collect internal classes with static members */
2614-
ZEND_HASH_MAP_FOREACH_PTR(CG(class_table), ce) {
2615-
if (ce->type == ZEND_INTERNAL_CLASS &&
2616-
ce->default_static_members_count > 0) {
2617-
class_count++;
2618-
}
2619-
} ZEND_HASH_FOREACH_END();
2620-
2621-
class_cleanup_handlers = (zend_class_entry**)perealloc(
2622-
class_cleanup_handlers,
2623-
sizeof(zend_class_entry*) *
2624-
(class_count + 1), true);
2625-
class_cleanup_handlers[class_count] = NULL;
2626-
2627-
if (class_count) {
2628-
ZEND_HASH_MAP_FOREACH_PTR(CG(class_table), ce) {
2629-
if (ce->type == ZEND_INTERNAL_CLASS &&
2630-
ce->default_static_members_count > 0) {
2631-
class_cleanup_handlers[--class_count] = ce;
2632-
}
2633-
} ZEND_HASH_FOREACH_END();
2634-
}
26352608
}
26362609
/* }}} */
26372610

@@ -2644,8 +2617,6 @@ ZEND_API void zend_startup_modules(void) /* {{{ */
26442617

26452618
ZEND_API void zend_destroy_modules(void) /* {{{ */
26462619
{
2647-
free(class_cleanup_handlers);
2648-
class_cleanup_handlers = NULL;
26492620
free(module_request_startup_handlers);
26502621
module_request_startup_handlers = NULL;
26512622
zend_hash_graceful_reverse_destroy(&module_registry);

0 commit comments

Comments
 (0)