Commit f8a00d0e authored by pcapriotti's avatar pcapriotti
Browse files

Restore old output for -ddump-rule-firings #7060

Commit 3fcf5bdf made the output of
-ddump-rule-firings and -ddump-rule-rewrites excessively verbose.

Fixed by removing the extra blank lines and separator when the header
of dump is empty.
parent 3ae9f0f9
......@@ -251,8 +251,11 @@ dumpSDoc dflags dflag hdr doc
hClose handle
-- write the dump to stdout
Nothing
-> log_action dflags dflags SevDump noSrcSpan defaultDumpStyle (mkDumpDoc hdr doc)
Nothing -> do
let (doc', severity)
| null hdr = (doc, SevOutput)
| otherwise = (mkDumpDoc hdr doc, SevDump)
log_action dflags dflags severity noSrcSpan defaultDumpStyle doc'
-- | Choose where to put a dump file based on DynFlags
......
......@@ -1571,21 +1571,22 @@ tryRules env rules fn args call_cont
where
trace_dump dflags rule rule_rhs
| dopt Opt_D_dump_rule_rewrites dflags
= liftIO . dumpSDoc dflags Opt_D_dump_rule_rewrites "" $
vcat [text "Rule fired",
text "Rule:" <+> ftext (ru_name rule),
text "Before:" <+> hang (ppr fn) 2 (sep (map pprParendExpr args)),
text "After: " <+> pprCoreExpr rule_rhs,
text "Cont: " <+> ppr call_cont]
= log_rule dflags Opt_D_dump_rule_rewrites "Rule fired" $ vcat
[ text "Rule:" <+> ftext (ru_name rule)
, text "Before:" <+> hang (ppr fn) 2 (sep (map pprParendExpr args))
, text "After: " <+> pprCoreExpr rule_rhs
, text "Cont: " <+> ppr call_cont ]
| dopt Opt_D_dump_rule_firings dflags
= liftIO . dumpSDoc dflags Opt_D_dump_rule_firings "" $
vcat [text "Rule fired",
ftext (ru_name rule)]
= log_rule dflags Opt_D_dump_rule_firings "Rule fired:" $
ftext (ru_name rule)
| otherwise
= return ()
log_rule dflags dflag hdr details = liftIO . dumpSDoc dflags dflag "" $
sep [text hdr, nest 4 details]
\end{code}
Note [Rules for recursive functions]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment