[Guile-commits] 03/28: Remove "result" member from struct scm_thread

[Andy Wingo]

wingo pushed a commit to branch wip-whippet
in repository guile.

commit 8b2b0d52d8aab89b2a2dcd268e370bcc266acbd1
Author: Andy Wingo <wi...@pobox.com>
AuthorDate: Mon Jun 30 09:45:51 2025 +0200

    Remove "result" member from struct scm_thread
    
    * libguile/threads-internal.h:
    * libguile/threads.c (scm_trace_thread, guilify_self_1, really_launch):
    Remove "result".  Replaced by join_results.
---
 libguile/threads-internal.h | 1 -
 libguile/threads.c          | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/libguile/threads-internal.h b/libguile/threads-internal.h
index c6f6c1cd9..96c307437 100644
--- a/libguile/threads-internal.h
+++ b/libguile/threads-internal.h
@@ -59,7 +59,6 @@ struct scm_thread {
 
   scm_i_pthread_t pthread;
 
-  SCM result;
   int exited;
 
   /* Boolean indicating whether the thread is in guile mode.  */
diff --git a/libguile/threads.c b/libguile/threads.c
index 4bfa2702c..0226dd750 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -99,8 +99,6 @@ scm_trace_thread (struct scm_thread *thread,
 
   trace_edge (gc_edge (&thread->pending_asyncs), heap, trace_data);
 
-  trace_edge (gc_edge (&thread->result), heap, trace_data);
-
   /* FIXME: Use scm_trace_dynamic_state or so.  */
   // trace_edge (gc_edge (&thread->dynamic_state), heap, trace_data);
 
@@ -418,7 +416,6 @@ guilify_self_1 (struct gc_mutator *mut, struct 
gc_stack_addr base,
 
   t->tag = scm_tc7_thread;
   t->pthread = scm_i_pthread_self ();
-  t->result = SCM_BOOL_F;
   t->pending_asyncs = SCM_EOL;
   t->block_asyncs = 1;
   t->mutator = mut;
@@ -787,8 +784,7 @@ really_launch (void *d)
   scm_thread *t = SCM_I_CURRENT_THREAD;
   /* The thread starts with asyncs blocked.  */
   t->block_asyncs++;
-  SCM_I_CURRENT_THREAD->result =
-    scm_call_0 (scm_i_vector_ref (data, LAUNCH_DATA_THUNK));
+  scm_call_0 (scm_i_vector_ref (data, LAUNCH_DATA_THUNK));
   return 0;
 }