X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgCon.lhs;h=ff012ef4cf8d3a71ca6fef905b6cd0c46954f4fe;hb=869feb6a8105f34092a1ae1e755dffb69a565c85;hp=bf4cf3d9e75e905625a55a5e23322aa356b533f1;hpb=16a2f6a8a381af31c23b6a41a851951da9bc1803;p=ghc-hetmet.git diff --git a/compiler/codeGen/CgCon.lhs b/compiler/codeGen/CgCon.lhs index bf4cf3d..ff012ef 100644 --- a/compiler/codeGen/CgCon.lhs +++ b/compiler/codeGen/CgCon.lhs @@ -51,9 +51,8 @@ import Type import PrelInfo import Outputable import ListSetOps -#ifdef DEBUG -import Util ( lengthIs ) -#endif +import Util +import FastString \end{code} @@ -175,7 +174,7 @@ buildDynCon binder cc con [arg_amode] , (_, CmmLit (CmmInt val _)) <- arg_amode , let val_int = (fromIntegral val) :: Int , val_int <= mAX_INTLIKE && val_int >= mIN_INTLIKE - = do { let intlike_lbl = mkRtsDataLabel SLIT("stg_INTLIKE_closure") + = do { let intlike_lbl = mkRtsDataLabel (sLit "stg_INTLIKE_closure") offsetW = (val_int - mIN_INTLIKE) * (fixedHdrSize + 1) -- INTLIKE closures consist of a header and one word payload intlike_amode = CmmLit (cmmLabelOffW intlike_lbl offsetW) @@ -186,7 +185,7 @@ buildDynCon binder cc con [arg_amode] , (_, CmmLit (CmmInt val _)) <- arg_amode , let val_int = (fromIntegral val) :: Int , val_int <= mAX_CHARLIKE && val_int >= mIN_CHARLIKE - = do { let charlike_lbl = mkRtsDataLabel SLIT("stg_CHARLIKE_closure") + = do { let charlike_lbl = mkRtsDataLabel (sLit "stg_CHARLIKE_closure") offsetW = (val_int - mIN_CHARLIKE) * (fixedHdrSize + 1) -- CHARLIKE closures consist of a header and one word payload charlike_amode = CmmLit (cmmLabelOffW charlike_lbl offsetW)