From 6be927feb4c910a59990b5d2c32e0c41c3a2a95b Mon Sep 17 00:00:00 2001 From: Manuel M T Chakravarty Date: Tue, 19 Sep 2006 01:12:43 +0000 Subject: [PATCH] Adapt new SpecConstr functionality to GADT datacons --- compiler/specialise/SpecConstr.lhs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/specialise/SpecConstr.lhs b/compiler/specialise/SpecConstr.lhs index 46cea9b..1ee5935 100644 --- a/compiler/specialise/SpecConstr.lhs +++ b/compiler/specialise/SpecConstr.lhs @@ -18,7 +18,8 @@ import CoreSubst ( Subst, mkSubst, substExpr ) import CoreTidy ( tidyRules ) import PprCore ( pprRules ) import WwLib ( mkWorkerArgs ) -import DataCon ( dataConRepArity, dataConTyVars ) +import DataCon ( dataConRepArity, isVanillaDataCon, + dataConUnivTyVars ) import Type ( Type, tyConAppArgs, tyVarsOfTypes ) import Rules ( matchN ) import Id ( Id, idName, idType, isDataConWorkId_maybe, @@ -592,7 +593,7 @@ conArgOccs (ScrutOcc fm) (DataAlt dc) | Just pat_arg_occs <- lookupUFM fm dc = tyvar_unks ++ pat_arg_occs where - tyvar_unks | isVanillaDataCon dc = [UnkOcc | tv <- dataConTyVars dc] + tyvar_unks | isVanillaDataCon dc = [UnkOcc | tv <- dataConUnivTyVars dc] | otherwise = [] conArgOccs other con = repeat UnkOcc -- 1.7.10.4