- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/davide/windows-dlls] WIP export-all-symbols from hadrian
by David Eichmann (＠DavidEichmann) 29 Jun '26

29 Jun '26

David Eichmann pushed to branch wip/davide/windows-dlls at Glasgow Haskell Compiler / GHC Commits: dfcf7eca by David Eichmann at 2026-06-29T16:15:31+01:00 WIP export-all-symbols from hadrian - - - - - 7 changed files: - hadrian/src/Settings/Packages.hs - libraries/base/src/Control/Concurrent.hs - libraries/ghc-internal/cbits/inputReady.c - libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/GMP.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Float/RealFracMethods.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -322,6 +322,7 @@ rtsPackageArgs = package rts ? do , Threaded `wayUnit` way ? arg "-DTHREADED_RTS" , notM targetSupportsSMP ? arg "-optc-DNOSMP" , isWinHost ? arg "-optl-Wl,--disable-runtime-pseudo-reloc" + <> arg "-optl-Wl,--export-all-symbols" -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs -- ===================================== libraries/base/src/Control/Concurrent.hs ===================================== @@ -132,6 +132,12 @@ import Control.Concurrent.Chan import Control.Concurrent.QSem import Control.Concurrent.QSemN + +-- Needed for windows dynamic builds +-- TODO we may need to disable inlining of ccalls by default +{-# NOINLINE waitFd #-} + + {- $conc_intro The concurrency extension for Haskell is described in the paper ===================================== libraries/ghc-internal/cbits/inputReady.c ===================================== @@ -150,6 +150,7 @@ compute_WaitForSingleObject_timeout(bool infinite, Time remaining) * 1 => Input ready, 0 => not ready, -1 => error * On error, sets `errno`. */ +__attribute__((dllexport)) int fdReady(int fd, bool write, int64_t msecs, bool isSock) { ===================================== libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/GMP.hs ===================================== @@ -622,8 +622,11 @@ foreign import ccall unsafe "integer_gmp_mpn_xor_n" -> IO () -- mp_bitcnt_t mpn_popcount (const mp_limb_t *s1p, mp_size_t n) +{-# NOINLINE c_mpn_popcount #-} +c_mpn_popcount :: ByteArray# -> GmpSize# -> Word# +c_mpn_popcount a b = _c_mpn_popcount a b foreign import ccall unsafe "gmp.h __gmpn_popcount" - c_mpn_popcount :: ByteArray# -> GmpSize# -> Word# + _c_mpn_popcount :: ByteArray# -> GmpSize# -> Word# -- double integer_gmp_mpn_get_d (const mp_limb_t sp[], const mp_size_t sn) foreign import ccall unsafe "integer_gmp_mpn_get_d" ===================================== libraries/ghc-internal/src/GHC/Internal/Float.hs ===================================== @@ -1633,13 +1633,19 @@ powerDouble :: Double -> Double -> Double powerDouble (D# x) (D# y) = D# (x **## y) foreign import ccall unsafe "isFloatNaN" isFloatNaN :: Float -> Int -foreign import ccall unsafe "isFloatInfinite" isFloatInfinite :: Float -> Int +{-# NOINLINE isFloatInfinite #-} +isFloatInfinite :: Float -> Int +isFloatInfinite x = cIsFloatInfinite x +foreign import ccall unsafe "isFloatInfinite" cIsFloatInfinite :: Float -> Int foreign import ccall unsafe "isFloatDenormalized" isFloatDenormalized :: Float -> Int foreign import ccall unsafe "isFloatNegativeZero" isFloatNegativeZero :: Float -> Int foreign import ccall unsafe "isFloatFinite" isFloatFinite :: Float -> Int foreign import ccall unsafe "isDoubleNaN" isDoubleNaN :: Double -> Int -foreign import ccall unsafe "isDoubleInfinite" isDoubleInfinite :: Double -> Int +{-# NOINLINE isDoubleInfinite #-} +isDoubleInfinite :: Double -> Int +isDoubleInfinite x = cIsDoubleInfinite x +foreign import ccall unsafe "isDoubleInfinite" cIsDoubleInfinite :: Double -> Int foreign import ccall unsafe "isDoubleDenormalized" isDoubleDenormalized :: Double -> Int foreign import ccall unsafe "isDoubleNegativeZero" isDoubleNegativeZero :: Double -> Int foreign import ccall unsafe "isDoubleFinite" isDoubleFinite :: Double -> Int ===================================== libraries/ghc-internal/src/GHC/Internal/Float/RealFracMethods.hs ===================================== @@ -357,5 +357,8 @@ float2Integer (F# x) = foreign import ccall unsafe "rintDouble" c_rintDouble :: Double -> Double +{-# NOINLINE c_rintFloat #-} +c_rintFloat :: Float -> Float +c_rintFloat = _c_rintFloat foreign import ccall unsafe "rintFloat" - c_rintFloat :: Float -> Float + _c_rintFloat :: Float -> Float ===================================== libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs ===================================== @@ -109,6 +109,14 @@ import GHC.Internal.Num import GHC.Internal.Base ( String, otherwise, return, ($) ) import GHC.Internal.Types ( Bool(..) ) + + +-- Needed for windows dynamic builds +-- TODO we may need to disable inlining of ccalls by default +{-# NOINLINE getErrno #-} + + + -- "errno" type -- ------------ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dfcf7ecabc1fafbd0e1a5b348de349b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dfcf7ecabc1fafbd0e1a5b348de349b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T27456] base: Display ExceptionContext in WhileHandling's textual description
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed to branch wip/T27456 at Glasgow Haskell Compiler / GHC Commits: b0c59013 by Ben Gamari at 2026-06-29T11:14:10-04:00 base: Display ExceptionContext in WhileHandling's textual description As originally-implemented the implementation for `WhileHandling(displayExceptionAnnotation)` would display the `ExceptionContext` of the exception which it carries (as this was the behavior of `displayException`, in terms of which `displayExceptionAnnotation` was implemented). However, in 284ffab3 the definition of `SomeException(displayException)` was changed to exclude the `ExceptionContext`. This means that `WhileHandling(displayExceptionAnnotation)` fails to describe the provenance of the exception which it captures, greatly limiting its utility. Return the implementation to its originally-specified behavior by implementing `WhileHandling(displayExceptionAnnotation)` in terms of `displayExceptionWithInfo`. Fixes #27456. - - - - - 3 changed files: - + changelog.d/T27456 - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs Changes: ===================================== changelog.d/T27456 ===================================== @@ -0,0 +1,8 @@ +section: base +issues: #27456 +mrs: ! +synopsis: + Show `ExceptionContext` in `displayExceptionAnnotation` implementation of `WhileHandling` +description: + In the past ``displayException`` (in terms of which ``WhileHandling``\'s ``displayExceptionAnnotation` is implemented) was changed to hide ``ExceptionContext``. This regressed the behavior of ``displayExceptionAnnotation`` from that which was originally specified. Restore the intended behavior of showing the ``ExceptionContext`` of the carried exception. + ===================================== libraries/base/changelog.md ===================================== @@ -31,6 +31,7 @@ * Export `labelThread` from `Control.Concurrent`.([CLC proposal #376](https://github.com/haskell/core-libraries-committee/issues/376)) * Add a new module `System.IO.OS` with operations for obtaining operating-system handles (file descriptors, Windows handles). ([CLC proposal #369](https://github.com/haskell/core-libraries-committee/issues/369)) * Evaluate backtraces for "error" exceptions at the moment they are thrown. ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383)) + * Show `ExceptionContext` in `displayExceptionAnnotation` implementation of `WhileHandling` ([GHC #27456](https://gitlab.haskell.org/ghc/ghc/-/issues/27456)) * Hide implementation details when throwing exceptions in throw and throwSTM. ([CLC proposal #387](https://github.com/haskell/core-libraries-committee/issues/387)) * Change `hIsReadable` and `hIsWritable` such that they always throw a respective exception when encountering a closed or semi-closed handle, not just in the case of a file handle. ([CLC proposal #371](github.com/haskell/core-libraries-committee/issues/371)) * Annotate `onException` continuation with `WhileHandling`. ([CLC Proposal #397](https://github.com/haskell/core-libraries-committee/issues/397)) ===================================== libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs ===================================== @@ -84,7 +84,7 @@ data WhileHandling = WhileHandling SomeException deriving Show instance ExceptionAnnotation WhileHandling where displayExceptionAnnotation (WhileHandling e) = - "While handling " ++ case lines $ displayException e of + "While handling " ++ case lines $ displayExceptionWithInfo e of [] -> "" (l1:ls) -> -- Indent lines forward. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b0c5901312d1d78044300a960c10a21… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b0c5901312d1d78044300a960c10a21… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T27456] base: Display ExceptionContext in WhileHandling's textual description
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed to branch wip/T27456 at Glasgow Haskell Compiler / GHC Commits: 42860214 by Ben Gamari at 2026-06-29T11:12:36-04:00 base: Display ExceptionContext in WhileHandling's textual description As originally-implemented the implementation for `WhileHandling(displayExceptionAnnotation)` would display the `ExceptionContext` of the exception which it carries (as this was the behavior of `displayException`, in terms of which `displayExceptionAnnotation` was implemented). However, in 284ffab3 the definition of `SomeException(displayException)` was changed to exclude the `ExceptionContext`. This means that `WhileHandling(displayExceptionAnnotation)` fails to describe the provenance of the exception which it captures, greatly limiting its utility. Return the implementation to its originally-specified behavior by implementing `WhileHandling(displayExceptionAnnotation)` in terms of `displayExceptionWithInfo`. Fixes #27456. - - - - - 2 changed files: - + changelog.d/T27456 - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs Changes: ===================================== changelog.d/T27456 ===================================== @@ -0,0 +1,8 @@ +section: base +issues: #27456 +mrs: ! +synopsis: + Show `ExceptionContext` in `displayExceptionAnnotation` implementation of `WhileHandling` +description: + In the past ``displayException`` (in terms of which ``WhileHandling``\'s ``displayExceptionAnnotation` is implemented) was changed to hide ``ExceptionContext``. This regressed the behavior of ``displayExceptionAnnotation`` from that which was originally specified. Restore the intended behavior of showing the ``ExceptionContext`` of the carried exception. + ===================================== libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs ===================================== @@ -84,7 +84,7 @@ data WhileHandling = WhileHandling SomeException deriving Show instance ExceptionAnnotation WhileHandling where displayExceptionAnnotation (WhileHandling e) = - "While handling " ++ case lines $ displayException e of + "While handling " ++ case lines $ displayExceptionWithInfo e of [] -> "" (l1:ls) -> -- Indent lines forward. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/42860214051bff4d0b8b4da4a722c3f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/42860214051bff4d0b8b4da4a722c3f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T27456] base: Display ExceptionContext in WhileHandling's textual description
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed to branch wip/T27456 at Glasgow Haskell Compiler / GHC Commits: eae17211 by Ben Gamari at 2026-06-29T11:09:02-04:00 base: Display ExceptionContext in WhileHandling's textual description As originally-implemented the implementation for `WhileHandling(displayExceptionAnnotation)` would display the `ExceptionContext` of the exception which it carries (as this was the behavior of `displayException`, in terms of which `displayExceptionAnnotation` was implemented). However, in 284ffab3 the definition of `SomeException(displayException)` was changed to exclude the `ExceptionContext`. This means that `WhileHandling(displayExceptionAnnotation)` fails to describe the provenance of the exception which it captures, greatly limiting its utility. Return the implementation to its originally-specified behavior by implementing `WhileHandling(displayExceptionAnnotation)` in terms of `displayExceptionWithInfo`. Fixes #27456. - - - - - 2 changed files: - + changelog.d/T27456 - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs Changes: ===================================== changelog.d/T27456 ===================================== @@ -0,0 +1,8 @@ +section: base +issues: #27456 +mrs: ! +synopsis: + Show `ExceptionContext` in `displayExceptionAnnotation` implementation of `WhileHandling` +description: + In the past ``displayException`` (in terms of which ``WhileHandling``\'s ``displayExceptionAnnotation` is implemented) was changed to hide ``ExceptionContext``. This regressed the behavior of ``displayExceptionAnnotation`` from that which was originally specified. Restore the intended behavior of showing the ``ExceptionContext`` of the carried exception. + ===================================== libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs ===================================== @@ -84,7 +84,7 @@ data WhileHandling = WhileHandling SomeException deriving Show instance ExceptionAnnotation WhileHandling where displayExceptionAnnotation (WhileHandling e) = - "While handling " ++ case lines $ displayException e of + "While handling " ++ case lines $ displayExceptionWithInfo e of [] -> "" (l1:ls) -> -- Indent lines forward. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eae17211143c3b01eb67c3acd2d18b9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/eae17211143c3b01eb67c3acd2d18b9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T27456
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed new branch wip/T27456 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/T27456 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/davide/windows-dlls] WIP export-all-symbols from hadrian
by David Eichmann (＠DavidEichmann) 29 Jun '26

