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
2 changed files:
Changes:
| ... | ... | @@ -955,14 +955,23 @@ addArgCtxt :: Int -> (HsExpr GhcRn, SrcSpan) -> LHsExpr GhcRn |
| 955 | 955 | -- See Note [Rebindable syntax and XXExprGhcRn] in GHC.Hs.Expr
|
| 956 | 956 | -- See Note [Expanding HsDo with XXExprGhcRn] in GHC.Tc.Gen.Do
|
| 957 | 957 | addArgCtxt arg_no (app_head, app_head_lspan) (L arg_loc arg) thing_inside
|
| 958 | - | isGoodSrcSpan app_head_lspan
|
|
| 959 | - = do { traceTc "addArgCtxt" (vcat [text "goodSrcSpan", ppr app_head, ppr app_head_lspan, ppr arg_loc, ppr arg, ppr arg_no])
|
|
| 958 | + | not (isGeneratedSrcSpan app_head_lspan)
|
|
| 959 | + = do { traceTc "addArgCtxt" (vcat [text "not generated Head"
|
|
| 960 | + , ppr app_head
|
|
| 961 | + , ppr app_head_lspan
|
|
| 962 | + , ppr arg_loc
|
|
| 963 | + , ppr arg
|
|
| 964 | + , ppr arg_no])
|
|
| 960 | 965 | ; setSrcSpanA arg_loc $
|
| 961 | 966 | addErrCtxt (FunAppCtxt (FunAppCtxtExpr app_head arg) arg_no) $
|
| 962 | 967 | thing_inside
|
| 963 | 968 | }
|
| 964 | 969 | | otherwise
|
| 965 | - = do { traceTc "addArgCtxt" (vcat [text "generatedHead", ppr app_head, ppr app_head_lspan, ppr arg_loc, ppr arg])
|
|
| 970 | + = do { traceTc "addArgCtxt" (vcat [text "generated Head"
|
|
| 971 | + , ppr app_head
|
|
| 972 | + , ppr app_head_lspan
|
|
| 973 | + , ppr arg_loc
|
|
| 974 | + , ppr arg])
|
|
| 966 | 975 | ; addLExprCtxt (locA arg_loc) arg $
|
| 967 | 976 | thing_inside
|
| 968 | 977 | }
|
| ... | ... | @@ -1121,10 +1121,10 @@ add_expr_ctxt e thing_inside |
| 1121 | 1121 | |
| 1122 | 1122 | addLExprCtxt :: SrcSpan -> HsExpr GhcRn -> TcRn a -> TcRn a
|
| 1123 | 1123 | addLExprCtxt lspan e thing_inside
|
| 1124 | - | isGoodSrcSpan lspan
|
|
| 1124 | + | not (isGeneratedSrcSpan lspan)
|
|
| 1125 | 1125 | , (HsPar _ e') <- e
|
| 1126 | 1126 | = setSrcSpan lspan $ add_expr_ctxt (unLoc e') thing_inside
|
| 1127 | - | isGoodSrcSpan lspan
|
|
| 1127 | + | not (isGeneratedSrcSpan lspan)
|
|
| 1128 | 1128 | = setSrcSpan lspan $ add_expr_ctxt e thing_inside
|
| 1129 | 1129 | | otherwise
|
| 1130 | 1130 | = thing_inside |