Put the garbage in the garbage bin

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index bbee78b98bf9be4e7da8d8cc11377ebd696eb217..fc3a9a8d74389e73abbe976015368167bb423a32 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -28,13 +28,6 @@
 #include "zend_extensions.h"
 
 
-static void destroy_garbage(HashTable *ht)
-{
-       zend_hash_destroy(ht);
-       efree(ht);
-}
-
-
 #define SELECTIVE_PZVAL_LOCK(pzv, pzn)         if (!((pzn)->u.EA.type & EXT_TYPE_UNUSED)) { PZVAL_LOCK(pzv); }
 
 #define get_zval_ptr(node, Ts, should_free, type) _get_zval_ptr(node, Ts, should_free ELS_CC)

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 7f7f292a8f1f00f07c92a2ab6667b03d498bc8b3..5832e531995b23be843170bba77512ed59045943 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -102,8 +102,6 @@ void init_executor(CLS_D ELS_DC)
 
        zend_ptr_stack_init(&EG(argument_stack));
 
-       zend_ptr_stack_init(&EG(garbage));
-
        EG(main_op_array) = NULL;
        zend_hash_init(&EG(symbol_table), 50, NULL, PVAL_PTR_DTOR, 0);
        EG(active_symbol_table) = &EG(symbol_table);
@@ -124,7 +122,6 @@ void shutdown_executor(ELS_D)
                EG(symtable_cache_ptr)--;
        }
        zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_deactivator);
-       zend_ptr_stack_destroy(&EG(garbage));
 
        zend_hash_destroy(&EG(symbol_table));
 

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index cba0f4535870ded00268f5d9e0100e5201061ca4..b7791a2c35e91cd9b2b80eb81f12e864973c53f3 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -196,8 +196,6 @@ struct _zend_executor_globals {
 
        long precision;
 
-       zend_ptr_stack garbage;
-
        /* for extended information support */
        unsigned char no_extensions;