Pass DynFlags down to bWord

I've switched to passing DynFlags rather than Platform, as (a) it's
simpler to not have to extract targetPlatform in so many places, and
(b) it may be useful to have DynFlags around in future.

1 files changed, 9 insertions, 8 deletions

diff --git a/compiler/cmm/OldCmmUtils.hs b/compiler/cmm/OldCmmUtils.hs
index 0ec7a25f15..fe6ccee642 100644
--- a/compiler/cmm/OldCmmUtils.hs
+++ b/compiler/cmm/OldCmmUtils.hs
@@ -20,6 +20,7 @@ module OldCmmUtils(
 import OldCmm
 import CmmUtils
 import OrdList
+import DynFlags
 import Unique
 
 ---------------------------------------------------
@@ -77,23 +78,23 @@ cheapEqReg _ _                = False
 --
 ---------------------------------------------------
 
-loadArgsIntoTemps :: [Unique]
+loadArgsIntoTemps :: DynFlags -> [Unique]
                   -> [HintedCmmActual]
                   -> ([Unique], [CmmStmt], [HintedCmmActual])
-loadArgsIntoTemps uniques [] = (uniques, [], [])
-loadArgsIntoTemps uniques ((CmmHinted e hint):args) =
+loadArgsIntoTemps _      uniques [] = (uniques, [], [])
+loadArgsIntoTemps dflags uniques ((CmmHinted e hint):args) =
     (uniques'',
      new_stmts ++ remaining_stmts,
      (CmmHinted new_e hint) : remaining_e)
     where
-      (uniques', new_stmts, new_e) = maybeAssignTemp uniques e
+      (uniques', new_stmts, new_e) = maybeAssignTemp dflags uniques e
       (uniques'', remaining_stmts, remaining_e) =
-          loadArgsIntoTemps uniques' args
+          loadArgsIntoTemps dflags uniques' args
 
 
-maybeAssignTemp :: [Unique] -> CmmExpr -> ([Unique], [CmmStmt], CmmExpr)
-maybeAssignTemp uniques e
+maybeAssignTemp :: DynFlags -> [Unique] -> CmmExpr -> ([Unique], [CmmStmt], CmmExpr)
+maybeAssignTemp dflags uniques e
     | hasNoGlobalRegs e = (uniques, [], e)
     | otherwise         = (tail uniques, [CmmAssign local e], CmmReg local)
-    where local = CmmLocal (LocalReg (head uniques) (cmmExprType e))
+    where local = CmmLocal (LocalReg (head uniques) (cmmExprType dflags e))