[commit: ghc] wip/T12618: ConApp: Include dc worker id in dffvExpr (8fa2420)

git at git.haskell.org git at git.haskell.org
Thu Oct 6 23:20:15 UTC 2016


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

On branch  : wip/T12618
Link       : http://ghc.haskell.org/trac/ghc/changeset/8fa24208a732b877952ded6e2e98f54f526dde19/ghc

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

commit 8fa24208a732b877952ded6e2e98f54f526dde19
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Oct 4 13:33:05 2016 -0400

    ConApp: Include dc worker id in dffvExpr
    
    just to see if this fixes the crashes here.


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

8fa24208a732b877952ded6e2e98f54f526dde19
 compiler/main/TidyPgm.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/TidyPgm.hs b/compiler/main/TidyPgm.hs
index 6f867d6..f26aae4 100644
--- a/compiler/main/TidyPgm.hs
+++ b/compiler/main/TidyPgm.hs
@@ -817,7 +817,7 @@ insert v = DFFV $ \ env (set, ids) ->
 dffvExpr :: CoreExpr -> DFFV ()
 dffvExpr (Var v)              = insert v
 dffvExpr (App e1 e2)          = dffvExpr e1 >> dffvExpr e2
-dffvExpr (ConApp _ args)      = mapM_ dffvExpr args
+dffvExpr (ConApp dc args)     = insert (dataConWorkId dc) >> mapM_ dffvExpr args
 dffvExpr (Lam v e)            = extendScope v (dffvExpr e)
 dffvExpr (Tick (Breakpoint _ ids) e) = mapM_ insert ids >> dffvExpr e
 dffvExpr (Tick _other e)    = dffvExpr e



More information about the ghc-commits mailing list