[Git][ghc/ghc][wip/T23109] Wibbles

[Simon Peyton Jones (@simonpj)]

Simon Peyton Jones pushed to branch wip/T23109 at Glasgow Haskell Compiler / GHC


Commits:
f0cac5db by Simon Peyton Jones at 2024-05-15T21:36:02+01:00
Wibbles

- - - - -


2 changed files:

- compiler/GHC/CoreToStg/Prep.hs
- compiler/GHC/Tc/Instance/Class.hs


Changes:

=====================================
compiler/GHC/CoreToStg/Prep.hs
=====================================
@@ -1332,7 +1332,7 @@ isUnaryClassApp v args
                  (mkTyConApp tycon ty_args)
                  (scaledThing meth_ty)
       where
-        [meth_ty] = dataConInstOrigArgTys (tyConSingleDataCon tycon) ty_args
+        [meth_ty] = dataConInstArgTys (tyConSingleDataCon tycon) ty_args
 
 getUnaryClassPayload :: TyCon -> [ArgInfo] -> Maybe (CoreExpr, [Type], [ArgInfo])
 getUnaryClassPayload tc args


=====================================
compiler/GHC/Tc/Instance/Class.hs
=====================================
@@ -434,7 +434,7 @@ matchWithDict [cls, mty]
     -- Check that C is a class of the form
     -- `class C a_1 ... a_n where op :: meth_ty`
   , Just dict_dc <- isUnaryClassTyCon_maybe dict_tc
-  , [inst_meth_ty] <- dataConInstOrigArgTys dict_dc dict_args
+  , [inst_meth_ty] <- dataConInstArgTys dict_dc dict_args
   = do { sv <- mkSysLocalM (fsLit "withDict_s") ManyTy mty
        ; k  <- mkSysLocalM (fsLit "withDict_k") ManyTy (mkInvisFunTy cls openAlphaTy)
        ; wd_cls <- tcLookupClass withDictClassName



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f0cac5db3261e4ebaa71f507e07ac0647dc306d0

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f0cac5db3261e4ebaa71f507e07ac0647dc306d0
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/20240515/c95d580a/attachment-0001.html>