[commit: ghc] wip/tdammers/D4395-new: This should really have been in the previous commit. (17531c8)

[git at git.haskell.org]

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

On branch  : wip/tdammers/D4395-new
Link       : http://ghc.haskell.org/trac/ghc/changeset/17531c81dcc1c822317190d4949cc8a6ab6b9c43/ghc

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

commit 17531c81dcc1c822317190d4949cc8a6ab6b9c43
Author: Richard Eisenberg <rae at cs.brynmawr.edu>
Date:   Sat Jan 27 09:55:21 2018 -0500

    This should really have been in the previous commit.


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

17531c81dcc1c822317190d4949cc8a6ab6b9c43
 compiler/coreSyn/CoreOpt.hs    | 4 ++--
 compiler/simplCore/Simplify.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/coreSyn/CoreOpt.hs b/compiler/coreSyn/CoreOpt.hs
index 0054016..e1eae8b 100644
--- a/compiler/coreSyn/CoreOpt.hs
+++ b/compiler/coreSyn/CoreOpt.hs
@@ -1000,12 +1000,12 @@ pushCoValArg co
               -- then co1 :: tyL1 ~ tyR1
               --      co2 :: tyL2 ~ tyR2
   = ASSERT2( isFunTy tyR, ppr co $$ ppr arg )
-    Just (mkSymCo co1, co2)
+    Just (mkSymCo co1, Just co2)
 
   | otherwise
   = Nothing
   where
-    (arg, res)   = splitFunTy tyR
+    (arg, _)     = splitFunTy tyR
     Pair tyL tyR = coercionKind co
 
 pushCoercionIntoLambda
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index 079fe9f..b2444e5 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -1216,7 +1216,7 @@ simplCast env body co0 cont0
         -- If the first parameter is Nothing, then simplifying revealed a
         -- reflexive coercion. Omit.
        addCoerce0 :: Maybe OutCoercion -> SimplCont -> SimplM SimplCont
-       addCoerce0 Nothing   cont = cont
+       addCoerce0 Nothing   cont = return cont
        addCoerce0 (Just co) cont = addCoerce co cont
 
        addCoerce :: OutCoercion -> SimplCont -> SimplM SimplCont