[commit: ghc] master: Fix windows x86_64 build. (8528165)

git at git.haskell.org git at git.haskell.org
Mon Dec 9 12:31:49 UTC 2013


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

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

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

commit 8528165d08391f328ac39b7c65f8e1f22fbfd8e8
Author: Austin Seipp <austin at well-typed.com>
Date:   Mon Dec 9 06:08:31 2013 -0600

    Fix windows x86_64 build.
    
    On win64 sizeof(long) != sizeof(void*), so debugTrace was casting a
    value of incorrect size causing a validate failure.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

8528165d08391f328ac39b7c65f8e1f22fbfd8e8
 rts/sm/GC.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 8cae2c9..1ecbaf5 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -1755,7 +1755,7 @@ static void gcCAFs(void)
         ASSERT(info->type == IND_STATIC);
 
         if (p->static_link == NULL) {
-            debugTrace(DEBUG_gccafs, "CAF gc'd at 0x%04lx", (long)p);
+            debugTrace(DEBUG_gccafs, "CAF gc'd at 0x%p", p);
             SET_INFO((StgClosure*)p,&stg_GCD_CAF_info); // stub it
             if (prev == NULL) {
                 debug_caf_list = (StgIndStatic*)p->saved_info;



More information about the ghc-commits mailing list