[Git][ghc/ghc][wip/T18223] Wibbles

[Simon Peyton Jones]

Simon Peyton Jones pushed to branch wip/T18223 at Glasgow Haskell Compiler / GHC


Commits:
71342296 by Simon Peyton Jones at 2020-08-24T10:04:03+01:00
Wibbles

- - - - -


3 changed files:

- compiler/GHC/Core/Coercion.hs
- compiler/GHC/Core/Opt/Arity.hs
- compiler/GHC/Core/Ppr.hs


Changes:

=====================================
compiler/GHC/Core/Coercion.hs
=====================================
@@ -299,8 +299,8 @@ tidyCoAxBndrsForUser init_env tcvs
 coToMCo :: Coercion -> MCoercion
 -- Convert a coercion to a MCoercion,
 -- checking aggressively for reflexivity
-coToMCo co | isReflexiveCo co = MRefl
-           | otherwise        = MCo co
+coToMCo co | isReflCo co = MRefl
+           | otherwise   = MCo co
 
 -- | Tests if this MCoercion is obviously generalized reflexive
 -- Guaranteed to work very quickly.


=====================================
compiler/GHC/Core/Opt/Arity.hs
=====================================
@@ -1108,7 +1108,7 @@ eta_expand one_shots orig_expr
 *                                                                      *
               The EtaInfo mechanism
 *                                                                      *
-************************************************************************
+********************************************************************* -}
 
 {- Note [The EtaInfo mechanism]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


=====================================
compiler/GHC/Core/Ppr.hs
=====================================
@@ -166,7 +166,9 @@ ppr_id_occ add_par id
   | isJoinId id = add_par ((text "jump") <+> pp_id)
   | otherwise   = pp_id
   where
-    pp_id = pprPrefixOcc id
+    pp_id = ppr id  -- We could use pprPrefixOcc to print (+) etc, but this is
+                    -- Core where we don't print things infix anyway, so doing
+                    -- so just adds extra redundant parens
 
 ppr_expr :: OutputableBndr b => (SDoc -> SDoc) -> Expr b -> SDoc
         -- The function adds parens in context that need



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/71342296e7d426786bee4466249802cd630ec292

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/71342296e7d426786bee4466249802cd630ec292
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200824/81b1b900/attachment-0001.html>