2011-05-06 Ivan Maidanski <ivmai@mail.ru>

	* dbg_mlc.c (GC_has_other_debug_info): Change return type to int;
	return -1 if the object has (or had) debugging info but was
	marked deallocated.
	* include/private/dbg_mlc.h (GC_has_other_debug_info): Ditto.
	* dbg_mlc.c (GC_has_other_debug_info): Update documentation;
	remove "ohdr" local variable.
	* dbg_mlc.c (GC_debug_free): Don't call GC_free if the object has
	probably been deallocated.
	* dbg_mlc.c (GC_debug_free): Don't actually free the object even
	in the leak-finding mode if GC_findleak_delay_free.
	* dbg_mlc.c (GC_print_all_smashed_proc): Print a trailing blank
	line.
	* dbg_mlc.c (GC_check_leaked): New function (only unless
	SHORT_DBG_HDRS).
	* doc/README.environment (GC_FINDLEAK_DELAY_FREE): Document.
	* doc/README.macros (GC_FINDLEAK_DELAY_FREE): Ditto.
	* include/private/dbg_mlc.h (START_FLAG, END_FLAG): Use GC_WORD_C
	on 64-bit architectures.
	* include/private/dbg_mlc.h (NOT_MARKED): Remove redundant
	parentheses.
	* include/private/dbg_mlc.h (GC_HAS_DEBUG_INFO): Update (due to
	GC_has_other_debug_info change).
	* include/private/gc_priv.h (GC_findleak_delay_free): New global
	variable declaration (unless SHORT_DBG_HDRS).
	* misc.c (GC_findleak_delay_free): New global variable; recognize
	GC_FINDLEAK_DELAY_FREE.
	* misc.c (GC_init): Recognize GC_FINDLEAK_DELAY_FREE environment
	variable (unless SHORT_DBG_HDRS).
	* reclaim.c (GC_check_leaked): Declare (unless SHORT_DBG_HDRS).
	* reclaim.c (GC_add_leaked): Don't add the object to leaked list
	if marked as deallocated.

2 files changed, 102 insertions, 92 deletions

diff --git a/include/private/dbg_mlc.h b/include/private/dbg_mlc.h
index a6f2ef6a..7b2969d2 100644
--- a/include/private/dbg_mlc.h
+++ b/include/private/dbg_mlc.h
@@ -25,92 +25,96 @@
 #ifndef _DBG_MLC_H
 #define _DBG_MLC_H
 
-# include "gc_priv.h"
-# ifdef KEEP_BACK_PTRS
-#   include "gc_backptr.h"
-# endif
+#include "gc_priv.h"
+#ifdef KEEP_BACK_PTRS
+# include "gc_backptr.h"
+#endif
 
-# define START_FLAG ((word)0xfedcedcb)
-# define END_FLAG ((word)0xbcdecdef)
+#if CPP_WORDSZ == 32
+# define START_FLAG (word)0xfedcedcb
+# define END_FLAG (word)0xbcdecdef
+#else
+# define START_FLAG GC_WORD_C(0xFEDCEDCBfedcedcb)
+# define END_FLAG GC_WORD_C(0xBCDECDEFbcdecdef)
+#endif
         /* Stored both one past the end of user object, and one before  */
         /* the end of the object as seen by the allocator.              */
 
