diff options
| author | Max Bolingbroke <batterseapower@hotmail.com> | 2012-03-07 17:28:21 +0000 |
|---|---|---|
| committer | Max Bolingbroke <batterseapower@hotmail.com> | 2012-03-07 17:28:21 +0000 |
| commit | 4f070dd16ee31f38aff931f4b7b0ce562dcb98f4 (patch) | |
| tree | dd41663f9b3fc6934e573c6f8ee2106db8259192 /compiler/simplCore | |
| parent | feeedb3ccf4977eb028924d072244237ff6e3984 (diff) | |
| parent | 28f783f1c367784e0adcac2447682061a38f2ba3 (diff) | |
| download | haskell-unboxed-tuple-arguments.tar.gz | |
Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc into unboxed-tuple-argumentsunboxed-tuple-arguments
Diffstat (limited to 'compiler/simplCore')
| -rw-r--r-- | compiler/simplCore/CoreMonad.lhs | 11 | ||||
| -rw-r--r-- | compiler/simplCore/Simplify.lhs | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/compiler/simplCore/CoreMonad.lhs b/compiler/simplCore/CoreMonad.lhs index 829c2ca40f..4af626d053 100644 --- a/compiler/simplCore/CoreMonad.lhs +++ b/compiler/simplCore/CoreMonad.lhs @@ -137,7 +137,7 @@ showPass dflags pass = Err.showPass dflags (showSDoc (ppr pass)) endPass :: DynFlags -> CoreToDo -> CoreProgram -> [CoreRule] -> IO () endPass dflags pass binds rules - = do { dumpPassResult dflags mb_flag (ppr pass) empty binds rules + = do { dumpPassResult dflags mb_flag (ppr pass) (pprPassDetails pass) binds rules ; lintPassResult dflags pass binds } where mb_flag = case coreDumpFlag pass of @@ -167,9 +167,9 @@ dumpPassResult dflags mb_flag hdr extra_info binds rules -- This has the side effect of forcing the intermediate to be evaluated where - dump_doc = vcat [ text "Result size =" <+> int (coreBindsSize binds) - , extra_info - , blankLine + dump_doc = vcat [ nest 2 extra_info + , nest 2 (text "Result size =" <+> int (coreBindsSize binds)) + , blankLine , pprCoreBindings binds , ppUnless (null rules) pp_rules ] pp_rules = vcat [ blankLine @@ -307,7 +307,8 @@ instance Outputable CoreToDo where ppr (CoreDoPasses {}) = ptext (sLit "CoreDoPasses") pprPassDetails :: CoreToDo -> SDoc -pprPassDetails (CoreDoSimplify n md) = ppr md <+> ptext (sLit "max-iterations=") <> int n +pprPassDetails (CoreDoSimplify n md) = vcat [ ptext (sLit "Max iterations =") <+> int n + , ppr md ] pprPassDetails _ = empty \end{code} diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs index ee20a52034..b8c8160972 100644 --- a/compiler/simplCore/Simplify.lhs +++ b/compiler/simplCore/Simplify.lhs @@ -1416,7 +1416,7 @@ completeCall env var cont pprDefiniteTrace "Inlining done:" (ppr var) stuff else stuff | otherwise - = pprDefiniteTrace ("Inlining done: " ++ showSDoc (ppr var)) + = pprDefiniteTrace ("Inlining done: " ++ showSDocDump (ppr var)) (vcat [text "Inlined fn: " <+> nest 2 (ppr unfolding), text "Cont: " <+> ppr cont]) stuff |