diff options
| author | Eli Zaretskii | 2016-12-22 18:13:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-12-22 18:13:16 +0200 |
| commit | 5fcc777ff36c3102ddddd2fb932cb8d0b7cc2741 (patch) | |
| tree | 17c618f6fa1b60537f0eef627432b7bc9ebefa5e /src/alloc.c | |
| parent | 3ec1503374d3115651c130eaeee31181266d0863 (diff) | |
| download | emacs-5fcc777ff36c3102ddddd2fb932cb8d0b7cc2741.tar.gz emacs-5fcc777ff36c3102ddddd2fb932cb8d0b7cc2741.zip | |
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) | |||
| 6406 | 6406 | ||
| 6407 | #ifdef GC_CHECK_MARKED_OBJECTS | 6407 | #ifdef GC_CHECK_MARKED_OBJECTS |
| 6408 | m = mem_find (po); | 6408 | m = mem_find (po); |
| 6409 | if (m == MEM_NIL && !SUBRP (obj) && !THREADP (obj)) | 6409 | if (m == MEM_NIL && !SUBRP (obj) && !primary_thread_p (po)) |
| 6410 | emacs_abort (); | 6410 | emacs_abort (); |
| 6411 | #endif /* GC_CHECK_MARKED_OBJECTS */ | 6411 | #endif /* GC_CHECK_MARKED_OBJECTS */ |
| 6412 | 6412 | ||
| @@ -6418,7 +6418,7 @@ mark_object (Lisp_Object arg) | |||
| 6418 | 6418 | ||
| 6419 | if (pvectype != PVEC_SUBR | 6419 | if (pvectype != PVEC_SUBR |
| 6420 | && pvectype != PVEC_BUFFER | 6420 | && pvectype != PVEC_BUFFER |
| 6421 | && pvectype != PVEC_THREAD) | 6421 | && !primary_thread_p (po)) |
| 6422 | CHECK_LIVE (live_vector_p); | 6422 | CHECK_LIVE (live_vector_p); |
| 6423 | 6423 | ||
| 6424 | switch (pvectype) | 6424 | switch (pvectype) |