X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=13035e72e2831185bc58ee74c632c381ac49b151;hp=7ee82b52592504c2c32a3651e1f70f9b39bec828;hb=876b4ef2093cb9c104db33c7db1200b941b6d079;hpb=1eeb06aa5afa12474f8e73d9d8bd082b3dde76b9 diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index 7ee82b5..13035e7 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -44,7 +44,7 @@ import BasicTypes ( RecFlag(..) ) import Digraph ( SCC(..), stronglyConnComp ) import Bag import Outputable -import Maybes ( orElse, fromJust, isJust ) +import Maybes ( orElse, isJust ) import Util ( filterOut ) import Monad ( foldM ) \end{code} @@ -315,9 +315,8 @@ depAnalBinds binds_w_dus keyd_nodes = bagToList binds_w_dus `zip` [0::Int ..] - edges = [ (node, key, [fromJust mb_key | n <- nameSetToList uses, - let mb_key = lookupNameEnv key_map n, - isJust mb_key ]) + edges = [ (node, key, [key | n <- nameSetToList uses, + Just key <- [lookupNameEnv key_map n] ]) | (node@(_,_,uses), key) <- keyd_nodes ] key_map :: NameEnv Int -- Which binding it comes from