From ff44fc57780ee026aa0cb30aecf109b8786aa40e Mon Sep 17 00:00:00 2001 From: simonpj Date: Tue, 8 Apr 2003 11:01:00 +0000 Subject: [PATCH] [project @ 2003-04-08 11:01:00 by simonpj] Fix unbox-strict-fields deriving bug; MERGE TO STABLE --- ghc/compiler/typecheck/TcDeriv.lhs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs index 6221930..10a7ff7 100644 --- a/ghc/compiler/typecheck/TcDeriv.lhs +++ b/ghc/compiler/typecheck/TcDeriv.lhs @@ -36,7 +36,7 @@ import Class ( className, classArity, classKey, classTyVars, classSCTheta, Clas import Subst ( mkTyVarSubst, substTheta ) import ErrUtils ( dumpIfSet_dyn ) import MkId ( mkDictFunId ) -import DataCon ( dataConRepArgTys, dataConOrigArgTys, isNullaryDataCon, isExistentialDataCon ) +import DataCon ( dataConOrigArgTys, isNullaryDataCon, isExistentialDataCon ) import Maybes ( maybeToBool, catMaybes ) import Name ( Name, getSrcLoc, nameUnique ) import NameSet @@ -344,7 +344,7 @@ makeDerivEqns tycl_decls constraints = extra_constraints ++ [ mkClassPred clas [arg_ty] | data_con <- tyConDataCons tycon, - arg_ty <- dataConRepArgTys data_con, -- dataConOrigArgTys??? + arg_ty <- dataConOrigArgTys data_con, -- Use the same type variables -- as the type constructor, -- hence no need to instantiate -- 1.7.10.4