diff options
| author | Richard Eisenberg <eir@cis.upenn.edu> | 2014-12-12 17:19:21 -0500 |
|---|---|---|
| committer | Richard Eisenberg <eir@cis.upenn.edu> | 2014-12-12 17:24:37 -0500 |
| commit | 0cc47eb90805f3e166ac4d3991e66d3346ca05e7 (patch) | |
| tree | 1ed6c6dd440e1dcdd32f16d547b3e0c4ceeddbda /compiler/typecheck/FunDeps.hs | |
| parent | 058262bac0bbcd65f40703bf8047238ffa30d2c3 (diff) | |
| download | haskell-0cc47eb90805f3e166ac4d3991e66d3346ca05e7.tar.gz | |
Rewrite `Coercible` solver
Summary:
This is a rewrite of the algorithm to solve for Coercible "instances".
A preliminary form of these ideas is at
https://ghc.haskell.org/trac/ghc/wiki/Design/NewCoercibleSolver
The basic idea here is that the `EqPred` constructor of `PredTree`
now is parameterised by a new type `EqRel` (where
`data EqRel = NomEq | ReprEq`). Thus, every equality constraint can
now talk about nominal equality (the usual case) or representational
equality (the `Coercible` case).
This is a change from the previous
behavior where `Coercible` was just considered a regular class with
a special case in `matchClassInst`.
Because of this change, representational equalities are now
canonicalized just like nominal ones, allowing more equalities
to be solved -- in particular, the case at the top of #9117.
A knock-on effect is that the flattener must be aware of the
choice of equality relation, because the inert set now stores
both representational inert equalities alongside the nominal
inert equalities. Of course, we can use representational equalities
to rewrite only within another representational equality --
thus the parameterization of the flattener.
A nice side effect of this change is that I've introduced a new
type `CtFlavour`, which tracks G vs. W vs. D, removing some ugliness
in the flattener.
This commit includes some refactoring as discussed on D546.
It also removes the ability of Deriveds to rewrite Deriveds.
This fixes bugs #9117 and #8984.
Reviewers: simonpj, austin, nomeata
Subscribers: carter, thomie
Differential Revision: https://phabricator.haskell.org/D546
GHC Trac Issues: #9117, #8984
Diffstat (limited to 'compiler/typecheck/FunDeps.hs')
| -rw-r--r-- | compiler/typecheck/FunDeps.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/typecheck/FunDeps.hs b/compiler/typecheck/FunDeps.hs index 65767faded..a55fa2e3b8 100644 --- a/compiler/typecheck/FunDeps.hs +++ b/compiler/typecheck/FunDeps.hs @@ -480,9 +480,9 @@ oclose preds fixed_tvs do let (cls_tvs, cls_fds) = classTvsFds cls fd <- cls_fds return (instFD fd cls_tvs tys) - EqPred t1 t2 -> [([t1],[t2]), ([t2],[t1])] - TuplePred ts -> concatMap determined ts - _ -> [] + EqPred NomEq t1 t2 -> [([t1],[t2]), ([t2],[t1])] + TuplePred ts -> concatMap determined ts + _ -> [] {- ************************************************************************ |