[Git][ghc/ghc][wip/ghc-debug] Revert changes to TSO.h

[Sven Tennie]

Sven Tennie pushed to branch wip/ghc-debug at Glasgow Haskell Compiler / GHC


Commits:
1902be05 by Sven Tennie at 2020-06-05T08:25:03+02:00
Revert changes to TSO.h

The memory layout of StgTSO isn't significant anymore as we decode it
with hsc2hs.

(Of course the basic structure of a closure with an info table must be
still in place, but that's not touched by this commit.)

- - - - -


1 changed file:

- includes/rts/storage/TSO.h


Changes:

=====================================
includes/rts/storage/TSO.h
=====================================
@@ -107,22 +107,6 @@ typedef struct StgTSO_ {
      */
     struct StgStack_       *stackobj;
 
-    struct InCall_ *bound;
-    struct Capability_ *cap;
-
-    struct StgTRecHeader_ *trec; /* STM transaction record */
-
-    /*
-     * A list of threads blocked on this TSO waiting to throw exceptions.
-     */
-    struct MessageThrowTo_ *blocked_exceptions;
-
-    /*
-     * A list of StgBlockingQueue objects, representing threads
-     * blocked on thunks that are under evaluation by this thread.
-     */
-    struct StgBlockingQueue_ *bq;
-
     /*
      * The tso->dirty flag indicates that this TSO's stack should be
      * scanned during garbage collection.  It also indicates that this
@@ -144,6 +128,21 @@ typedef struct StgTSO_ {
     StgThreadID             id;
     StgWord32               saved_errno;
     StgWord32               dirty;          /* non-zero => dirty */
+    struct InCall_*         bound;
+    struct Capability_*     cap;
+
+    struct StgTRecHeader_ * trec;       /* STM transaction record */
+
+    /*
+     * A list of threads blocked on this TSO waiting to throw exceptions.
+    */
+    struct MessageThrowTo_ * blocked_exceptions;
+
+    /*
+     * A list of StgBlockingQueue objects, representing threads
+     * blocked on thunks that are under evaluation by this thread.
+    */
+    struct StgBlockingQueue_ *bq;
 
     /*
      * The allocation limit for this thread, which is updated as the



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1902be054701803b003283979a22f950d31fd941

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1902be054701803b003283979a22f950d31fd941
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200605/1e37b11c/attachment-0001.html>