[commit: ghc] wip/T14677: simplify (e615cc8)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T14677
Link       : http://ghc.haskell.org/trac/ghc/changeset/e615cc83841e6a6c4461352428ecf6597ebd1d23/ghc

>---------------------------------------------------------------

commit e615cc83841e6a6c4461352428ecf6597ebd1d23
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Jan 8 17:42:46 2019 +0100

    simplify


>---------------------------------------------------------------

e615cc83841e6a6c4461352428ecf6597ebd1d23
 compiler/simplCore/Simplify.hs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index fca9904..f000fc9 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -1602,13 +1602,13 @@ trimJoinCont _ Nothing cont
 trimJoinCont var (Just arity) cont
   = trim arity cont
   where
-    trim 0 cont@(Stop {})
+    trim 0 cont at Stop {}
       = cont
     trim 0 cont
       = mkBoringStop (contResultType cont)
-    trim n cont@(ApplyToVal { sc_cont = k })
+    trim n cont at ApplyToVal { sc_cont = k }
       = cont { sc_cont = trim (n-1) k }
-    trim n cont@(ApplyToTy { sc_cont = k })
+    trim n cont at ApplyToTy { sc_cont = k }
       = cont { sc_cont = trim (n-1) k } -- join arity counts types!
     trim _ cont
       = pprPanic "completeCall" $ ppr var $$ ppr cont
@@ -1733,7 +1733,7 @@ completeCall env var cont
                                 lone_variable arg_infos interesting_cont
   -- Inline the variable's RHS
   = do { checkedTick (UnfoldingDone var)
-       ; dump_inline expr cont
+       ; dump_inline expr
        ; simplExprF (zapSubstEnv env) expr cont }
 
   | otherwise
@@ -1750,7 +1750,7 @@ completeCall env var cont
     interesting_cont = interestingCallContext env call_cont
     active_unf       = activeUnfolding (getMode env) var
 
-    dump_inline unfolding cont
+    dump_inline unfolding
       | not (dopt Opt_D_dump_inlinings dflags) = return ()
       | not (dopt Opt_D_verbose_core2core dflags)
       = when (isExternalName (idName var)) $
@@ -3560,4 +3560,3 @@ simplRules env mb_new_id rules mb_cont
                           , ru_fn    = fn_name'
                           , ru_args  = args'
                           , ru_rhs   = rhs' }) }
-