import TcMType ( newTyVar, newTyVarTy, newHoleTyVarTy,
zonkTcTyVarToTyVar, readHoleResult
)
-import TcType ( mkTyVarTy, mkForAllTys, mkFunTys, tyVarsOfType,
+import TcType ( TcTyVar, mkTyVarTy, mkForAllTys, mkFunTys, tyVarsOfType,
mkPredTy, mkForAllTy, isUnLiftedType,
unliftedTypeKind, liftedTypeKind, openTypeKind, eqKind
)
dict_tys = map idType zonked_dict_ids
inlines = mkNameSet [name | InlineSig True name _ loc <- inline_sigs]
- no_inlines = listToFM [(name, phase) | InlineSig _ name phase _ <- inline_sigs,
- not (isAlwaysActive phase)]
+ -- Any INLINE sig (regardless of phase control)
+ -- makes the RHS look small
+ inline_phases = listToFM [(name, phase) | InlineSig _ name phase _ <- inline_sigs,
+ not (isAlwaysActive phase)]
+ -- Set the IdInfo field to control the inline phase
-- AlwaysActive is the default, so don't bother with them
mk_export binder_name zonked_mono_id
= (tyvars,
- attachNoInlinePrag no_inlines poly_id,
+ attachInlinePhase inline_phases poly_id,
zonked_mono_id)
where
(tyvars, poly_id) =
lie_free, poly_ids
)
-attachNoInlinePrag no_inlines bndr
- = case lookupFM no_inlines (idName bndr) of
+attachInlinePhase inline_phases bndr
+ = case lookupFM inline_phases (idName bndr) of
Just prag -> bndr `setInlinePragma` prag
Nothing -> bndr
tcSimplifyRestricted doc tau_tvs lie_req `thenTc` \ (qtvs, lie_free, binds) ->
-- Check that signature type variables are OK
- checkSigsTyVars sigs `thenTc_`
+ checkSigsTyVars qtvs sigs `thenTc` \ final_qtvs ->
- returnTc (qtvs, lie_free, binds, [])
+ returnTc (final_qtvs, lie_free, binds, [])
else if null sigs then -- UNRESTRICTED CASE, NO TYPE SIGS
tcSimplifyInfer doc tau_tvs lie_req
else -- UNRESTRICTED CASE, WITH TYPE SIGS
-- CHECKING CASE: Unrestricted group, there are type signatures
- -- Check signature contexts are empty
+ -- Check signature contexts are identical
checkSigsCtxts sigs `thenTc` \ (sig_avails, sig_dicts) ->
-- Check that the needed dicts can be
tcSimplifyInferCheck doc tau_tvs sig_avails lie_req `thenTc` \ (forall_tvs, lie_free, dict_binds) ->
-- Check that signature type variables are OK
- checkSigsTyVars sigs `thenTc_`
+ checkSigsTyVars forall_tvs sigs `thenTc` \ final_qtvs ->
- returnTc (forall_tvs, lie_free, dict_binds, sig_dicts)
+ returnTc (final_qtvs, lie_free, dict_binds, sig_dicts)
where
tysig_names = map (idName . tcSigPolyId) sigs
checkTc (equalLength theta theta1) sigContextsErr `thenTc_`
unifyTauTyLists sig1_dict_tys (map mkPredTy theta)
-checkSigsTyVars sigs = mapTc_ check_one sigs
+checkSigsTyVars :: [TcTyVar] -> [TcSigInfo] -> TcM [TcTyVar]
+checkSigsTyVars qtvs sigs
+ = mapTc check_one sigs `thenTc` \ sig_tvs_s ->
+ let
+ -- Sigh. Make sure that all the tyvars in the type sigs
+ -- appear in the returned ty var list, which is what we are
+ -- going to generalise over. Reason: we occasionally get
+ -- silly types like
+ -- type T a = () -> ()
+ -- f :: T a
+ -- f () = ()
+ -- Here, 'a' won't appear in qtvs, so we have to add it
+
+ sig_tvs = foldr (unionVarSet . mkVarSet) emptyVarSet sig_tvs_s
+ all_tvs = mkVarSet qtvs `unionVarSet` sig_tvs
+ in
+ returnTc (varSetElems all_tvs)
where
check_one (TySigInfo id sig_tyvars sig_theta sig_tau _ _ src_loc)
= tcAddSrcLoc src_loc $