diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-12 12:37:01 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-12 12:37:01 +0100 |
| commit | 44b5f471a314d964948c38684ce74b7a87df4ed8 (patch) | |
| tree | 075f88991983d976ad13714da61b9773a6ca0a02 /compiler/cmm/CmmExpr.hs | |
| parent | f611396a581e733c41cee41750c95675bdb64961 (diff) | |
| download | haskell-44b5f471a314d964948c38684ce74b7a87df4ed8.tar.gz | |
Pass DynFlags down to gcWord
Diffstat (limited to 'compiler/cmm/CmmExpr.hs')
| -rw-r--r-- | compiler/cmm/CmmExpr.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/cmm/CmmExpr.hs b/compiler/cmm/CmmExpr.hs index 3387b3f470..128eb1ca62 100644 --- a/compiler/cmm/CmmExpr.hs +++ b/compiler/cmm/CmmExpr.hs @@ -133,7 +133,7 @@ cmmLitType dflags (CmmHighStackMark) = bWord dflags cmmLabelType :: DynFlags -> CLabel -> CmmType cmmLabelType dflags lbl - | isGcPtrLabel lbl = gcWord + | isGcPtrLabel lbl = gcWord dflags | otherwise = bWord dflags cmmExprWidth :: DynFlags -> CmmExpr -> Width @@ -415,11 +415,12 @@ node :: GlobalReg node = VanillaReg 1 VGcPtr globalRegType :: DynFlags -> GlobalReg -> CmmType -globalRegType _ (VanillaReg _ VGcPtr) = gcWord +globalRegType dflags (VanillaReg _ VGcPtr) = gcWord dflags globalRegType dflags (VanillaReg _ VNonGcPtr) = bWord dflags globalRegType _ (FloatReg _) = cmmFloat W32 globalRegType _ (DoubleReg _) = cmmFloat W64 globalRegType _ (LongReg _) = cmmBits W64 -globalRegType _ Hp = gcWord -- The initialiser for all +globalRegType dflags Hp = gcWord dflags + -- The initialiser for all -- dynamically allocated closures globalRegType dflags _ = bWord dflags |