X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcSimplify.lhs;h=8dba75c06600263bcd28b02c99c47d275d1c8ee1;hb=4e3255388e8b99ccdae290bfcb6cd666b8c93d4a;hp=b3bea61f6fa6157aa06b4db7d0dffe9a87c9be7c;hpb=d32c5227315009f38355fe3233f0f4e5b1f61dc6;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcSimplify.lhs b/ghc/compiler/typecheck/TcSimplify.lhs
index b3bea61..8dba75c 100644
--- a/ghc/compiler/typecheck/TcSimplify.lhs
+++ b/ghc/compiler/typecheck/TcSimplify.lhs
@@ -1530,7 +1530,7 @@ reduceContextWithoutImprovement doc try_me wanteds
 tcImprove :: Avails -> TcM Bool		-- False <=> no change
 -- Perform improvement using all the predicates in Avails
 tcImprove avails
- =  tcGetInstEnvs 			`thenM` \ (home_ie, pkg_ie) ->
+ =  tcGetInstEnvs 			`thenM` \ inst_envs -> 
     let
 	preds = [ (pred, pp_loc)
 		| inst <- keysFM avails,
@@ -1543,7 +1543,7 @@ tcImprove avails
 		-- NB that (?x::t1) and (?x::t2) will be held separately in avails
 		--    so that improve will see them separate
 	eqns = improve get_insts preds
-	get_insts clas = classInstances home_ie clas ++ classInstances pkg_ie clas
+	get_insts clas = classInstances inst_envs clas
      in
      if null eqns then
 	returnM True