Apoorv Ingle pushed to branch wip/ani/kill-CodeSrcFlag at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Tc/Types/ErrCtxt.hs
    ... ... @@ -396,4 +396,5 @@ data ErrCtxtMsg
    396 396
     isErrCtxtMsgLandmark :: ErrCtxtMsg -> Bool
    
    397 397
     isErrCtxtMsgLandmark (DerivBindCtxt{}) = True
    
    398 398
     isErrCtxtMsgLandmark (FunResCtxt{}) = True
    
    399
    +isErrCtxtMsgLandmark (VDQWarningCtxt{}) = True
    
    399 400
     isErrCtxtMsgLandmark _ = False

  • compiler/GHC/Tc/Utils/Monad.hs
    ... ... @@ -1376,7 +1376,7 @@ addErrCtxt msg = addErrCtxtM msg
    1376 1376
     -- See Note [ErrCtxtStack Manipulation]
    
    1377 1377
     addExpansionErrCtxt :: ErrCtxtMsg -> TcM a -> TcM a
    
    1378 1378
     {-# INLINE addExpansionErrCtxt #-}   -- Note [Inlining addErrCtxt]
    
    1379
    -addExpansionErrCtxt msg = addExpansionErrCtxtM msg
    
    1379
    +addExpansionErrCtxt msg = setInGeneratedCode $ addExpansionErrCtxtM msg
    
    1380 1380
     
    
    1381 1381
     -- | Add a message to the error context. This message may do tidying.
    
    1382 1382
     --   See Note [Rebindable syntax and XXExprGhcRn] in GHC.Hs.Expr