Deal more correctly with orphan instances

[ghc-hetmet.git] / compiler / specialise / Rules.lhs

diff --git a/compiler/specialise/Rules.lhs b/compiler/specialise/Rules.lhs
index 2798ca1..4b7e926 100644 (file)
--- a/compiler/specialise/Rules.lhs
+++ b/compiler/specialise/Rules.lhs
@@ -91,7 +91,7 @@ mkLocalRule name act fn bndrs args rhs
   = Rule { ru_name = name, ru_fn = fn, ru_act = act,
           ru_bndrs = bndrs, ru_args = args,
           ru_rhs = rhs, ru_rough = roughTopNames args,
-          ru_orph = Just (nameOccName fn), ru_local = True }
+          ru_local = True }
 
 --------------
 roughTopNames :: [CoreExpr] -> [Maybe Name]
@@ -597,7 +597,7 @@ match_var menv subst@(tv_subst, id_subst, binds) v1 e2
                | otherwise     -- No renaming to do on e2
                -> Just (tv_subst, extendVarEnv id_subst v1' e2, binds)
 
-       Just e2' | tcEqExprX (nukeRnEnvL rn_env) e2' e2 
+       Just e1' | tcEqExprX (nukeRnEnvL rn_env) e1' e2 
                 -> Just subst
 
                 | otherwise