diff options
| author | Andreas Schwab | 2019-06-10 12:52:21 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2019-06-10 12:52:21 +0200 |
| commit | 758e9a8ed49c15f7069a67cf0c2ce3c6f9a3f7e1 (patch) | |
| tree | 28129ab2bff06e6e04381e592165d1d27a84ae6d | |
| parent | 1877b7b4d79b3434379fd5a4abd85906c25df00c (diff) | |
| download | emacs-758e9a8ed49c15f7069a67cf0c2ce3c6f9a3f7e1.tar.gz emacs-758e9a8ed49c15f7069a67cf0c2ce3c6f9a3f7e1.zip | |
Revert "Don't mark main_thread (Bug#36155)"
This reverts commit 1877b7b4d79b3434379fd5a4abd85906c25df00c.
| -rw-r--r-- | src/thread.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/thread.c b/src/thread.c index e2158019839..0cd1ae33dc2 100644 --- a/src/thread.c +++ b/src/thread.c | |||
| @@ -645,10 +645,7 @@ mark_threads_callback (void *ignore) | |||
| 645 | Lisp_Object thread_obj; | 645 | Lisp_Object thread_obj; |
| 646 | 646 | ||
| 647 | XSETTHREAD (thread_obj, iter); | 647 | XSETTHREAD (thread_obj, iter); |
| 648 | /* Don't mark main_thread, since it is not allocated | 648 | mark_object (thread_obj); |
| 649 | dynamically, thus nothing would unmark it. */ | ||
| 650 | if (iter != &main_thread) | ||
| 651 | mark_object (thread_obj); | ||
| 652 | mark_one_thread (iter); | 649 | mark_one_thread (iter); |
| 653 | } | 650 | } |
| 654 | } | 651 | } |