diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-06-12 18:52:05 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-06-12 18:52:05 +0100 |
| commit | ab50c9c527d19f4df7ee6742b6d79c855d57c9b8 (patch) | |
| tree | ac78c3fda6f3a8ec8235345f7b02518e0d809ba0 /compiler/codeGen | |
| parent | 543ec0852722318665d2f5228e29d44a5fc973f5 (diff) | |
| download | haskell-ab50c9c527d19f4df7ee6742b6d79c855d57c9b8.tar.gz | |
Pass DynFlags down to showSDoc
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/StgCmmLayout.hs | 6 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmProf.hs | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler/codeGen/StgCmmLayout.hs b/compiler/codeGen/StgCmmLayout.hs index c33524636b..c97c3d47cd 100644 --- a/compiler/codeGen/StgCmmLayout.hs +++ b/compiler/codeGen/StgCmmLayout.hs @@ -58,7 +58,7 @@ import Constants import Util import Data.List import Outputable -import FastString ( mkFastString, FastString, fsLit ) +import FastString ------------------------------------------------------------------------ -- Call and return sequences @@ -179,8 +179,8 @@ slow_call fun args reps = do dflags <- getDynFlags let platform = targetPlatform dflags call <- getCode $ direct_call "slow_call" (mkRtsApFastLabel rts_fun) arity args reps - emit $ mkComment $ mkFastString ("slow_call for " ++ showSDoc (pprPlatform platform fun) ++ - " with pat " ++ showSDoc (ftext rts_fun)) + emit $ mkComment $ mkFastString ("slow_call for " ++ showSDoc dflags (pprPlatform platform fun) ++ + " with pat " ++ unpackFS rts_fun) emit (mkAssign nodeReg fun <*> call) where (rts_fun, arity) = slowCallPattern reps diff --git a/compiler/codeGen/StgCmmProf.hs b/compiler/codeGen/StgCmmProf.hs index 6d16f012b3..6a53317385 100644 --- a/compiler/codeGen/StgCmmProf.hs +++ b/compiler/codeGen/StgCmmProf.hs @@ -218,7 +218,8 @@ emitCostCentreDecl cc = do ; modl <- newByteStringCLit (bytesFS $ Module.moduleNameFS $ Module.moduleName $ cc_mod cc) - ; loc <- newStringCLit (showSDoc (ppr (costCentreSrcSpan cc))) + ; dflags <- getDynFlags + ; loc <- newStringCLit (showPpr dflags (costCentreSrcSpan cc)) -- XXX should UTF-8 encode -- All cost centres will be in the main package, since we -- don't normally use -auto-all or add SCCs to other packages. |