Make StgWord a portable type too

StgWord is a newtyped Word64, as it needed to be something that
has a UArray instance.

1 files changed, 2 insertions, 4 deletions

diff --git a/compiler/codeGen/CgParallel.hs b/compiler/codeGen/CgParallel.hs
index c86ef9e34a..fdc9846694 100644
--- a/compiler/codeGen/CgParallel.hs
+++ b/compiler/codeGen/CgParallel.hs
@@ -51,12 +51,11 @@ granFetchAndReschedule :: [(Id,GlobalReg)]  -- Live registers
 -- Emit code for simulating a fetch and then reschedule.
 granFetchAndReschedule regs node_reqd
   = do dflags <- getDynFlags
+       let liveness = mkRegLiveness dflags regs 0 0
        when (dopt Opt_GranMacros dflags &&
              (node `elem` map snd regs || node_reqd)) $
            do fetch
               reschedule liveness node_reqd
-  where
-    liveness = mkRegLiveness regs 0 0
 
 fetch :: FCode ()
 fetch = panic "granFetch"
@@ -90,9 +89,8 @@ granYield :: [(Id,GlobalReg)]   -- Live registers
 
 granYield regs node_reqd
   = do dflags <- getDynFlags
+       let liveness = mkRegLiveness dflags regs 0 0
        when (dopt Opt_GranMacros dflags && node_reqd) $ yield liveness
-  where
-     liveness = mkRegLiveness regs 0 0
 
 yield :: StgWord -> Code
 yield _liveness = panic "granYield"