-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from clash-lang/941-support
Add support for GHC 9.4.1
- Loading branch information
Showing
14 changed files
with
327 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| module GhcApi.Constraint | ||
| ( Ct(..) | ||
| , CtEvidence(..) | ||
| , CtLoc | ||
| , CanEqLHS(..) | ||
| , ctLoc | ||
| , ctEvId | ||
| , mkNonCanonical | ||
| ) | ||
| where | ||
|
|
||
| import GHC.Tc.Types.Constraint | ||
| (Ct (..), CtEvidence (..), CanEqLHS (..), CtLoc, ctLoc, ctEvId, mkNonCanonical) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| module GhcApi.GhcPlugins (module GHC.Plugins, FindResult(..), findPluginModule) where | ||
|
|
||
| import GHC.Plugins hiding (TcPlugin, mkSubst) | ||
| import GHC.Unit.Finder (findPluginModule) | ||
| import GHC.Tc.Plugin (FindResult(..)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| {-# LANGUAGE RecordWildCards #-} | ||
|
|
||
| module Internal.Constraint (newGiven, flatToCt, mkSubst, overEvidencePredType) where | ||
|
|
||
| import GhcApi.GhcPlugins | ||
| import GhcApi.Constraint | ||
| (Ct(..), CtEvidence(..), CanEqLHS(..), CtLoc, ctLoc, ctEvId, mkNonCanonical) | ||
|
|
||
| import GHC.Tc.Utils.TcType (TcType) | ||
| import GHC.Tc.Types.Constraint (QCInst(..)) | ||
| import GHC.Tc.Types.Evidence (EvTerm(..), EvBindsVar) | ||
| import GHC.Tc.Plugin (TcPluginM) | ||
| import qualified GHC.Tc.Plugin as TcPlugin (newGiven) | ||
|
|
||
| -- | Create a new [G]iven constraint, with the supplied evidence. This must not | ||
| -- be invoked from 'tcPluginInit' or 'tcPluginStop', or it will panic. | ||
| newGiven :: EvBindsVar -> CtLoc -> PredType -> EvTerm -> TcPluginM CtEvidence | ||
| newGiven tcEvbinds loc pty (EvExpr ev) = TcPlugin.newGiven tcEvbinds loc pty ev | ||
| newGiven _ _ _ ev = panicDoc "newGiven: not an EvExpr: " (ppr ev) | ||
|
|
||
| flatToCt :: [((TcTyVar,TcType),Ct)] -> Maybe Ct | ||
| flatToCt [((_,lhs),ct),((_,rhs),_)] | ||
| = Just | ||
| $ mkNonCanonical | ||
| $ CtGiven (mkPrimEqPred lhs rhs) | ||
| (ctEvId ct) | ||
| (ctLoc ct) | ||
|
|
||
| flatToCt _ = Nothing | ||
|
|
||
| -- | Create simple substitution from type equalities | ||
| mkSubst :: Ct -> Maybe ((TcTyVar, TcType),Ct) | ||
| mkSubst ct@(CEqCan {..}) | ||
| | TyVarLHS tyvar <- cc_lhs | ||
| = Just ((tyvar,cc_rhs),ct) | ||
| mkSubst _ = Nothing | ||
|
|
||
| -- | Modify the predicate type of the evidence term of a constraint | ||
| overEvidencePredType :: (TcType -> TcType) -> Ct -> Ct | ||
| overEvidencePredType f (CQuantCan qci) = | ||
| let | ||
| ev :: CtEvidence | ||
| ev = qci_ev qci | ||
| in CQuantCan ( qci { qci_ev = ev { ctev_pred = f (ctev_pred ev) } } ) | ||
| overEvidencePredType f ct = | ||
| let | ||
| ev :: CtEvidence | ||
| ev = cc_ev ct | ||
| in ct { cc_ev = ev { ctev_pred = f (ctev_pred ev) } } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| module Internal.Evidence (evByFiat) where | ||
|
|
||
| import GHC.Tc.Types.Evidence (EvTerm(..)) | ||
| import GHC.Core.TyCo.Rep (UnivCoProvenance (..)) | ||
|
|
||
| import GhcApi.GhcPlugins | ||
|
|
||
| -- | The 'EvTerm' equivalent for 'Unsafe.unsafeCoerce' | ||
| evByFiat :: String -- ^ Name the coercion should have | ||
| -> Type -- ^ The LHS of the equivalence relation (~) | ||
| -> Type -- ^ The RHS of the equivalence relation (~) | ||
| -> EvTerm | ||
| evByFiat name t1 t2 = | ||
| EvExpr $ Coercion $ mkUnivCo (PluginProv name) Nominal t1 t2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| module Internal.Type (substType) where | ||
|
|
||
| import Data.Maybe (fromMaybe) | ||
| import GHC.Tc.Utils.TcType (TcType) | ||
| import GHC.Core.TyCo.Rep (Type (..)) | ||
| import GHC.Types.Var (TcTyVar) | ||
|
|
||
| -- | Apply substitutions in Types | ||
| -- | ||
| -- __NB:__ Doesn't substitute under binders | ||
| substType | ||
| :: [(TcTyVar, TcType)] | ||
| -> TcType | ||
| -> TcType | ||
| substType subst tv@(TyVarTy v) = | ||
| fromMaybe tv (lookup v subst) | ||
| substType subst (AppTy t1 t2) = | ||
| AppTy (substType subst t1) (substType subst t2) | ||
| substType subst (TyConApp tc xs) = | ||
| TyConApp tc (map (substType subst) xs) | ||
| substType _subst t@(ForAllTy _tv _ty) = | ||
| -- TODO: Is it safe to do "dumb" substitution under binders? | ||
| -- ForAllTy tv (substType subst ty) | ||
| t | ||
| substType subst (FunTy k1 k2 t1 t2) = | ||
| FunTy k1 k2 (substType subst t1) (substType subst t2) | ||
| substType _ l@(LitTy _) = l | ||
| substType subst (CastTy ty co) = | ||
| CastTy (substType subst ty) co | ||
| substType _ co@(CoercionTy _) = co |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| module GhcApi.Predicate (mkPrimEqPred) where | ||
|
|
||
| import GHC.Core.Coercion (mkPrimEqPred) |
Oops, something went wrong.