summaryrefslogtreecommitdiff
path: root/compiler/coreSyn
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2018-05-01 11:11:46 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2018-05-01 12:57:48 +0100
commit07cc6039dccff82790bf1d84a81e26df234ad899 (patch)
treeb9c771b364646f1a989f87a9b012e93b06ed63ac /compiler/coreSyn
parent4e45ebeea097b662076936f5a50c0873d8737923 (diff)
downloadhaskell-07cc6039dccff82790bf1d84a81e26df234ad899.tar.gz
Don't crash when pretty-printing bad joins
Trac #15108 showed that the Core pretty-printer would crash if it found a join-point binding with too few lambda on the RHS. That is super-unhelpful! Lint will find it, but pretty-printing should not crash. This patch just makes the pretty printer behave more robustly; it leaves the job of error reporting to Lint.
Diffstat (limited to 'compiler/coreSyn')
-rw-r--r--compiler/coreSyn/PprCore.hs10
1 files changed, 9 insertions, 1 deletions
diff --git a/compiler/coreSyn/PprCore.hs b/compiler/coreSyn/PprCore.hs
index 96f7aa59d8..ca2b8af560 100644
--- a/compiler/coreSyn/PprCore.hs
+++ b/compiler/coreSyn/PprCore.hs
@@ -128,10 +128,18 @@ ppr_binding ann (val_bdr, expr)
-- lambda (the first rendering looks like a nullary join point returning
-- an n-argument function).
pp_join_bind join_arity
+ | bndrs `lengthAtLeast` join_arity
= hang (ppr val_bdr <+> sep (map (pprBndr LambdaBind) lhs_bndrs))
2 (equals <+> pprCoreExpr rhs)
+ | otherwise -- Yikes! A join-binding with too few lambda
+ -- Lint will complain, but we don't want to crash
+ -- the pretty-printer else we can't see what's wrong
+ -- So refer to printing j = e
+ = pp_normal_bind
where
- (lhs_bndrs, rhs) = collectNBinders join_arity expr
+ (bndrs, body) = collectBinders expr
+ lhs_bndrs = take join_arity bndrs
+ rhs = mkLams (drop join_arity bndrs) body
pprParendExpr expr = ppr_expr parens expr
pprCoreExpr expr = ppr_expr noParens expr