[Git][ghc/ghc][wip/T23923-mikolaj-take-2] 2 commits: Add the only remaining piece of feedback from git add src/Flavour.hs

[Mikolaj Konarski (@Mikolaj)]

Mikolaj Konarski pushed to branch wip/T23923-mikolaj-take-2 at Glasgow Haskell Compiler / GHC


Commits:
4d3e9f8a by Mikolaj Konarski at 2024-02-08T01:43:03+01:00
Add the only remaining piece of feedback from git add src/Flavour.hs

- - - - -
178cba24 by Mikolaj Konarski at 2024-02-08T01:44:34+01:00
Help CI check some more of the patch

- - - - -


1 changed file:

- compiler/GHC/Core/Coercion/Opt.hs


Changes:

=====================================
compiler/GHC/Core/Coercion/Opt.hs
=====================================
@@ -641,9 +641,9 @@ opt_univ env sym prov role oty1 oty2
   where
     prov' = case prov of
       ProofIrrelProv kco -> ProofIrrelProv $ opt_co4_wrap env sym False Nominal kco
-      PluginProv s cvs   -> PluginProv s $! substDCoVarSet (lcTCvSubst env) cvs
+      PluginProv s cvs   -> PluginProv s $! substDCoVarSet (undefined{-lcTCvSubst-} env) cvs
 
-lcTCvSubst = undefined  -- !!! neither lcTCvSubst nor lcSubst exist any more; what shall I use here? lcSubstLeft? lcSubstRight? leave the cvs alone?
+-- !!! neither lcTCvSubst nor lcSubst exist any more; what shall I use here? lcSubstLeft? lcSubstRight? leave the cvs alone?
 
 -------------
 opt_transList :: HasDebugCallStack => InScopeSet -> [NormalCo] -> [NormalCo] -> [NormalCo]
@@ -726,6 +726,10 @@ opt_trans_rule is in_co1@(UnivCo p1 r1 tyl1 _tyr1)
       = Just $ ProofIrrelProv $ opt_trans is kco1 kco2
     opt_trans_prov (PluginProv str1 cvs1) (PluginProv str2 cvs2)
       | str1 == str2 && cvs1 == cvs2 = Just p1
+-- !!! but Adam says "You'll want [...] the union of both sets of coercion variables.", so should we instead do
+--  opt_trans_prov (PluginProv str1 cvs1) (PluginProv str2 cvs2)
+--    | str1 == str2 = Just (PluginProv str1 (cvs1 `union` cvs2)
+-- ??? maybe also concatenate the strings instead of comparing them?
     opt_trans_prov _ _ = Nothing
 
 -- Push transitivity down through matching top-level constructors.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/81981098310b0ff8f70160c7f7047dcbd92c2697...178cba2464a559a75042af77bdfe2d07bcade7d6

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/81981098310b0ff8f70160c7f7047dcbd92c2697...178cba2464a559a75042af77bdfe2d07bcade7d6
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240207/f9fc643b/attachment-0001.html>