X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fspecialise%2FSpecConstr.lhs;h=d9c611a0ab2d0536af5bcf41cd97c4f433da03f4;hp=84f8698188be323c5585e3e1d096f1182271012f;hb=92267aa26adb1ab5a6d8004a80fdf6aa06ea4e44;hpb=f03b9562a92c6ef94c603a334d5d5e1cd2165c92

diff --git a/compiler/specialise/SpecConstr.lhs b/compiler/specialise/SpecConstr.lhs
index 84f8698..d9c611a 100644
--- a/compiler/specialise/SpecConstr.lhs
+++ b/compiler/specialise/SpecConstr.lhs
@@ -31,7 +31,7 @@ import Coercion
 import Rules
 import Type		hiding( substTy )
 import Id
-import MkId		( mkImpossibleExpr )
+import MkCore		( mkImpossibleExpr )
 import Var
 import VarEnv
 import VarSet
@@ -672,7 +672,7 @@ extendCaseBndrs env case_bndr con alt_bndrs
   	--	Var v  -> extendValEnv env1 v cval
 	--	_other -> env1
  where
-   zap v | isTyVar v = v		-- See NB2 above
+   zap v | isTyCoVar v = v		-- See NB2 above
          | otherwise = zapIdOccInfo v
    env1 = extendValEnv env case_bndr cval
    cval = case con of
@@ -936,7 +936,7 @@ scExpr' env (Case scrut b ty alts)
 	   ; return (usg', scrut_occ, (con, bs2, rhs')) }
 
 scExpr' env (Let (NonRec bndr rhs) body)
-  | isTyVar bndr	-- Type-lets may be created by doBeta
+  | isTyCoVar bndr	-- Type-lets may be created by doBeta
   = scExpr' (extendScSubst env bndr rhs) body
 
   | otherwise		   -- Note [Local let bindings]
@@ -1279,7 +1279,8 @@ spec_one env fn arg_bndrs body (call_pat@(qvars, pats), rule_number)
 	      body_ty    = exprType spec_body
 	      rule_rhs   = mkVarApps (Var spec_id) spec_call_args
               inline_act = idInlineActivation fn
-	      rule       = mkLocalRule rule_name inline_act fn_name qvars pats rule_rhs
+	      rule       = mkRule True {- Auto -} True {- Local -}
+                                  rule_name inline_act fn_name qvars pats rule_rhs
 	      		   -- See Note [Transfer activation]
 	; return (spec_usg, OS call_pat rule spec_id spec_rhs) }
 
@@ -1398,7 +1399,7 @@ callToPats env bndr_occs (con_env, args)
 		-- at the call site
 		-- See Note [Shadowing] at the top
 		
-	      (tvs, ids) = partition isTyVar qvars
+	      (tvs, ids) = partition isTyCoVar qvars
 	      qvars'     = tvs ++ ids
 		-- Put the type variables first; the type of a term
 		-- variable may mention a type variable
@@ -1572,7 +1573,7 @@ isValue env (Var v)
 	-- as well, for let-bound constructors!
 
 isValue env (Lam b e)
-  | isTyVar b = case isValue env e of
+  | isTyCoVar b = case isValue env e of
 		  Just _  -> Just LambdaVal
 		  Nothing -> Nothing
   | otherwise = Just LambdaVal