Apoorv Ingle pushed to branch wip/spj-apporv-Oct24 at Glasgow Haskell Compiler / GHC Commits: 5a1495d4 by Apoorv Ingle at 2025-11-10T12:13:33-06:00 make sure only expression wrapped around generated src span are ignored while adding them to the error context stack - - - - - 2 changed files: - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Head.hs Changes: ===================================== compiler/GHC/Tc/Gen/App.hs ===================================== @@ -955,14 +955,23 @@ addArgCtxt :: Int -> (HsExpr GhcRn, SrcSpan) -> LHsExpr GhcRn -- See Note [Rebindable syntax and XXExprGhcRn] in GHC.Hs.Expr -- See Note [Expanding HsDo with XXExprGhcRn] in GHC.Tc.Gen.Do addArgCtxt arg_no (app_head, app_head_lspan) (L arg_loc arg) thing_inside - | isGoodSrcSpan app_head_lspan - = do { traceTc "addArgCtxt" (vcat [text "goodSrcSpan", ppr app_head, ppr app_head_lspan, ppr arg_loc, ppr arg, ppr arg_no]) + | not (isGeneratedSrcSpan app_head_lspan) + = do { traceTc "addArgCtxt" (vcat [text "not generated Head" + , ppr app_head + , ppr app_head_lspan + , ppr arg_loc + , ppr arg + , ppr arg_no]) ; setSrcSpanA arg_loc $ addErrCtxt (FunAppCtxt (FunAppCtxtExpr app_head arg) arg_no) $ thing_inside } | otherwise - = do { traceTc "addArgCtxt" (vcat [text "generatedHead", ppr app_head, ppr app_head_lspan, ppr arg_loc, ppr arg]) + = do { traceTc "addArgCtxt" (vcat [text "generated Head" + , ppr app_head + , ppr app_head_lspan + , ppr arg_loc + , ppr arg]) ; addLExprCtxt (locA arg_loc) arg $ thing_inside } ===================================== compiler/GHC/Tc/Gen/Head.hs ===================================== @@ -1121,10 +1121,10 @@ add_expr_ctxt e thing_inside addLExprCtxt :: SrcSpan -> HsExpr GhcRn -> TcRn a -> TcRn a addLExprCtxt lspan e thing_inside - | isGoodSrcSpan lspan + | not (isGeneratedSrcSpan lspan) , (HsPar _ e') <- e = setSrcSpan lspan $ add_expr_ctxt (unLoc e') thing_inside - | isGoodSrcSpan lspan + | not (isGeneratedSrcSpan lspan) = setSrcSpan lspan $ add_expr_ctxt e thing_inside | otherwise = thing_inside View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5a1495d4ae1bd832e1e86796e6cb2722... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5a1495d4ae1bd832e1e86796e6cb2722... You're receiving this email because of your account on gitlab.haskell.org.