[commit: ghc] master: rts: Ensure that the_gc_thread is aligned (c6cc93b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c6cc93bca69abc258513af8cf2370b14e70fd8fb/ghc

>---------------------------------------------------------------

commit c6cc93bca69abc258513af8cf2370b14e70fd8fb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Aug 6 14:52:59 2018 -0400

    rts: Ensure that the_gc_thread is aligned
    
    Since we cast this to a gc_thread the compiler may assume that it's aligned.
    Make sure that this is so. Fixes #15482.


>---------------------------------------------------------------

c6cc93bca69abc258513af8cf2370b14e70fd8fb
 rts/sm/GC.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 742ae36..9b31516 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -128,7 +128,11 @@ uint32_t mutlist_MUTVARS,
 gc_thread **gc_threads = NULL;
 
 #if !defined(THREADED_RTS)
-StgWord8 the_gc_thread[sizeof(gc_thread) + 64 * sizeof(gen_workspace)];
+/* Use conservative alignment since we will cast this to a gc_thread and
+ * consequently the compiler may assume it is aligned. See #15482.
+ */
+StgWord8 the_gc_thread[sizeof(gc_thread) + 64 * sizeof(gen_workspace)]
+    __attribute__((aligned(sizeof(W_))));
 #endif
 
 // Number of threads running in *this* GC.  Affects how many