[commit: ghc] master: Fix regression on i386 due to get/setAllocationCounter change (a770226)

[git at git.haskell.org]

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

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

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

commit a770226e03f09b767fdb4ce826162a5c0f29ec29
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Jan 15 13:01:59 2018 -0500

    Fix regression on i386 due to get/setAllocationCounter change
    
    Reviewers: simonmar, erikd
    
    Subscribers: rwbarton, thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D4312


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

a770226e03f09b767fdb4ce826162a5c0f29ec29
 rts/PrimOps.cmm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 1caa0c3..42001d1 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -2499,7 +2499,7 @@ stg_traceMarkerzh ( W_ msg )
 stg_getThreadAllocationCounterzh ()
 {
     // Account for the allocation in the current block
-    W_ offset;
+    I64 offset;
     offset = Hp - bdescr_start(CurrentNursery);
     return (StgTSO_alloc_limit(CurrentTSO) - offset);
 }
@@ -2510,7 +2510,7 @@ stg_setThreadAllocationCounterzh ( I64 counter )
     // getThreadAllocationCounter#, so we have to offset any existing
     // allocation here.  See also openNursery/closeNursery in
     // compiler/codeGen/StgCmmForeign.hs.
-    W_ offset;
+    I64 offset;
     offset = Hp - bdescr_start(CurrentNursery);
     StgTSO_alloc_limit(CurrentTSO) = counter + offset;
     return ();