- Get rid of remains of garbage.

- This should fix Thies' UMR

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3bbacfe2a72d6306928a876a281ec8403590f5af..d2505b83ddb94c2dd15ea89287f069aec6d1937a 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -757,6 +757,8 @@ void do_receive_arg(int op, znode *var, znode *offset, znode *initialization, un
        opline->op1 = *offset;
        if ((op == ZEND_RECV_INIT)) {
                opline->op2 = *initialization;
+       } else {
+               SET_UNUSED(opline->op2);
        }
        if (pass_type==BYREF_FORCE && !CG(active_op_array)->arg_types) {
                int i;

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a58cdf06cc522abb6fcd4a5e3b1f895d518c5499..52f0e17f18a1282188d2fc5e2117081effeb6bd6 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -111,7 +111,6 @@ void init_executor(CLS_D ELS_DC)
        zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_activator);
        EG(opline_ptr) = NULL;
        EG(garbage_ptr) = 0;
-       EG(suspend_garbage) = 0;
 
        zend_hash_init(&EG(imported_files), 5, NULL, NULL, 0);
 

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 9592cb779021b046aeb61d2eceabfd23dedb4876..4f7ba35c9d78335050d046cba6b3434d1457a8d8 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -176,7 +176,6 @@ struct _zend_executor_globals {
 
        zval *garbage[4];
        int garbage_ptr;
-       zend_bool suspend_garbage;
 
        void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 #if SUPPORT_INTERACTIVE