-# if defined(KEEP_BACK_PTRS) || defined(PRINT_BLACK_LIST) \
-     || defined(MAKE_BACK_GRAPH)
-    /* Pointer "source"s that aren't real locations.    */
-    /* Used in oh_back_ptr fields and as "source"       */
-    /* argument to some marking functions.              */
-#       define NOT_MARKED (ptr_t)(0)
-#       define MARKED_FOR_FINALIZATION ((ptr_t)(word)2)
-            /* Object was marked because it is finalizable.     */
-#       define MARKED_FROM_REGISTER ((ptr_t)(word)4)
-            /* Object was marked from a register.  Hence the    */
-            /* source of the reference doesn't have an address. */
-# endif /* KEEP_BACK_PTRS || PRINT_BLACK_LIST */
+#if defined(KEEP_BACK_PTRS) || defined(PRINT_BLACK_LIST) \
+    || defined(MAKE_BACK_GRAPH)
+  /* Pointer "source"s that aren't real locations.      */
+  /* Used in oh_back_ptr fields and as "source"         */
+  /* argument to some marking functions.                */
+# define NOT_MARKED (ptr_t)0
+# define MARKED_FOR_FINALIZATION ((ptr_t)(word)2)
+                /* Object was marked because it is finalizable. */
+# define MARKED_FROM_REGISTER ((ptr_t)(word)4)
+                /* Object was marked from a register.  Hence the        */
+                /* source of the reference doesn't have an address.     */
+#endif /* KEEP_BACK_PTRS || PRINT_BLACK_LIST */
 
 /* Object header */
 typedef struct {
-#   if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
-        /* We potentially keep two different kinds of back      */
-        /* pointers.  KEEP_BACK_PTRS stores a single back       */
-        /* pointer in each reachable object to allow reporting  */
-        /* of why an object was retained.  MAKE_BACK_GRAPH      */
-        /* builds a graph containing the inverse of all         */
-        /* "points-to" edges including those involving          */
-        /* objects that have just become unreachable. This      */
-        /* allows detection of growing chains of unreachable    */
-        /* objects.  It may be possible to eventually combine   */
-        /* both, but for now we keep them separate.  Both       */
-        /* kinds of back pointers are hidden using the          */
-        /* following macros.  In both cases, the plain version  */
-        /* is constrained to have an least significant bit of 1,*/
-        /* to allow it to be distinguished from a free list     */
-        /* link.  This means the plain version must have an     */
-        /* lsb of 0.                                            */
-        /* Note that blocks dropped by black-listing will       */
-        /* also have the lsb clear once debugging has           */
-        /* started.                                             */
-        /* We're careful never to overwrite a value with lsb 0. */
-#       if ALIGNMENT == 1
-          /* Fudge back pointer to be even.  */
-#         define HIDE_BACK_PTR(p) GC_HIDE_POINTER(~1 & (GC_word)(p))
-#       else
-#         define HIDE_BACK_PTR(p) GC_HIDE_POINTER(p)
-#       endif
-
-#       ifdef KEEP_BACK_PTRS
-          GC_hidden_pointer oh_back_ptr;
-#       endif
-#       ifdef MAKE_BACK_GRAPH
-          GC_hidden_pointer oh_bg_ptr;
-#       endif
-#       if defined(KEEP_BACK_PTRS) != defined(MAKE_BACK_GRAPH)
-          /* Keep double-pointer-sized alignment.       */
-          word oh_dummy;
-#       endif
+# if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
+    /* We potentially keep two different kinds of back          */
+    /* pointers.  KEEP_BACK_PTRS stores a single back           */
+    /* pointer in each reachable object to allow reporting      */
+    /* of why an object was retained.  MAKE_BACK_GRAPH          */
+    /* builds a graph containing the inverse of all             */
+    /* "points-to" edges including those involving              */
+    /* objects that have just become unreachable. This          */
+    /* allows detection of growing chains of unreachable        */
+    /* objects.  It may be possible to eventually combine       */
+    /* both, but for now we keep them separate.  Both           */
+    /* kinds of back pointers are hidden using the              */
+    /* following macros.  In both cases, the plain version      */
+    /* is constrained to have an least significant bit of 1,    */
+    /* to allow it to be distinguished from a free list         */
+    /* link.  This means the plain version must have an         */
+    /* lsb of 0.                                                */
+    /* Note that blocks dropped by black-listing will           */
+    /* also have the lsb clear once debugging has               */
+    /* started.                                                 */
+    /* We're careful never to overwrite a value with lsb 0.     */
+#   if ALIGNMENT == 1
+      /* Fudge back pointer to be even. */
+#     define HIDE_BACK_PTR(p) GC_HIDE_POINTER(~1 & (GC_word)(p))
+#   else
+#     define HIDE_BACK_PTR(p) GC_HIDE_POINTER(p)
+#   endif
+#   ifdef KEEP_BACK_PTRS
+      GC_hidden_pointer oh_back_ptr;
+#   endif
+#   ifdef MAKE_BACK_GRAPH
+      GC_hidden_pointer oh_bg_ptr;
 #   endif
-    const char * oh_string;     /* object descriptor string     */
-    word oh_int;                /* object descriptor integers   */
-#   ifdef NEED_CALLINFO
-      struct callinfo oh_ci[NFRAMES];
+#   if defined(KEEP_BACK_PTRS) != defined(MAKE_BACK_GRAPH)
+      /* Keep double-pointer-sized alignment.   */
+      word oh_dummy;
 #   endif
-#   ifndef SHORT_DBG_HDRS
-      word oh_sz;                       /* Original malloc arg.         */
-      word oh_sf;                       /* start flag */
-#   endif /* SHORT_DBG_HDRS */
+# endif
+  const char * oh_string;       /* object descriptor string     */
+  word oh_int;                  /* object descriptor integers   */
+# ifdef NEED_CALLINFO
+    struct callinfo oh_ci[NFRAMES];
+# endif
+# ifndef SHORT_DBG_HDRS
+    word oh_sz;                 /* Original malloc arg.         */
+    word oh_sf;                 /* start flag */
+# endif /* SHORT_DBG_HDRS */
 } oh;
 /* The size of the above structure is assumed not to de-align things,   */
 /* and to be a multiple of the word length.                             */
 
 #ifdef SHORT_DBG_HDRS
