[commit: ghc] master: Fix egregious blunder in extractRelevantInerts (07f524c)
git at git.haskell.org
git at git.haskell.org
Wed Sep 18 17:21:02 CEST 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/07f524cfa4391e78083185ddd47d7981c606be9f/ghc
>---------------------------------------------------------------
commit 07f524cfa4391e78083185ddd47d7981c606be9f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Wed Sep 18 16:20:28 2013 +0100
Fix egregious blunder in extractRelevantInerts
>---------------------------------------------------------------
07f524cfa4391e78083185ddd47d7981c606be9f
compiler/typecheck/TcSMonad.lhs | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/compiler/typecheck/TcSMonad.lhs b/compiler/typecheck/TcSMonad.lhs
index 1ab7fae..02f97cb 100644
--- a/compiler/typecheck/TcSMonad.lhs
+++ b/compiler/typecheck/TcSMonad.lhs
@@ -871,13 +871,11 @@ extractRelevantInerts wi
let (cts,dict_map) = getRelevantCts cl (inert_dicts ics)
in (cts, ics { inert_dicts = dict_map })
- extract_ics_relevants ct ics@(IC { inert_funeqs = funeq_map })
- | Just (tc,tys) <- isCFunEqCan_maybe ct
- , let fam_head = mkTyConApp tc tys
+ extract_ics_relevants (CFunEqCan { cc_fun = tc, cc_tyargs = tys })
+ ics@(IC { inert_funeqs = funeq_map })
+ | let fam_head = mkTyConApp tc tys
, Just ct <- lookupFamHead funeq_map fam_head
= (singleCt ct, ics { inert_funeqs = delFamHead funeq_map fam_head })
- | otherwise
- = (emptyCts, ics)
extract_ics_relevants (CHoleCan {}) ics
= pprPanic "extractRelevantInerts" (ppr wi)
More information about the ghc-commits
mailing list