Andreas Klebinger pushed to branch wip/andreask/9.10.4-batch1 at Glasgow Haskell Compiler / GHC

Commits:

• ffcaf0ff
  by Matthew Pickering at 2026-05-21T09:41:54+02:00

  Fix toException method for ExceptionWithContext
  
  Fixes #25235
  
  (cherry picked from commit 9bfd9fd0730359b4e88e97b08d3654d966a9a11d)
  

1 changed file:

• libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs

Changes:

 instance Exception a => Exception (ExceptionWithContext a) where

     toException (ExceptionWithContext ctxt e) =

-        SomeException e

-      where ?exceptionContext = ctxt

+        case toException e of

+          SomeException c ->

+            let ?exceptionContext = ctxt

+            in SomeException c

     fromException se = do

         e <- fromException se

         return (ExceptionWithContext (someExceptionContext se) e)