-#   define DEBUG_BYTES (sizeof (oh))
-#   define UNCOLLECTABLE_DEBUG_BYTES DEBUG_BYTES
+# define DEBUG_BYTES (sizeof (oh))
+# define UNCOLLECTABLE_DEBUG_BYTES DEBUG_BYTES
 #else
-    /* Add space for END_FLAG, but use any extra space that was already */
-    /* added to catch off-the-end pointers.                             */
-    /* For uncollectable objects, the extra byte is not added.          */
-#   define UNCOLLECTABLE_DEBUG_BYTES (sizeof (oh) + sizeof (word))
-#   define DEBUG_BYTES (UNCOLLECTABLE_DEBUG_BYTES - EXTRA_BYTES)
+  /* Add space for END_FLAG, but use any extra space that was already   */
+  /* added to catch off-the-end pointers.                               */
+  /* For uncollectable objects, the extra byte is not added.            */
+# define UNCOLLECTABLE_DEBUG_BYTES (sizeof (oh) + sizeof (word))
+# define DEBUG_BYTES (UNCOLLECTABLE_DEBUG_BYTES - EXTRA_BYTES)
 #endif
 
 /* Round bytes to words without adding extra byte at end.       */
@@ -122,42 +126,41 @@ typedef struct {
 /* PRINT_CALL_CHAIN prints the call chain stored in an object   */
 /* to stderr.  It requires that we do not hold the lock.        */
 #if defined(SAVE_CALL_CHAIN)
-    struct callinfo;
-    GC_INNER void GC_save_callers(struct callinfo info[NFRAMES]);
-    GC_INNER void GC_print_callers(struct callinfo info[NFRAMES]);
-#   define ADD_CALL_CHAIN(base, ra) GC_save_callers(((oh *)(base)) -> oh_ci)
-#   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
+  struct callinfo;
+  GC_INNER void GC_save_callers(struct callinfo info[NFRAMES]);
+  GC_INNER void GC_print_callers(struct callinfo info[NFRAMES]);
+# define ADD_CALL_CHAIN(base, ra) GC_save_callers(((oh *)(base)) -> oh_ci)
+# define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
 #elif defined(GC_ADD_CALLER)
-    struct callinfo;
-    GC_INNER void GC_print_callers(struct callinfo info[NFRAMES]);
-#   define ADD_CALL_CHAIN(base, ra) ((oh *)(base)) -> oh_ci[0].ci_pc = (ra)
-#   define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
+  struct callinfo;
+  GC_INNER void GC_print_callers(struct callinfo info[NFRAMES]);
+# define ADD_CALL_CHAIN(base, ra) ((oh *)(base)) -> oh_ci[0].ci_pc = (ra)
+# define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
 #else
-#   define ADD_CALL_CHAIN(base, ra)
-#   define PRINT_CALL_CHAIN(base)
+# define ADD_CALL_CHAIN(base, ra)
+# define PRINT_CALL_CHAIN(base)
 #endif
 
-# ifdef GC_ADD_CALLER
-#   define OPT_RA ra,
-# else
-#   define OPT_RA
-# endif
-
+#ifdef GC_ADD_CALLER
+# define OPT_RA ra,
+#else
+# define OPT_RA
+#endif
 
 /* Check whether object with base pointer p has debugging info  */
 /* p is assumed to point to a legitimate object in our part     */
 /* of the heap.                                                 */
 #ifdef SHORT_DBG_HDRS
-# define GC_has_other_debug_info(p) TRUE
+# define GC_has_other_debug_info(p) 1
 #else
-  GC_INNER GC_bool GC_has_other_debug_info(ptr_t p);
+  GC_INNER int GC_has_other_debug_info(ptr_t p);
 #endif
 
 #if defined(KEEP_BACK_PTRS) || defined(MAKE_BACK_GRAPH)
 # define GC_HAS_DEBUG_INFO(p) \
-        ((*((word *)p) & 1) && GC_has_other_debug_info(p))
+        ((*((word *)p) & 1) && GC_has_other_debug_info(p) > 0)
 #else
-# define GC_HAS_DEBUG_INFO(p) GC_has_other_debug_info(p)
+# define GC_HAS_DEBUG_INFO(p) (GC_has_other_debug_info(p) > 0)
 #endif
 
 #endif /* _DBG_MLC_H */
diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 2b7113ef..c02def1b 100644
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -1790,6 +1790,13 @@ GC_EXTERN void (*GC_print_heap_obj)(ptr_t p);
                         /* Print an address map of the process.         */
 #endif
 
+#ifndef SHORT_DBG_HDRS
+  GC_EXTERN GC_bool GC_findleak_delay_free;
+                        /* Do not immediately deallocate object on      */
+                        /* free() in the leak-finding mode, just mark   */
+                        /* it as freed (and deallocate it after GC).    */
+#endif
+
 GC_EXTERN GC_bool GC_have_errors; /* We saw a smashed or leaked object. */
                                   /* Call error printing routine        */
                                   /* occasionally.  It is ok to read it */