diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-08-25 14:25:59 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-08-25 14:25:59 -0600 |
| commit | 793ea5055aea85ff9227e1bf0c84ab37edba7201 (patch) | |
| tree | c9799eebe2b797a55fcbfcbd3710c9b5aa70051d /src/alloc.c | |
| parent | 1ce4c6398ea453a66f6943552b0ec866a690e9b1 (diff) | |
| parent | e687aa335a21662f67d2d73063272504a171ffab (diff) | |
merge from trunk
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index 4cc9b3e1a13..9b5f2955aa5 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -314,7 +314,6 @@ static void *min_heap_address, *max_heap_address; static struct mem_node mem_z; #define MEM_NIL &mem_z -#if GC_MARK_STACK || defined GC_MALLOC_CHECK static struct mem_node *mem_insert (void *, void *, enum mem_type); static void mem_insert_fixup (struct mem_node *); static void mem_rotate_left (struct mem_node *); @@ -322,7 +321,6 @@ static void mem_rotate_right (struct mem_node *); static void mem_delete (struct mem_node *); static void mem_delete_fixup (struct mem_node *); static struct mem_node *mem_find (void *); -#endif #endif /* GC_MARK_STACK || GC_MALLOC_CHECK */ @@ -4237,6 +4235,10 @@ live_buffer_p (struct mem_node *m, void *p) #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES +/* Currently not used, but may be called from gdb. */ + +void dump_zombies (void) EXTERNALLY_VISIBLE; + /* Array of objects that are kept alive because the C stack contains a pattern that looks like a reference to them . */ @@ -4619,7 +4621,7 @@ check_gcpros (void) #elif GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES -static void +void dump_zombies (void) { int i; @@ -4766,6 +4768,10 @@ flush_stack_call_func (void (*func) (void *arg), void *arg) eassert (current_thread == self); } +#else /* GC_MARK_STACK == 0 */ + +#define mark_maybe_object(obj) emacs_abort () + #endif /* GC_MARK_STACK != 0 */ |