[commit: ghc] master: Revert "Fix regression on i386 due to get/setAllocationCounter change" (8bb150d)

[git at git.haskell.org]

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

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

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

commit 8bb150df9e5e711d67f9800c0d694ecf457cd8f5
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Jan 18 00:50:05 2018 -0500

    Revert "Fix regression on i386 due to get/setAllocationCounter change"
    
    This reverts commit a770226e03f09b767fdb4ce826162a5c0f29ec29.


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

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

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 42001d1..1caa0c3 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
-    I64 offset;
+    W_ 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.
-    I64 offset;
+    W_ offset;
     offset = Hp - bdescr_start(CurrentNursery);
     StgTSO_alloc_limit(CurrentTSO) = counter + offset;
     return ();