diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-12-22 18:13:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-12-22 18:13:16 +0200 |
| commit | 5fcc777ff36c3102ddddd2fb932cb8d0b7cc2741 (patch) | |
| tree | 17c618f6fa1b60537f0eef627432b7bc9ebefa5e /src/alloc.c | |
| parent | 3ec1503374d3115651c130eaeee31181266d0863 (diff) | |
| download | emacs-5fcc777ff36c3102ddddd2fb932cb8d0b7cc2741.tar.gz | |
Fix last change with thread marking under GC_CHECK_MARKED_OBJECTS
* src/thread.c (primary_thread_p): New function.
* src/alloc.c (mark_object): Use 'primary_thread_p' to bypass tests
meant for thread objects allocated dynamically.
* src/thread.h (primary_thread_p): Add prototype.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index e979f3631ee..93ea286cfb8 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -6406,7 +6406,7 @@ mark_object (Lisp_Object arg) #ifdef GC_CHECK_MARKED_OBJECTS m = mem_find (po); - if (m == MEM_NIL && !SUBRP (obj) && !THREADP (obj)) + if (m == MEM_NIL && !SUBRP (obj) && !primary_thread_p (po)) emacs_abort (); #endif /* GC_CHECK_MARKED_OBJECTS */ @@ -6418,7 +6418,7 @@ mark_object (Lisp_Object arg) if (pvectype != PVEC_SUBR && pvectype != PVEC_BUFFER - && pvectype != PVEC_THREAD) + && !primary_thread_p (po)) CHECK_LIVE (live_vector_p); switch (pvectype) |