X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcDeriv.lhs;h=af6840845926a63d6a2c454a4bd25d4658f4943b;hb=49a8e5c021009430d373d6224b29004c7d18c408;hp=3a05380752260e2db2bb7325468b83294dd7f482;hpb=cfc8f7c2a49494d47d2966b310c5b3fbc2ae2499;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index 3a05380..af68408 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -436,10 +436,7 @@ makeDerivSpecs is_boot tycl_decls inst_decls deriv_decls
 
     all_tydata :: [(LHsType Name, LTyClDecl Name)]
 	-- Derived predicate paired with its data type declaration
-    all_tydata = extractTyDataPreds tycl_decls ++
-		 [ pd                -- Traverse assoc data families
-                 | L _ (InstDecl _ _ _ ats) <- inst_decls
-		 , pd <- extractTyDataPreds ats ]
+    all_tydata = extractTyDataPreds (instDeclATs inst_decls ++ tycl_decls)
 
     deriv_locs = map (getLoc . snd) all_tydata
 		 ++ map getLoc deriv_decls