[Git][ghc/ghc][wip/expand-do] rebase fix

[Apoorv Ingle (@ani)]

Apoorv Ingle pushed to branch wip/expand-do at Glasgow Haskell Compiler / GHC


Commits:
2fa3f593 by Apoorv Ingle at 2023-09-24T21:08:17-05:00
rebase fix

- - - - -


2 changed files:

- compiler/GHC/Tc/Gen/App.hs
- compiler/GHC/Tc/Gen/Head.hs


Changes:

=====================================
compiler/GHC/Tc/Gen/App.hs
=====================================
@@ -539,7 +539,7 @@ tcInstFun do_ql inst_final (tc_fun, fun_ctxt) fun_sigma rn_args
       = DoOrigin
       | VAExpansionPat pat _ <- fun_ctxt
       = DoPatOrigin pat
-      | VAExpansion e _ <- fun_ctxt
+      | VAExpansion e _ _ <- fun_ctxt
       = exprCtOrigin e
       | VACall e _ _ <- fun_ctxt
       = exprCtOrigin e


=====================================
compiler/GHC/Tc/Gen/Head.hs
=====================================
@@ -264,10 +264,9 @@ insideExpansion (VACall {})      = False -- but what if the VACall has a generat
 
 instance Outputable AppCtxt where
   ppr (VAExpansion e l _) = text "VAExpansion" <+> ppr e <+> ppr l
-  ppr (VACall f n _)    = text "VACall" <+> int n <+> ppr f
+  ppr (VACall f n l)    = text "VACall" <+> int n <+> ppr f  <+> ppr l
   ppr (VAExpansionStmt stmt l) = text "VAExpansionStmt" <+> ppr stmt <+> ppr l
   ppr (VAExpansionPat pat l) = text "VAExpansionPat" <+> ppr pat <+> ppr l
-  ppr (VACall f n l)    = text "VACall" <+> int n <+> ppr f <+> ppr l
 
 type family XPass p where
   XPass 'TcpRn   = 'Renamed
@@ -329,7 +328,7 @@ splitHsApps e = go e (top_ctxt 0 e) []
     go (HsApp _ (L l fun) arg)       ctxt args = go fun (dec l ctxt) (mkEValArg  ctxt arg   : args)
 
     -- See Note [Looking through HsExpanded]
-    go (XExpr (HsExpanded orig fun)) ctxt args
+    go (XExpr (ExpandedExpr (HsExpanded orig fun))) ctxt args
       = go fun (VAExpansion orig (appCtxtLoc ctxt) (appCtxtLoc ctxt))
                (EWrap (EExpand orig) : args)
 



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2fa3f5937a8ba433cafaa5c789776f73a37b4081
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/20230924/8af76f24/attachment-0001.html>