Apoorv Ingle pushed to branch wip/ani/precise-fun-loc at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Tc/Types/ErrCtxt.hs
    ... ... @@ -373,7 +373,8 @@ data HsCtxt
    373 373
     
    
    374 374
     
    
    375 375
     isHsCtxtLandmark :: HsCtxt -> Bool
    
    376
    -isHsCtxtLandmark (DerivBindCtxt{}) = True
    
    377
    -isHsCtxtLandmark (FunResCtxt{}) = True
    
    376
    +isHsCtxtLandmark (DerivBindCtxt{})  = True
    
    377
    +isHsCtxtLandmark (FunResCtxt{})     = True
    
    378 378
     isHsCtxtLandmark (VDQWarningCtxt{}) = True
    
    379
    +isHsCtxtLandmark (StmtErrCtxtPat{}) = True
    
    379 380
     isHsCtxtLandmark _ = False

  • testsuite/tests/monadfail/MonadFailErrors.stderr
    ... ... @@ -14,6 +14,10 @@ MonadFailErrors.hs:14:5: error: [GHC-39999]
    14 14
           In the expression:
    
    15 15
             do Just x <- undefined
    
    16 16
                undefined
    
    17
    +      In an equation for ‘general’:
    
    18
    +          general
    
    19
    +            = do Just x <- undefined
    
    20
    +                 undefined
    
    17 21
     
    
    18 22
     MonadFailErrors.hs:28:5: error: [GHC-39999]
    
    19 23
         • No instance for ‘MonadFail Identity’
    
    ... ... @@ -23,6 +27,10 @@ MonadFailErrors.hs:28:5: error: [GHC-39999]
    23 27
           In the expression:
    
    24 28
             do Just x <- undefined
    
    25 29
                undefined
    
    30
    +      In an equation for ‘identity’:
    
    31
    +          identity
    
    32
    +            = do Just x <- undefined
    
    33
    +                 undefined
    
    26 34
     
    
    27 35
     MonadFailErrors.hs:42:5: error: [GHC-39999]
    
    28 36
         • No instance for ‘MonadFail ((->) r)’
    
    ... ... @@ -32,4 +40,8 @@ MonadFailErrors.hs:42:5: error: [GHC-39999]
    32 40
           In the expression:
    
    33 41
             do Just x <- undefined
    
    34 42
                undefined
    
    43
    +      In an equation for ‘reader’:
    
    44
    +          reader
    
    45
    +            = do Just x <- undefined
    
    46
    +                 undefined
    
    35 47