From 131e3a06fba067cb65faa81a7cfb3c509c17d73d Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Tue, 1 Feb 2000 16:02:38 +0000 Subject: [PATCH] - Get rid of remains of garbage. - This should fix Thies' UMR --- Zend/zend_compile.c | 2 ++ Zend/zend_execute_API.c | 1 - Zend/zend_globals.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 3bbacfe2a72..d2505b83ddb 100644 --- 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 a58cdf06cc5..52f0e17f18a 100644 --- 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 9592cb77902..4f7ba35c9d7 100644 --- 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