29 Jun '26

David Eichmann pushed to branch wip/davide/windows-dlls at Glasgow Haskell Compiler / GHC Commits: fe8af7a9 by David Eichmann at 2026-06-29T15:48:04+01:00 WIP export-all-symbols from hadrian - - - - - 6 changed files: - hadrian/src/Settings/Packages.hs - libraries/base/src/Control/Concurrent.hs - libraries/ghc-internal/cbits/inputReady.c - libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/GMP.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -322,6 +322,7 @@ rtsPackageArgs = package rts ? do , Threaded `wayUnit` way ? arg "-DTHREADED_RTS" , notM targetSupportsSMP ? arg "-optc-DNOSMP" , isWinHost ? arg "-optl-Wl,--disable-runtime-pseudo-reloc" + <> arg "-optl-Wl,--export-all-symbols" -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs -- ===================================== libraries/base/src/Control/Concurrent.hs ===================================== @@ -132,6 +132,12 @@ import Control.Concurrent.Chan import Control.Concurrent.QSem import Control.Concurrent.QSemN + +-- Needed for windows dynamic builds +-- TODO we may need to disable inlining of ccalls by default +{-# NOINLINE waitFd #-} + + {- $conc_intro The concurrency extension for Haskell is described in the paper ===================================== libraries/ghc-internal/cbits/inputReady.c ===================================== @@ -150,6 +150,7 @@ compute_WaitForSingleObject_timeout(bool infinite, Time remaining) * 1 => Input ready, 0 => not ready, -1 => error * On error, sets `errno`. */ +__attribute__((dllexport)) int fdReady(int fd, bool write, int64_t msecs, bool isSock) { ===================================== libraries/ghc-internal/src/GHC/Internal/Bignum/Backend/GMP.hs ===================================== @@ -622,8 +622,11 @@ foreign import ccall unsafe "integer_gmp_mpn_xor_n" -> IO () -- mp_bitcnt_t mpn_popcount (const mp_limb_t *s1p, mp_size_t n) +{-# NOINLINE c_mpn_popcount #-} +c_mpn_popcount :: ByteArray# -> GmpSize# -> Word# +c_mpn_popcount = _c_mpn_popcount foreign import ccall unsafe "gmp.h __gmpn_popcount" - c_mpn_popcount :: ByteArray# -> GmpSize# -> Word# + _c_mpn_popcount :: ByteArray# -> GmpSize# -> Word# -- double integer_gmp_mpn_get_d (const mp_limb_t sp[], const mp_size_t sn) foreign import ccall unsafe "integer_gmp_mpn_get_d" ===================================== libraries/ghc-internal/src/GHC/Internal/Float.hs ===================================== @@ -1633,13 +1633,19 @@ powerDouble :: Double -> Double -> Double powerDouble (D# x) (D# y) = D# (x **## y) foreign import ccall unsafe "isFloatNaN" isFloatNaN :: Float -> Int -foreign import ccall unsafe "isFloatInfinite" isFloatInfinite :: Float -> Int +{-# NOINLINE isFloatInfinite #-} +isFloatInfinite :: Float -> Int +isFloatInfinite x = cIsFloatInfinite x +foreign import ccall unsafe "isFloatInfinite" cIsFloatInfinite :: Float -> Int foreign import ccall unsafe "isFloatDenormalized" isFloatDenormalized :: Float -> Int foreign import ccall unsafe "isFloatNegativeZero" isFloatNegativeZero :: Float -> Int foreign import ccall unsafe "isFloatFinite" isFloatFinite :: Float -> Int foreign import ccall unsafe "isDoubleNaN" isDoubleNaN :: Double -> Int -foreign import ccall unsafe "isDoubleInfinite" isDoubleInfinite :: Double -> Int +{-# NOINLINE isDoubleInfinite #-} +isDoubleInfinite :: Double -> Int +isDoubleInfinite x = cIsDoubleInfinite x +foreign import ccall unsafe "isDoubleInfinite" cIsDoubleInfinite :: Double -> Int foreign import ccall unsafe "isDoubleDenormalized" isDoubleDenormalized :: Double -> Int foreign import ccall unsafe "isDoubleNegativeZero" isDoubleNegativeZero :: Double -> Int foreign import ccall unsafe "isDoubleFinite" isDoubleFinite :: Double -> Int ===================================== libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs ===================================== @@ -109,6 +109,14 @@ import GHC.Internal.Num import GHC.Internal.Base ( String, otherwise, return, ($) ) import GHC.Internal.Types ( Bool(..) ) + + +-- Needed for windows dynamic builds +-- TODO we may need to disable inlining of ccalls by default +{-# NOINLINE getErrno #-} + + + -- "errno" type -- ------------ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fe8af7a9cfdd1631421277825ce8a90… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fe8af7a9cfdd1631421277825ce8a90… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T27455] base: Don't drop exception context in SomeException(toException)
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed to branch wip/T27455 at Glasgow Haskell Compiler / GHC Commits: 48f61255 by Ben Gamari at 2026-06-29T10:47:27-04:00 base: Don't drop exception context in SomeException(toException) For reasons that are lost to time, the implementation of [CLC #200] that was merged inappropriately dropped `ExceptionContext` in the `toException` implementation given to `SomeException`. Fix this infelicity. [CLC #200]: https://github.com/haskell/core-libraries-committee/issues/200 - - - - - 3 changed files: - + changelog.d/T27455 - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs Changes: ===================================== changelog.d/T27455 ===================================== @@ -0,0 +1,8 @@ +section: base +issues: #27455 +mrs: +synopsis: + Don't drop `ExceptionContext` in `SomeException(toException)` +description: + Previously the implementation of ``Exception(toException)`` given to `SomeException` would inappropriately drop the carried `ExceptionContext`. Now ``toException = id``, faithfully implementing the semantics proposed in :ref:`CLC Proposal #200 <https://github.com/haskell/core-libraries-committee/issues/200>`. + ===================================== libraries/base/changelog.md ===================================== @@ -33,6 +33,7 @@ * Evaluate backtraces for "error" exceptions at the moment they are thrown. ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383)) * Hide implementation details when throwing exceptions in throw and throwSTM. ([CLC proposal #387](https://github.com/haskell/core-libraries-committee/issues/387)) * Change `hIsReadable` and `hIsWritable` such that they always throw a respective exception when encountering a closed or semi-closed handle, not just in the case of a file handle. ([CLC proposal #371](github.com/haskell/core-libraries-committee/issues/371)) + * The implementation of `toException` in `SomeException`'s `Exception` instance no longer drops exception context, in keeping with the behavior originally proposed in [CLC Proposal #200](https://github.com/haskell/core-libraries-committee/issues/200). * Annotate `onException` continuation with `WhileHandling`. ([CLC Proposal #397](https://github.com/haskell/core-libraries-committee/issues/397)) * Improve error message for `Data.Char.chr`. ([CLC Proposal #384](https://github.com/haskell/core-libraries-committee/issues/384)) ===================================== libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs ===================================== @@ -235,9 +235,7 @@ instance Exception Void -- -- @since base-3.0 instance Exception SomeException where - toException (SomeException e) = - let ?exceptionContext = emptyExceptionContext - in SomeException e + toException = id fromException = Just backtraceDesired (SomeException e) = backtraceDesired e displayException (SomeException e) = displayException e View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/48f61255b9c19b7bb7d9da7b66bdffa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/48f61255b9c19b7bb7d9da7b66bdffa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T27455
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed new branch wip/T27455 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/T27455 You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/clc-430] base: Introduce ThrownFrom ExceptionAnnotation
by Ben Gamari (＠bgamari) 29 Jun '26

29 Jun '26

Ben Gamari pushed to branch wip/clc-430 at Glasgow Haskell Compiler / GHC Commits: 118e999f by Ben Gamari at 2026-06-29T10:32:05-04:00 base: Introduce ThrownFrom ExceptionAnnotation CLC Proposal: https://github.com/haskell/core-libraries-committee/issues/430 - - - - - 9 changed files: - + changelog.d/clc-430 - libraries/base/changelog.md - libraries/base/src/Control/Exception.hs - + libraries/base/tests/T27453.hs - libraries/base/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs - libraries/ghc-internal/src/GHC/Internal/Control/Exception.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs-boot - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs Changes: ===================================== changelog.d/clc-430 ===================================== @@ -0,0 +1,7 @@ +section: base +synopsis: Introduce `ThrownFrom` `ExceptionAnnotation` +issues: #27453 +mrs: !16187 +description: { + Introduce new ``ExceptionAnnotation``, ``Control.Exception.ThrownFrom``, to record a backtrace of the site from which an asynchronous exception was thrown. ``Control.Exception.throwTo`` now attaches such an annotation when throwing exceptions for which ``backtraceDesired=True``. :ref:`CLC Proposal #430 <https://github.com/haskell/core-libraries-committee/issues/430>`). +} ===================================== libraries/base/changelog.md ===================================== @@ -35,6 +35,7 @@ * Change `hIsReadable` and `hIsWritable` such that they always throw a respective exception when encountering a closed or semi-closed handle, not just in the case of a file handle. ([CLC proposal #371](github.com/haskell/core-libraries-committee/issues/371)) * Annotate `onException` continuation with `WhileHandling`. ([CLC Proposal #397](https://github.com/haskell/core-libraries-committee/issues/397)) * Improve error message for `Data.Char.chr`. ([CLC Proposal #384](https://github.com/haskell/core-libraries-committee/issues/384)) + * Introduce new `ExceptionAnnotation`, `Control.Exception.ThrownFrom`, to record a backtrace of the site from which an asynchronous exception was thrown. `Control.Exception.throwTo` now attaches such an annotation when throwing exceptions for which `backtraceDesired=True`. ([CLC Proposal #430](https://github.com/haskell/core-libraries-committee/issues/430)). ## 4.22.0.0 *TBA* * Shipped with GHC 9.14.1 ===================================== libraries/base/src/Control/Exception.hs ===================================== @@ -40,6 +40,7 @@ module Control.Exception NoBacktrace(..), ExceptionWithContext(..), WhileHandling(..), + ThrownFrom(..), -- * Concrete exception types IOException, ===================================== libraries/base/tests/T27453.hs ===================================== @@ -0,0 +1,19 @@ +module Main where + +import Control.Exception + +data WorldExploded = WorldExploded + deriving (Show) + +instance Exception WorldExploded + +main :: IO () +main = do + tid <- fork $ catch handler $ threadDelay 1000*1000*1000 + throwTo WorldExploded tid + +handler :: ExceptionWithContext WorldExploded -> IO () +handler (ExceptionWithContext ann WorldExploded) = do + putStrLn "killed from" + print ann + ===================================== libraries/base/tests/all.T ===================================== @@ -322,3 +322,4 @@ test('T23697', test('stimesEndo', normal, compile_and_run, ['']) test('T24807', exit_code(1), compile_and_run, ['']) test('T25066', [only_ways(['optasm']), grep_errmsg('T25066.g')], compile, ['-ddump-dmd-signatures']) +test('T27453', normal, compile_and_run, ['']) ===================================== libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs ===================================== @@ -105,6 +105,8 @@ import GHC.Internal.Int import GHC.Internal.IO import GHC.Internal.IO.Exception import GHC.Internal.Exception +import GHC.Internal.Exception.Type (ThrownFrom(..)) +import {-# SOURCE #-} GHC.Internal.Exception.Backtrace (collectBacktraces) import GHC.Internal.IORef import GHC.Internal.Magic ( lazy ) import GHC.Internal.Maybe ( Maybe(..) ) @@ -478,8 +480,16 @@ target, the exception will be thrown even if the thread is currently inside 'mask' or 'uninterruptibleMask'. -} throwTo :: Exception e => ThreadId -> e -> IO () -throwTo (ThreadId tid) ex = IO $ \ s -> - case (killThread# tid (toException ex) s) of s1 -> (# s1, () #) +throwTo tid ex + | backtraceDesired ex = do + bts <- collectBacktraces + throwTo_ tid $ addExceptionContext (ThrownFrom bts) (toException ex) + | otherwise = + throwTo_ tid $ toException ex + +throwTo_ :: Exception e => ThreadId -> e -> IO () +throwTo_ (ThreadId tid) ex = IO $ \ s -> + case (killThread# tid ex s) of s1 -> (# s1, () #) -- | Returns the 'ThreadId' of the calling thread (GHC only). myThreadId :: IO ThreadId ===================================== libraries/ghc-internal/src/GHC/Internal/Control/Exception.hs ===================================== @@ -115,11 +115,12 @@ module GHC.Internal.Control.Exception ( ExceptionContext(..), annotateIO, WhileHandling(..), + ThrownFrom(..), ) where import GHC.Internal.Control.Exception.Base -import GHC.Internal.Exception.Type (ExceptionWithContext(..), whileHandling) +import GHC.Internal.Exception.Type (ExceptionWithContext(..), whileHandling, ThrownFrom(..)) import GHC.Internal.Base (Functor(..), foldr, return, ($), (.)) import GHC.Internal.IO (IO, interruptible) ===================================== libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs-boot ===================================== @@ -1,11 +1,19 @@ {-# LANGUAGE NoImplicitPrelude #-} +{-# LANGUAGE ImplicitParams #-} {-# LANGUAGE RoleAnnotations #-} module GHC.Internal.Exception.Backtrace where import GHC.Internal.Stack.Types (HasCallStack) import GHC.Internal.Types (IO) -import GHC.Internal.Exception.Context (SomeExceptionAnnotation) +import GHC.Internal.Exception.Context (ExceptionAnnotation, SomeExceptionAnnotation) --- For GHC.Exception +data Backtraces + +instance ExceptionAnnotation Backtraces + +-- For GHC.Internal.Conc.Sync +collectBacktraces :: HasCallStack => IO Backtraces + +-- For GHC.Internal.Exception collectExceptionAnnotation :: HasCallStack => IO SomeExceptionAnnotation ===================================== libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs ===================================== @@ -43,6 +43,8 @@ module GHC.Internal.Exception.Type -- * Exception propagation , WhileHandling(..) , whileHandling + -- * Asynchronous exception provenance + , ThrownFrom(..) -- * Arithmetic exceptions , ArithException(..) , divZeroException, overflowException, ratioZeroDenomException @@ -59,6 +61,7 @@ import GHC.Internal.Base (String, Void, fmap, return, ($), (.), (++)) import GHC.Internal.Show import GHC.Internal.Types (Bool(..)) import GHC.Internal.Exception.Context +import {-# SOURCE #-} GHC.Internal.Exception.Backtrace {- | A constraint used to propagate 'ExceptionContext's. @@ -298,6 +301,19 @@ instance Exception a => Exception (ExceptionWithContext a) where backtraceDesired (ExceptionWithContext _ e) = backtraceDesired e displayException = displayException . toException +-- | 'ThrownBy' records the site from which an asynchronous exception was thrown (e.g. the call-site of @throwTo@). +-- +-- @since 4.23.0.0 +newtype ThrownFrom = ThrownFrom Backtraces + +instance ExceptionAnnotation ThrownFrom where + displayExceptionAnnotation (ThrownFrom e) = + "Thrown asynchronously by " ++ case lines $ displayExceptionAnnotation e of + [] -> "" + (l1:ls) -> + unlines $ l1:[if null l then " |" else " | " ++ l | l <- ls] + + -- |Arithmetic exceptions. data ArithException = Overflow View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/118e999f81b6d31edbf215ebe8e2dc6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/118e999f81b6d31edbf215ebe8e2dc6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/davide/windows-dlls] WIP export-all-symbols from hadrian
by David Eichmann (＠DavidEichmann) 29 Jun '26

29 Jun '26

David Eichmann pushed to branch wip/davide/windows-dlls at Glasgow Haskell Compiler / GHC Commits: bbc55d25 by David Eichmann at 2026-06-29T15:44:19+01:00 WIP export-all-symbols from hadrian - - - - - 5 changed files: - hadrian/src/Settings/Packages.hs - libraries/base/src/Control/Concurrent.hs - libraries/ghc-internal/cbits/inputReady.c - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -322,6 +322,7 @@ rtsPackageArgs = package rts ? do , Threaded `wayUnit` way ? arg "-DTHREADED_RTS" , notM targetSupportsSMP ? arg "-optc-DNOSMP" , isWinHost ? arg "-optl-Wl,--disable-runtime-pseudo-reloc" + <> arg "-optl-Wl,--export-all-symbols" -- See Note [AutoApply.cmm for vectors] in genapply/Main.hs -- ===================================== libraries/base/src/Control/Concurrent.hs ===================================== @@ -132,6 +132,12 @@ import Control.Concurrent.Chan import Control.Concurrent.QSem import Control.Concurrent.QSemN + +-- Needed for windows dynamic builds +-- TODO we may need to disable inlining of ccalls by default +{-# NOINLINE waitFd #-} + + {- $conc_intro The concurrency extension for Haskell is described in the paper ===================================== libraries/ghc-internal/cbits/inputReady.c ===================================== @@ -150,6 +150,7 @@ compute_WaitForSingleObject_timeout(bool infinite, Time remaining) * 1 => Input ready, 0 => not ready, -1 => error * On error, sets `errno`. */ +__attribute__((dllexport)) int fdReady(int fd, bool write, int64_t msecs, bool isSock) { ===================================== libraries/ghc-internal/src/GHC/Internal/Float.hs ===================================== @@ -1633,13 +1633,19 @@ powerDouble :: Double -> Double -> Double powerDouble (D# x) (D# y) = D# (x **## y) foreign import ccall unsafe "isFloatNaN" isFloatNaN :: Float -> Int -foreign import ccall unsafe "isFloatInfinite" isFloatInfinite :: Float -> Int +{-# NOINLINE isFloatInfinite #-} +isFloatInfinite :: Float -> Int +isFloatInfinite x = cIsFloatInfinite x +foreign import ccall unsafe "isFloatInfinite" cIsFloatInfinite :: Float -> Int foreign import ccall unsafe "isFloatDenormalized" isFloatDenormalized :: Float -> Int foreign import ccall unsafe "isFloatNegativeZero" isFloatNegativeZero :: Float -> Int foreign import ccall unsafe "isFloatFinite" isFloatFinite :: Float -> Int foreign import ccall unsafe "isDoubleNaN" isDoubleNaN :: Double -> Int -foreign import ccall unsafe "isDoubleInfinite" isDoubleInfinite :: Double -> Int +{-# NOINLINE isDoubleInfinite #-} +isDoubleInfinite :: Double -> Int +isDoubleInfinite x = cIsDoubleInfinite x +foreign import ccall unsafe "isDoubleInfinite" cIsDoubleInfinite :: Double -> Int foreign import ccall unsafe "isDoubleDenormalized" isDoubleDenormalized :: Double -> Int foreign import ccall unsafe "isDoubleNegativeZero" isDoubleNegativeZero :: Double -> Int foreign import ccall unsafe "isDoubleFinite" isDoubleFinite :: Double -> Int ===================================== libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs ===================================== @@ -109,6 +109,14 @@ import GHC.Internal.Num import GHC.Internal.Base ( String, otherwise, return, ($) ) import GHC.Internal.Types ( Bool(..) ) + + +-- Needed for windows dynamic builds +-- TODO we may need to disable inlining of ccalls by default +{-# NOINLINE getErrno #-} + + + -- "errno" type -- ------------ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bbc55d25b641b39dd35222701e5d301… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bbc55d25b641b39dd35222701e5d301… You're receiving this email because of your account on gitlab.haskell.org.

1 0