- ghc-commits - Haskell.org

[Git][ghc/ghc][master] configure: Accept happy-2.2
by Marge Bot (＠marge-bot) 17 Feb '26

17 Feb '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 4f2840f2 by Brian J. Cardiff at 2026-02-17T17:04:08-05:00 configure: Accept happy-2.2 In Jan 2026 happy-2.2 was released. The most sensible change is https://github.com/haskell/happy/issues/335 which didn't trigger in a fresh build - - - - - 1 changed file: - m4/fptools_happy.m4 Changes: ===================================== m4/fptools_happy.m4 ===================================== @@ -28,13 +28,13 @@ then else fptools_cv_happy_version_display="none"; fi; - failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" + failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.3 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0], [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0], FP_COMPARE_VERSIONS([$fptools_cv_happy_version], [-le], [2.0.1], [AC_MSG_ERROR([$failure_msg])])[])[] - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.2.0], + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.3.0], [AC_MSG_ERROR([$failure_msg])])[] fi HappyVersion=$fptools_cv_happy_version; View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4f2840f2bb729ef1a6660f9f5c46906… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4f2840f2bb729ef1a6660f9f5c46906… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/T26930
by Teo Camarasu (＠teo) 17 Feb '26

17 Feb '26

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

1 0

[Git][ghc/ghc][wip/T26865] ghc-internal: Move GHC.Internal.Data.Bool to base
by Teo Camarasu (＠teo) 17 Feb '26

17 Feb '26

Teo Camarasu pushed to branch wip/T26865 at Glasgow Haskell Compiler / GHC Commits: d6a9780c by Teo Camarasu at 2026-02-17T21:38:19+00:00 ghc-internal: Move GHC.Internal.Data.Bool to base This is a tiny module that only defines bool :: Bool -> a -> a -> a. We can just move this to base and delete it from ghc-internal. If we want this functionality there we can just use a case statement or if-then expression. Resolves 26865 - - - - - 31 changed files: - libraries/base/src/Data/Bool.hs - libraries/base/src/Data/List.hs - libraries/base/src/Data/List/NubOrdSet.hs - libraries/base/src/GHC/Exts.hs - libraries/ghc-internal/ghc-internal.cabal.in - − libraries/ghc-internal/src/GHC/Internal/Data/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Function.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/IO/FD.hs - libraries/ghc-internal/src/GHC/Internal/JS/Prim.hs - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TypeError.hs - utils/haddock/html-test/ref/A.html - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug1033.html - utils/haddock/html-test/ref/Bug1103.html - utils/haddock/html-test/ref/Bug548.html - utils/haddock/html-test/ref/Bug923.html - utils/haddock/html-test/ref/ConstructorPatternExport.html - utils/haddock/html-test/ref/FunArgs.html - utils/haddock/html-test/ref/Hash.html - utils/haddock/html-test/ref/Instances.html - utils/haddock/html-test/ref/LinearTypes.html - utils/haddock/html-test/ref/RedactTypeSynonyms.html - utils/haddock/html-test/ref/T23616.html - utils/haddock/html-test/ref/Test.html - utils/haddock/html-test/ref/TypeFamilies3.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d6a9780c081cc04423afdb9ee5c8cf1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d6a9780c081cc04423afdb9ee5c8cf1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26865] ghc-internal: Move GHC.Internal.Data.Bool to base
by Teo Camarasu (＠teo) 17 Feb '26

17 Feb '26

Teo Camarasu pushed to branch wip/T26865 at Glasgow Haskell Compiler / GHC Commits: 7a308655 by Teo Camarasu at 2026-02-17T21:16:24+00:00 ghc-internal: Move GHC.Internal.Data.Bool to base This is a tiny module that only defines bool :: Bool -> a -> a -> a. We can just move this to base and delete it from ghc-internal. If we want this functionality there we can just use a case statement or if-then expression. Resolves 26865 - - - - - 29 changed files: - libraries/base/src/Data/Bool.hs - libraries/base/src/Data/List.hs - libraries/base/src/Data/List/NubOrdSet.hs - libraries/ghc-internal/ghc-internal.cabal.in - − libraries/ghc-internal/src/GHC/Internal/Data/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Function.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/IO/FD.hs - libraries/ghc-internal/src/GHC/Internal/JS/Prim.hs - libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TypeError.hs - utils/haddock/html-test/ref/A.html - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug1033.html - utils/haddock/html-test/ref/Bug1103.html - utils/haddock/html-test/ref/Bug548.html - utils/haddock/html-test/ref/Bug923.html - utils/haddock/html-test/ref/ConstructorPatternExport.html - utils/haddock/html-test/ref/FunArgs.html - utils/haddock/html-test/ref/Instances.html - utils/haddock/html-test/ref/LinearTypes.html - utils/haddock/html-test/ref/RedactTypeSynonyms.html - utils/haddock/html-test/ref/T23616.html - utils/haddock/html-test/ref/Test.html - utils/haddock/html-test/ref/TypeFamilies3.html Changes: ===================================== libraries/base/src/Data/Bool.hs ===================================== @@ -24,4 +24,39 @@ module Data.Bool bool ) where -import GHC.Internal.Data.Bool \ No newline at end of file +import Prelude (Bool(..), (&&), (||), not, otherwise) + +-- $setup +-- >>> import Prelude + +-- | Case analysis for the 'Bool' type. @'bool' f t p@ evaluates to @f@ +-- when @p@ is 'False', and evaluates to @t@ when @p@ is 'True'. +-- +-- This is equivalent to @if p then t else f@; that is, one can +-- think of it as an if-then-else construct with its arguments +-- reordered. +-- +-- @since base-4.7.0.0 +-- +-- ==== __Examples__ +-- +-- Basic usage: +-- +-- >>> bool "foo" "bar" True +-- "bar" +-- >>> bool "foo" "bar" False +-- "foo" +-- +-- Confirm that @'bool' f t p@ and @if p then t else f@ are +-- equivalent: +-- +-- >>> let p = True; f = "bar"; t = "foo" +-- >>> bool f t p == if p then t else f +-- True +-- >>> let p = False +-- >>> bool f t p == if p then t else f +-- True +-- +bool :: a -> a -> Bool -> a +bool f _ False = f +bool _ t True = t ===================================== libraries/base/src/Data/List.hs ===================================== @@ -184,7 +184,7 @@ module Data.List genericReplicate ) where -import GHC.Internal.Data.Bool (otherwise) +import Data.Bool (otherwise) import GHC.Internal.Data.Function (const) import GHC.Internal.Data.List import GHC.Internal.Data.List.NonEmpty (NonEmpty(..)) ===================================== libraries/base/src/Data/List/NubOrdSet.hs ===================================== @@ -11,7 +11,7 @@ module Data.List.NubOrdSet ( insert, ) where -import GHC.Internal.Data.Bool (Bool(..)) +import Data.Bool (Bool(..)) import GHC.Internal.Data.Function ((.)) import GHC.Internal.Data.Ord (Ordering(..)) ===================================== libraries/ghc-internal/ghc-internal.cabal.in ===================================== @@ -140,7 +140,6 @@ Library GHC.Internal.Control.Monad.ST.Imp GHC.Internal.Control.Monad.ST.Lazy.Imp GHC.Internal.Data.Bits - GHC.Internal.Data.Bool GHC.Internal.Data.Coerce GHC.Internal.Data.Data GHC.Internal.Data.Dynamic ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Bool.hs deleted ===================================== @@ -1,64 +0,0 @@ -{-# LANGUAGE Trustworthy #-} -{-# LANGUAGE NoImplicitPrelude #-} - ------------------------------------------------------------------------------ --- | --- Module : GHC.Internal.Data.Bool --- Copyright : (c) The University of Glasgow 2001 --- License : BSD-style (see the file libraries/base/LICENSE) --- --- Maintainer : libraries(a)haskell.org --- Stability : stable --- Portability : portable --- --- The 'Bool' type and related functions. --- ------------------------------------------------------------------------------ - -module GHC.Internal.Data.Bool ( - -- * Booleans - Bool(..), - -- ** Operations - (&&), - (||), - not, - otherwise, - bool, - ) where - -import GHC.Internal.Base - --- $setup --- >>> import Prelude - --- | Case analysis for the 'Bool' type. @'bool' f t p@ evaluates to @f@ --- when @p@ is 'False', and evaluates to @t@ when @p@ is 'True'. --- --- This is equivalent to @if p then t else f@; that is, one can --- think of it as an if-then-else construct with its arguments --- reordered. --- --- @since base-4.7.0.0 --- --- ==== __Examples__ --- --- Basic usage: --- --- >>> bool "foo" "bar" True --- "bar" --- >>> bool "foo" "bar" False --- "foo" --- --- Confirm that @'bool' f t p@ and @if p then t else f@ are --- equivalent: --- --- >>> let p = True; f = "bar"; t = "foo" --- >>> bool f t p == if p then t else f --- True --- >>> let p = False --- >>> bool f t p == if p then t else f --- True --- -bool :: a -> a -> Bool -> a -bool f _ False = f -bool _ t True = t ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs ===================================== @@ -50,7 +50,6 @@ module GHC.Internal.Data.Foldable ( find ) where -import GHC.Internal.Data.Bool import GHC.Internal.Data.Either import GHC.Internal.Data.Eq import GHC.Internal.Data.Functor.Utils (Max(..), Min(..), (#.)) ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Function.hs ===================================== @@ -30,8 +30,7 @@ module GHC.Internal.Data.Function , applyWhen ) where -import GHC.Internal.Base ( TYPE, ($), (.), id, const, flip ) -import GHC.Internal.Data.Bool ( Bool(..) ) +import GHC.Internal.Base ( TYPE, Bool(..), ($), (.), id, const, flip ) infixl 0 `on` infixl 1 & @@ -171,7 +170,7 @@ x & f = f x -- | 'applyWhen' applies a function to a value if a condition is true, -- otherwise, it returns the value unchanged. -- --- It is equivalent to @'flip' ('GHC.Internal.Data.Bool.bool' 'id')@. +-- It is equivalent to @'flip' ('Data.Bool.bool' 'id')@. -- -- ==== __Examples__ -- ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs ===================================== @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE PolyKinds #-} -{-# LANGUAGE Safe #-} +{-# LANGUAGE Trustworthy #-} {-# LANGUAGE TypeFamilyDependencies #-} {-# LANGUAGE TypeOperators #-} @@ -23,7 +23,7 @@ module GHC.Internal.Data.Type.Bool ( If, type (&&), type (||), Not ) where -import GHC.Internal.Data.Bool +import GHC.Internal.Base -- This needs to be in base because (&&) is used in Data.Type.Equality. -- The other functions do not need to be in base, but seemed to be appropriate ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs ===================================== @@ -34,14 +34,11 @@ module GHC.Internal.Data.Type.Ord ( , OrdCond ) where -import GHC.Internal.Show(Show(..)) +import GHC.Internal.Base +import GHC.Internal.Show (Show(..)) import GHC.Internal.TypeError import GHC.Internal.TypeLits.Internal import GHC.Internal.TypeNats.Internal -import GHC.Internal.Types (type (~), Char) -import GHC.Internal.Data.Bool -import GHC.Internal.Data.Eq -import GHC.Internal.Data.Ord -- | 'Compare' branches on the kind of its arguments to either compare by -- 'Symbol' or 'Nat'. ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Version.hs ===================================== @@ -37,13 +37,12 @@ module GHC.Internal.Data.Version ( ) where import GHC.Internal.Data.Functor ( Functor(..) ) -import GHC.Internal.Data.Bool ( (&&) ) import GHC.Internal.Data.Eq import GHC.Internal.Int ( Int ) import GHC.Internal.Data.List ( map, sort, concat, concatMap, intersperse, (++) ) import GHC.Internal.Data.Ord import GHC.Internal.Data.String ( String ) -import GHC.Internal.Base ( Applicative(..) ) +import GHC.Internal.Base ( Applicative(..), (&&) ) import GHC.Internal.Generics import GHC.Internal.Unicode ( isDigit, isAlphaNum ) import GHC.Internal.Read ===================================== libraries/ghc-internal/src/GHC/Internal/IO/FD.hs ===================================== @@ -49,7 +49,6 @@ import GHC.Internal.Conc.IO import GHC.Internal.IO.Exception #if defined(mingw32_HOST_OS) import GHC.Internal.Windows -import GHC.Internal.Data.Bool import GHC.Internal.IO.SubSystem ((<!>)) import GHC.Internal.Foreign.Storable #endif @@ -717,7 +716,7 @@ asyncReadRawBufferPtr loc !fd !buf !off !len = do if l == (-1) then let sock_errno = c_maperrno_func (fromIntegral rc) non_sock_errno = Errno (fromIntegral rc) - errno = bool non_sock_errno sock_errno (fdIsSocket fd) + errno = if fdIsSocket fd then sock_errno else non_sock_errno in ioError (errnoToIOError loc errno Nothing Nothing) else return (fromIntegral l) @@ -728,7 +727,7 @@ asyncWriteRawBufferPtr loc !fd !buf !off !len = do if l == (-1) then let sock_errno = c_maperrno_func (fromIntegral rc) non_sock_errno = Errno (fromIntegral rc) - errno = bool non_sock_errno sock_errno (fdIsSocket fd) + errno = if fdIsSocket fd then sock_errno else non_sock_errno in ioError (errnoToIOError loc errno Nothing Nothing) else return (fromIntegral l) @@ -740,7 +739,7 @@ blockingReadRawBufferPtr loc !fd !buf !off !len let start_ptr = buf `plusPtr` off recv_ret = c_safe_recv (fdFD fd) start_ptr (fromIntegral len) 0 read_ret = c_safe_read (fdFD fd) start_ptr (fromIntegral len) - r <- bool read_ret recv_ret (fdIsSocket fd) + r <- if fdIsSocket fd then recv_ret else read_ret when ((fdIsSocket fd) && (r == -1)) c_maperrno return r -- We trust read() to give us the correct errno but recv(), as a @@ -753,7 +752,7 @@ blockingWriteRawBufferPtr loc !fd !buf !off !len let start_ptr = buf `plusPtr` off send_ret = c_safe_send (fdFD fd) start_ptr (fromIntegral len) 0 write_ret = c_safe_write (fdFD fd) start_ptr (fromIntegral len) - r <- bool write_ret send_ret (fdIsSocket fd) + r <- if fdIsSocket fd then send_ret else write_ret when (r == -1) c_maperrno return r -- We don't trust write() to give us the correct errno, and ===================================== libraries/ghc-internal/src/GHC/Internal/JS/Prim.hs ===================================== @@ -46,7 +46,6 @@ import GHC.Internal.Types import qualified GHC.Internal.Exception as Ex import qualified GHC.Internal.CString as GHC import GHC.Internal.IO -import GHC.Internal.Data.Bool import GHC.Internal.Base import GHC.Internal.Show ===================================== libraries/ghc-internal/src/GHC/Internal/System/IO/OS.hs ===================================== @@ -1,4 +1,4 @@ -{-# LANGUAGE Safe #-} +{-# LANGUAGE Trustworthy #-} {-# LANGUAGE CPP #-} {-# LANGUAGE RankNTypes #-} @@ -23,14 +23,12 @@ module GHC.Internal.System.IO.OS ) where +import GHC.Internal.Base import GHC.Internal.Control.Monad (return) import GHC.Internal.Control.Concurrent.MVar (MVar) import GHC.Internal.Control.Exception (mask) import GHC.Internal.Data.Function (const, (.), ($)) import GHC.Internal.Data.Functor (fmap) -#if defined(mingw32_HOST_OS) -import GHC.Internal.Data.Bool (otherwise) -#endif import GHC.Internal.Data.Maybe (Maybe (Nothing), maybe) #if defined(mingw32_HOST_OS) import GHC.Internal.Data.Maybe (Maybe (Just)) ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs ===================================== @@ -34,7 +34,6 @@ import GHC.Internal.TH.Monad import qualified GHC.Internal.TH.Lib as Lib (litE) -- See wrinkle (W4) of Note [Tracking dependencies on primitives] import GHC.Internal.Data.Either -import GHC.Internal.Data.Bool import GHC.Internal.Base hiding (NonEmpty(..), Type, Module, inline) import GHC.Internal.Data.NonEmpty (NonEmpty(..)) import GHC.Internal.Integer ===================================== libraries/ghc-internal/src/GHC/Internal/TypeError.hs ===================================== @@ -31,8 +31,7 @@ module GHC.Internal.TypeError , Unsatisfiable, unsatisfiable ) where -import GHC.Internal.Data.Bool -import GHC.Internal.Types (TYPE, Constraint, Symbol) +import GHC.Internal.Types (TYPE, Bool(True), Constraint, Symbol) {- Note [Custom type errors] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== utils/haddock/html-test/ref/A.html ===================================== @@ -70,7 +70,7 @@ ><li class="src short" ><a href="#" >test2</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></li ><li class="src short" @@ -131,7 +131,7 @@ ><p class="src" ><a id="v:test2" class="def" >test2</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/Bug1004.html ===================================== @@ -210,7 +210,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -218,7 +218,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -505,13 +505,13 @@ ><p class="src" ><a href="#" >liftEq</a - > :: (a -> b -> <a href="#" title="Data.Bool" + > :: (a -> b -> <a href="#" title="GHC.Exts" >Bool</a >) -> <a href="#" title="Bug1004" >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g b -> <a href="#" title="Data.Bool" + > f g b -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1553,7 +1553,7 @@ >null</a > :: <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1575,7 +1575,7 @@ >Eq</a > a => a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1983,7 +1983,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -1995,7 +1995,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2065,7 +2065,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2077,7 +2077,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2089,7 +2089,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2101,7 +2101,7 @@ >Product</a > f g a -> <a href="#" title="Bug1004" >Product</a - > f g a -> <a href="#" title="Data.Bool" + > f g a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -2471,7 +2471,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -2479,7 +2479,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -2768,7 +2768,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -2776,7 +2776,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -2862,7 +2862,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Product" "Data.Functor.Product" "base" '<a href="#" title="Data.Bool" + > "Product" "Data.Functor.Product" "base" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -2870,7 +2870,7 @@ >MetaCons</a > "Pair" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >S1</a ===================================== utils/haddock/html-test/ref/Bug1033.html ===================================== @@ -148,7 +148,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Foo" "Bug1033" "main" '<a href="#" title="Data.Bool" + > "Foo" "Bug1033" "main" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -156,7 +156,7 @@ >MetaCons</a > "Foo" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >U1</a @@ -241,7 +241,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "Foo" "Bug1033" "main" '<a href="#" title="Data.Bool" + > "Foo" "Bug1033" "main" '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -249,7 +249,7 @@ >MetaCons</a > "Foo" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >False</a >) (<a href="#" title="GHC.Generics" >U1</a ===================================== utils/haddock/html-test/ref/Bug1103.html ===================================== @@ -80,7 +80,7 @@ >data</span > <a href="#" title="Bug1103" >Foo1</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -103,7 +103,7 @@ >data</span > <a href="#" title="Bug1103" >Foo1</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > = <a id="v:Foo1Bool" class="def" >Foo1Bool</a @@ -218,7 +218,7 @@ >data</span > <a href="#" title="Bug1103" >Foo2</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -241,7 +241,7 @@ >data</span > <a href="#" title="Bug1103" >Foo2</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > = <a id="v:Foo2Bool" class="def" >Foo2Bool</a @@ -476,7 +476,7 @@ >data</span > <a href="#" title="Bug1103" >Foo3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -499,7 +499,7 @@ >data</span > <a href="#" title="Bug1103" >Foo3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > = <a id="v:Foo3Bool" class="def" >Foo3Bool</a ===================================== utils/haddock/html-test/ref/Bug548.html ===================================== @@ -186,7 +186,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -194,7 +194,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -814,7 +814,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -822,7 +822,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -925,7 +925,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -933,7 +933,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a @@ -995,7 +995,7 @@ >D1</a > ('<a href="#" title="GHC.Generics" >MetaData</a - > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="Data.Bool" + > "WrappedArrow" "Control.Applicative" "base" '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >C1</a @@ -1003,7 +1003,7 @@ >MetaCons</a > "WrapArrow" '<a href="#" title="GHC.Generics" >PrefixI</a - > '<a href="#" title="Data.Bool" + > '<a href="#" title="GHC.Exts" >True</a >) (<a href="#" title="GHC.Generics" >S1</a ===================================== utils/haddock/html-test/ref/Bug923.html ===================================== @@ -202,7 +202,7 @@ >Type</a >, <a href="#" title="Data.Kind" >Type</a - >)) -> <a href="#" title="Data.Bool" + >)) -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -226,7 +226,7 @@ >Type</a >, <a href="#" title="Data.Kind" >Type</a - >)) -> <a href="#" title="Data.Bool" + >)) -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/ConstructorPatternExport.html ===================================== @@ -69,7 +69,7 @@ >pattern</span > <a id="v:MyRecCons" class="def" >MyRecCons</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Data.Int" >Int</a ===================================== utils/haddock/html-test/ref/FunArgs.html ===================================== @@ -90,7 +90,7 @@ ></tr ><tr ><td class="src" - >-> <a href="#" title="Data.Bool" + >-> <a href="#" title="GHC.Exts" >Bool</a ></td ><td class="doc" ===================================== utils/haddock/html-test/ref/Instances.html ===================================== @@ -682,7 +682,7 @@ ><p class="src" ><a id="v:bar" class="def" >bar</a - > :: f a -> f <a href="#" title="Data.Bool" + > :: f a -> f <a href="#" title="GHC.Exts" >Bool</a > -> a <a href="#" class="selflink" >#</a @@ -722,7 +722,7 @@ >Bar</a > <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -748,13 +748,13 @@ >bar</a > :: <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > -> <a href="#" title="Data.Bool" + > -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a @@ -766,7 +766,7 @@ >Maybe</a > (<a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >) -> <a href="#" title="Data.Maybe" >Maybe</a @@ -782,11 +782,11 @@ >bar0</a > :: (<a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >, <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >) -> (<a href="#" title="Data.Maybe" >Maybe</a @@ -800,11 +800,11 @@ >bar1</a > :: (<a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >, <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a >) -> (<a href="#" title="Data.Maybe" >Maybe</a @@ -852,7 +852,7 @@ >Maybe</a > [a] -> <a href="#" title="Data.Maybe" >Maybe</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> [a] <a href="#" class="selflink" >#</a @@ -936,7 +936,7 @@ ><p class="src" ><a href="#" >bar</a - > :: [(a, a)] -> [<a href="#" title="Data.Bool" + > :: [(a, a)] -> [<a href="#" title="GHC.Exts" >Bool</a >] -> (a, a) <a href="#" class="selflink" >#</a @@ -1000,7 +1000,7 @@ >Either</a > a (f a) -> <a href="#" title="Data.Either" >Either</a - > a <a href="#" title="Data.Bool" + > a <a href="#" title="GHC.Exts" >Bool</a > -> f a <a href="#" class="selflink" >#</a @@ -1092,7 +1092,7 @@ >Quux</a > a b c) -> <a href="#" title="Instances" >Quux</a - > a c <a href="#" title="Data.Bool" + > a c <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Instances" >Quux</a @@ -1188,7 +1188,7 @@ ><p class="src" ><a href="#" >bar</a - > :: (a, b, (a, b, a)) -> (a, b, <a href="#" title="Data.Bool" + > :: (a, b, (a, b, a)) -> (a, b, <a href="#" title="GHC.Exts" >Bool</a >) -> (a, b, a) <a href="#" class="selflink" >#</a @@ -1754,7 +1754,7 @@ >Quux</a > a b c) -> <a href="#" title="Instances" >Quux</a - > a c <a href="#" title="Data.Bool" + > a c <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Instances" >Quux</a @@ -2020,7 +2020,7 @@ >Norf</a > <a href="#" title="Data.Int" >Int</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></span > <a href="#" class="selflink" @@ -2053,7 +2053,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > (a, b) <a href="#" title="Data.Bool" + > (a, b) <a href="#" title="GHC.Exts" >Bool</a ></span ></td @@ -2076,7 +2076,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > (a, b) <a href="#" title="Data.Bool" + > (a, b) <a href="#" title="GHC.Exts" >Bool</a > = (a, [b])</div ></details @@ -2093,7 +2093,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > [a] <a href="#" title="Data.Bool" + > [a] <a href="#" title="GHC.Exts" >Bool</a ></span ></td @@ -2116,7 +2116,7 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > [a] <a href="#" title="Data.Bool" + > [a] <a href="#" title="GHC.Exts" >Bool</a > = a</div ></details @@ -2156,7 +2156,7 @@ >Int</a > [a] = <a id="v:Thuuuud" class="def" >Thuuuud</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></div ></details @@ -2228,13 +2228,13 @@ >Plugh</a > <a href="#" title="Data.Int" >Int</a - > c <a href="#" title="Data.Bool" + > c <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Data.Int" >Int</a > -> (<a href="#" title="Data.Int" >Int</a - > -> c) -> <a href="#" title="Data.Bool" + > -> c) -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/LinearTypes.html ===================================== @@ -98,7 +98,7 @@ ><li ><a href="#" >noC</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></li ></ul @@ -236,7 +236,7 @@ ><dfn class="src" ><a id="v:noC" class="def" >noC</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></dfn ><div class="doc empty" @@ -324,7 +324,7 @@ ><dfn class="src" >   , <a id="v:noG" class="def" >noG</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a ></dfn ><div class="doc empty" ===================================== utils/haddock/html-test/ref/RedactTypeSynonyms.html ===================================== @@ -90,7 +90,7 @@ ><li class="src short" ><a href="#" >exportedFn</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > -> AlsoHidden</li ></ul @@ -188,7 +188,7 @@ ><p class="src" ><a id="v:exportedFn" class="def" >exportedFn</a - > :: <a href="#" title="Data.Bool" + > :: <a href="#" title="GHC.Exts" >Bool</a > -> AlsoHidden <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/T23616.html ===================================== @@ -51,7 +51,7 @@ >null</a > :: <a href="#" title="Data.Foldable" >Foldable</a - > t => t a -> <a href="#" title="Data.Bool" + > t => t a -> <a href="#" title="GHC.Exts" >Bool</a > <a href="#" class="selflink" >#</a ===================================== utils/haddock/html-test/ref/Test.html ===================================== @@ -427,9 +427,9 @@ >Int</a > -> <a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a @@ -649,9 +649,9 @@ >Int</a > -> (<a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a @@ -1450,9 +1450,9 @@ >Int</a > -> <a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a @@ -2235,9 +2235,9 @@ is at the beginning of the line).</pre ><td class="src" >-> (<a href="#" title="Test" >T3</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a > -> <a href="#" title="Test" >T4</a ===================================== utils/haddock/html-test/ref/TypeFamilies3.html ===================================== @@ -351,7 +351,7 @@ >Int</a > = <a id="v:Baz2" class="def" >Baz2</a - > <a href="#" title="Data.Bool" + > <a href="#" title="GHC.Exts" >Bool</a ></div ></details View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7a308655096be1418291b9e5e067418… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7a308655096be1418291b9e5e067418… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/jeltsch/control-monad-zip-to-base
by Wolfgang Jeltsch (＠jeltsch) 17 Feb '26

17 Feb '26

Wolfgang Jeltsch pushed new branch wip/jeltsch/control-monad-zip-to-base at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/jeltsch/control-monad-zip-to-… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: Hide implementation details from base exception stack traces
by Marge Bot (＠marge-bot) 17 Feb '26

17 Feb '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 016f79d5 by fendor at 2026-02-17T09:16:16-05:00 Hide implementation details from base exception stack traces Ensure we hide the implementation details of the exception throwing mechanisms: * `undefined` * `throwSTM` * `throw` * `throwIO` * `error` The `HasCallStackBacktrace` should always have a length of exactly 1, not showing internal implementation details in the stack trace, as these are vastly distracting to end users. CLC proposal [#387](https://github.com/haskell/core-libraries-committee/issues/387) - - - - - 3f842bf4 by Brian J. Cardiff at 2026-02-17T13:53:45-05:00 configure: Accept happy-2.2 In Jan 2026 happy-2.2 was released. The most sensible change is https://github.com/haskell/happy/issues/335 which didn't trigger in a fresh build - - - - - 45987fce by Duncan Coutts at 2026-02-17T13:53:47-05:00 Fix errors in the documentation of the eventlog STOP_THREAD status codes Fix the code for BlockedOnMsgThrowTo. Document all the known historical warts. Fixes issue #26867 - - - - - 29 changed files: - docs/users_guide/eventlog-formats.rst - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/Exception.hs - libraries/ghc-internal/src/GHC/Internal/STM.hs - + libraries/ghc-internal/tests/backtraces/T15395.hs - + libraries/ghc-internal/tests/backtraces/T15395.stdout - libraries/ghc-internal/tests/backtraces/all.T - libraries/ghc-internal/tests/stack-annotation/ann_frame005.stdout - m4/fptools_happy.m4 - testsuite/tests/arrows/should_compile/T21301.stderr - testsuite/tests/deSugar/should_fail/DsStrictFail.stderr - testsuite/tests/deSugar/should_run/T20024.stderr - testsuite/tests/deSugar/should_run/dsrun005.stderr - testsuite/tests/deSugar/should_run/dsrun007.stderr - testsuite/tests/deSugar/should_run/dsrun008.stderr - testsuite/tests/deriving/should_run/T9576.stderr - testsuite/tests/ghci/scripts/Defer02.stderr - testsuite/tests/ghci/scripts/T15325.stderr - testsuite/tests/patsyn/should_run/ghci.stderr - testsuite/tests/quotes/LiftErrMsgDefer.stderr - testsuite/tests/safeHaskell/safeLanguage/SafeLang15.stderr - testsuite/tests/type-data/should_run/T22332a.stderr - testsuite/tests/typecheck/should_run/T10284.stderr - testsuite/tests/typecheck/should_run/T13838.stderr - testsuite/tests/typecheck/should_run/T9497a-run.stderr - testsuite/tests/typecheck/should_run/T9497b-run.stderr - testsuite/tests/typecheck/should_run/T9497c-run.stderr - testsuite/tests/unsatisfiable/T23816.stderr - testsuite/tests/unsatisfiable/UnsatDefer.stderr Changes: ===================================== docs/users_guide/eventlog-formats.rst ===================================== @@ -221,14 +221,41 @@ Thread and scheduling events * 11: BlockedOnDelay * 12: BlockedOnSTM * 13: BlockedOnDoProc - * 16: BlockedOnMsgThrowTo + * 14--17: unused + * 18: BlockedOnMsgThrowTo + * 19: unused * 20: BlockedOnMVarRead :field ThreadId: thread id of thread being blocked on (only for some status values) The indicated thread has stopped running for the reason given by ``status``. - + + Historically, the GHC-internal status codes for the reasons why threads are + blocked were used more-or-less directly as the status codes emitted into the + eventlog. This is now recognised as a mistake and the GHC internal codes and + these eventlog stop thread codes are now independent. We are nevertheless + left with some historical warts: + + * 14,15: these correspond to GHC internal status codes `BlockedOnGA` and + `BlockedOnGA_NoSend` that are no longer used (and may never have been + used by any released version of GHC). + * 16,17: these would be used by `BlockedOnCCall` and + `BlockedOnCCall_Interruptible` which are GHC-internal status codes, but + these are never and have never been emitted into the eventlog. This has + caused confusion, and many versions of the `ghc-events` package support + these status codes. Threads blocking on foreign calls use `ForeignCall` + above. + * 19: this would be used by `ThreadMigrating` which is a GHC-internal + status code, but this is never emitted into the eventlog. Threads + migrating use a separate event `MIGRATE_THREAD`. + * `BlockedOnMsgGlobalise`: this is supported by versions of `ghc-events` as + code 18, but it appears never to have been emitted by any released version + of GHC. Most likely it was related to the local-heap GC experiment that + was never released. + + Errata: previous versions of this document stated that code 16 is + `BlockedOnMsgThrowTo`. It appears this was always incorrect. .. event-type:: MIGRATE_THREAD ===================================== libraries/base/changelog.md ===================================== @@ -25,6 +25,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)) + * Hide implementation details when throwing exceptions in throw and throwSTM. ([CLC proposal #387](https://github.com/haskell/core-libraries-committee/issues/387)) ## 4.22.0.0 *TBA* * Shipped with GHC 9.14.1 ===================================== libraries/ghc-internal/src/GHC/Internal/Exception.hs ===================================== @@ -87,7 +87,7 @@ throw e = -- Note also the absolutely crucial `noinine` in the RHS! -- See Note [Hiding precise exception signature in throw] let se :: SomeException - !se = noinline (unsafePerformIO (toExceptionWithBacktrace e)) + !se = noinline (unsafePerformIO (withFrozenCallStack $ toExceptionWithBacktrace e)) in raise# se -- Note [Capturing the backtrace in throw] @@ -162,7 +162,12 @@ throw e = -- primops which allow more precise guidance of the demand analyser's heuristic -- (e.g. #23847). --- | @since base-4.20.0.0 +-- | Collect a Backtrace and attach it to the 'Exception'. +-- +-- It is recommended to use 'withFrozenCallStack' when calling this function +-- in order to avoid leaking implementation details of 'toExceptionWithBacktrace'. +-- +-- @since base-4.20.0.0 toExceptionWithBacktrace :: (HasCallStack, Exception e) => e -> IO SomeException toExceptionWithBacktrace e ===================================== libraries/ghc-internal/src/GHC/Internal/STM.hs ===================================== @@ -28,7 +28,7 @@ import GHC.Internal.Base import GHC.Internal.Exception (Exception, toExceptionWithBacktrace, fromException, addExceptionContext) import GHC.Internal.Exception.Context (ExceptionAnnotation) import GHC.Internal.Exception.Type (WhileHandling(..)) -import GHC.Internal.Stack (HasCallStack) +import GHC.Internal.Stack (HasCallStack, withFrozenCallStack) -- TVars are shared memory locations which support atomic memory -- transactions. @@ -187,7 +187,7 @@ throwSTM e = do -- N.B. Typically use of unsafeIOToSTM is very much frowned upon as this -- is an easy way to end up with nested transactions. However, we can be -- certain that toExceptionWithBacktrace will not initiate a transaction. - se <- unsafeIOToSTM (toExceptionWithBacktrace e) + se <- unsafeIOToSTM (withFrozenCallStack $ toExceptionWithBacktrace e) STM $ raiseIO# se -- | Exception handling within STM actions. ===================================== libraries/ghc-internal/tests/backtraces/T15395.hs ===================================== @@ -0,0 +1,85 @@ +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE TypeApplications #-} + +import GHC.Internal.Control.Exception +import GHC.Internal.Data.Foldable (traverse_) +import GHC.Internal.Exception.Backtrace +import GHC.Internal.Exception.Context +import GHC.Internal.Exception.Type +import GHC.Internal.STM (atomically, throwSTM) +import qualified GHC.Internal.Stack as HCS +import qualified GHC.Internal.Stack.Types as HCS +import Control.Monad (when) +import qualified Data.List as List +import System.Exit (exitFailure) + +main :: IO () +main = do + -- Make sure there are HasCallStackBacktraces + setBacktraceMechanismState HasCallStackBacktrace True + mapM_ (uncurry runCase) + [ ("throw", throwAction) + , ("throwIO", throwIOAction) + , ("error", errorAction) + , ("throwSTM", throwSTMAction) + , ("undefined", undefinedAction) + ] + +runCase :: String -> IO () -> IO () +runCase name act = do + putStrLn $ "=== Validate stack size of '" ++ name ++ "' has length 1" + catchAndVerifyStackTraceLength name act + putStrLn "" + +throwAction :: IO () +throwAction = evaluate $ throw $ ErrorCall "my throw error" + +throwIOAction :: IO () +throwIOAction = throwIO $ ErrorCall "my throwIO error" + +errorAction :: IO () +errorAction = error "plain error" + +throwSTMAction :: IO () +throwSTMAction = atomically $ throwSTM $ ErrorCall "my throwSTM error" + +undefinedAction :: IO () +undefinedAction = evaluate undefined + +catchAndVerifyStackTraceLength :: String -> IO () -> IO () +catchAndVerifyStackTraceLength name act = do + try act >>= \ case + Right _ -> do + putStrLn $ "Exception expected but got a result for '" ++ name ++ "'" + exitFailure + Left exc -> + verifyBacktraceSize name exc + +verifyBacktraceSize :: String -> SomeException -> IO () +verifyBacktraceSize label se = do + message <- evaluate (displayException se) + putStrLn "==== Caught exception:" + putStrLn message + putStrLn "==== Exception Backtraces:" + let backtraces = getExceptionAnnotations @Backtraces $ someExceptionContext se + traverse_ validateBacktrace backtraces + +validateBacktrace :: Backtraces -> IO () +validateBacktrace bt = + case btrHasCallStack bt of + Nothing -> pure () + Just cs -> do + let stack = HCS.getCallStack cs + + traverse_ mustNotReferenceInternalPackages stack + traverse_ (putStrLn . prettyCallSite) stack + where + prettyCallSite (f, loc) = "- " ++ f ++ ", called at " ++ HCS.prettySrcLoc loc + + mustNotReferenceInternalPackages (_, loc) = + case List.find (HCS.srcLocPackage loc ==) internalPackages of + Just val -> fail $ "Stack trace must not reference '" ++ val ++ "' package." + Nothing -> pure () + +internalPackages :: [String] +internalPackages = ["base", "ghc", "ghc-internal", "ghc-experimental"] ===================================== libraries/ghc-internal/tests/backtraces/T15395.stdout ===================================== @@ -0,0 +1,30 @@ +=== Validate stack size of 'throw' has length 1 +==== Caught exception: +my throw error +==== Exception Backtraces: +- throw, called at T15395.hs:35:26 in main:Main + +=== Validate stack size of 'throwIO' has length 1 +==== Caught exception: +my throwIO error +==== Exception Backtraces: +- throwIO, called at T15395.hs:38:17 in main:Main + +=== Validate stack size of 'error' has length 1 +==== Caught exception: +plain error +==== Exception Backtraces: +- error, called at T15395.hs:41:15 in main:Main + +=== Validate stack size of 'throwSTM' has length 1 +==== Caught exception: +my throwSTM error +==== Exception Backtraces: +- throwSTM, called at T15395.hs:44:31 in main:Main + +=== Validate stack size of 'undefined' has length 1 +==== Caught exception: +Prelude.undefined +==== Exception Backtraces: +- undefined, called at T15395.hs:47:28 in main:Main + ===================================== libraries/ghc-internal/tests/backtraces/all.T ===================================== @@ -4,3 +4,7 @@ test('T26507', [ when(have_profiling(), extra_ways(['prof'])) , when(js_arch(), skip) , when(ghc_with_ipe(), skip) # IPE builds include an IPE backtrace section on stderr. , exit_code(1)], compile_and_run, ['']) + +# Stack traces shouldn't expose implementation details +test('T15395', [ when(have_profiling(), extra_ways(['prof'])) + , when(js_arch(), skip)], compile_and_run, ['']) ===================================== libraries/ghc-internal/tests/stack-annotation/ann_frame005.stdout ===================================== @@ -39,7 +39,5 @@ Exception context: - catch site for throwSTM - annotateCallStackIO, called at ann_frame005.hs:26:3 in main:Main - HasCallStack backtrace: -- collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:170:37 in ghc-internal:GHC.Internal.Exception -- toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/STM.hs:190:26 in ghc-internal:GHC.Internal.STM - throwSTM, called at ann_frame005.hs:55:9 in main:Main Handler annotation not present in context ===================================== m4/fptools_happy.m4 ===================================== @@ -28,13 +28,13 @@ then else fptools_cv_happy_version_display="none"; fi; - failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.2 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" + failure_msg="Happy version == 1.20.* || >= 2.0.2 && < 2.3 is required to compile GHC. (Found: $fptools_cv_happy_version_display)" FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.20.0], [AC_MSG_ERROR([$failure_msg])])[] FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[1.21.0], FP_COMPARE_VERSIONS([$fptools_cv_happy_version], [-le], [2.0.1], [AC_MSG_ERROR([$failure_msg])])[])[] - FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.2.0], + FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-ge],[2.3.0], [AC_MSG_ERROR([$failure_msg])])[] fi HappyVersion=$fptools_cv_happy_version; ===================================== testsuite/tests/arrows/should_compile/T21301.stderr ===================================== @@ -4,7 +4,5 @@ T21301.hs:(8,7)-(10,6): Non-exhaustive patterns in case HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/deSugar/should_fail/DsStrictFail.stderr ===================================== @@ -4,7 +4,5 @@ DsStrictFail.hs:4:12-23: Non-exhaustive patterns in False HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/deSugar/should_run/T20024.stderr ===================================== @@ -4,7 +4,5 @@ T20024.hs:2:12-32: Non-exhaustive guards in pattern binding HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:431:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/deSugar/should_run/dsrun005.stderr ===================================== @@ -4,7 +4,5 @@ dsrun005.hs:42:1-18: Non-exhaustive patterns in function f HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/deSugar/should_run/dsrun007.stderr ===================================== @@ -4,7 +4,5 @@ dsrun007.hs:5:23-25: Missing field in record construction HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:432:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/deSugar/should_run/dsrun008.stderr ===================================== @@ -4,7 +4,5 @@ dsrun008.hs:2:32-36: Non-exhaustive patterns in (2, x) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/deriving/should_run/T9576.stderr ===================================== @@ -13,7 +13,5 @@ T9576.hs:6:31: error: [GHC-39999] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/ghci/scripts/Defer02.stderr ===================================== @@ -71,8 +71,6 @@ Defer01.hs:49:5: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base *** Exception: Defer01.hs:13:5: error: [GHC-83865] @@ -82,8 +80,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base *** Exception: Defer01.hs:17:9: error: [GHC-39999] @@ -93,8 +89,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base <interactive>:10:11: error: [GHC-83865] @@ -113,8 +107,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base *** Exception: Defer01.hs:30:5: error: [GHC-83865] @@ -127,8 +119,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base *** Exception: Defer01.hs:33:8: error: [GHC-25897] @@ -146,8 +136,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base *** Exception: Defer01.hs:38:17: error: [GHC-83865] @@ -161,8 +149,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base *** Exception: Defer01.hs:42:5: error: [GHC-39999] @@ -172,8 +158,6 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base <interactive>:16:8: error: [GHC-18872] @@ -192,7 +176,5 @@ HasCallStack backtrace: (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/ghci/scripts/T15325.stderr ===================================== @@ -24,7 +24,5 @@ T15325.hs:11:9: warning: [GHC-39999] [-Wdeferred-type-errors (in -Wdefault)] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/patsyn/should_run/ghci.stderr ===================================== @@ -2,7 +2,5 @@ HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/quotes/LiftErrMsgDefer.stderr ===================================== @@ -11,7 +11,5 @@ LiftErrMsgDefer.hs:14:12: warning: [GHC-28914] [-Wdeferred-type-errors (in -Wdef (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/safeHaskell/safeLanguage/SafeLang15.stderr ===================================== @@ -4,7 +4,5 @@ SafeLang15.hs:22:9-37: Non-exhaustive patterns in Just p' HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/type-data/should_run/T22332a.stderr ===================================== @@ -4,7 +4,5 @@ T22332a.hs:18:1-35: Non-exhaustive patterns in Just eq HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:434:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/typecheck/should_run/T10284.stderr ===================================== @@ -7,7 +7,5 @@ T10284.hs:7:5: error: [GHC-83865] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/typecheck/should_run/T13838.stderr ===================================== @@ -9,7 +9,5 @@ T13838.hs:6:1: error: [GHC-83865] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/typecheck/should_run/T9497a-run.stderr ===================================== @@ -19,7 +19,5 @@ T9497a-run.hs:2:8: error: [GHC-88464] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/typecheck/should_run/T9497b-run.stderr ===================================== @@ -19,7 +19,5 @@ T9497b-run.hs:2:8: error: [GHC-88464] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/typecheck/should_run/T9497c-run.stderr ===================================== @@ -19,7 +19,5 @@ T9497c-run.hs:2:8: error: [GHC-88464] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/unsatisfiable/T23816.stderr ===================================== @@ -8,7 +8,5 @@ T23816.hs:18:15: error: [GHC-22250] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base ===================================== testsuite/tests/unsatisfiable/UnsatDefer.stderr ===================================== @@ -7,7 +7,5 @@ UnsatDefer.hs:20:7: error: [GHC-22250] (deferred type error) HasCallStack backtrace: - collectExceptionAnnotation, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception - toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:89:42 in ghc-internal:GHC.Internal.Exception throw, called at libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs:435:30 in ghc-internal:GHC.Internal.Control.Exception.Base View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a40e0e03941759e0bc3c2c296c0636… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a40e0e03941759e0bc3c2c296c0636… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] Delete libffi-tarballs
by Sven Tennie (＠supersven) 17 Feb '26

17 Feb '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 9de31886 by Sven Tennie at 2026-02-17T18:04:52+01:00 Delete libffi-tarballs Must have been an accidential commit... - - - - - 1 changed file: - − libffi-tarballs Changes: ===================================== libffi-tarballs deleted ===================================== @@ -1 +0,0 @@ -Subproject commit 7c51059557b68d29820a0a87cebfa6fe73c8adf5 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9de31886ed836ae3251f8df8334fc17… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9de31886ed836ae3251f8df8334fc17… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] 2 commits: No more cross stage special cases
by Sven Tennie (＠supersven) 17 Feb '26

17 Feb '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: aadf21d5 by Sven Tennie at 2026-02-16T19:42:57+01:00 No more cross stage special cases - - - - - fb1b050a by Sven Tennie at 2026-02-17T17:16:21+01:00 Try another variant of interpreter configuration - - - - - 2 changed files: - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -25,14 +25,11 @@ packageArgs = do -- immediately and may lead to cyclic dependencies. -- See: https://gitlab.haskell.org/ghc/ghc/issues/16809. cross = flag CrossCompiling - haveCurses = any (/= "") <$> traverse (flip buildSetting stage) [ CursesIncludeDir, CursesLibDir ] - - -- Check if the bootstrap compiler has the same version as the one we - -- are building. This is used to build cross-compilers - bootCross = (==) <$> ghcVersionStage (stage0InTree) <*> ghcVersionStage Stage1 + haveCurses = any (/= "") <$> traverse (`buildSetting` stage) [ CursesIncludeDir, CursesLibDir ] compilerStageOption f = buildingCompilerStage' . f =<< expr flavour + isCrossStage <- staged crossStage cursesIncludeDir <- staged (buildSetting CursesIncludeDir) cursesLibraryDir <- staged (buildSetting CursesLibDir) ffiIncludeDir <- staged (buildSetting FfiIncludeDir) @@ -53,7 +50,7 @@ packageArgs = do -- for Stage0 only so we can link ghc-pkg against it, so there is little -- reason to spend the effort to optimise it. , package cabal ? - andM [stage0, expr(notM cross)] ? builder Ghc ? arg "-O0" + stage0 ? builder Ghc ? arg "-O0" ------------------------------- compiler ------------------------------- , package compiler ? mconcat @@ -71,7 +68,7 @@ packageArgs = do -- These files take a very long time to compile with -O1, -- so we use -O0 for them just in Stage0 to speed up the -- build but not affect Stage1+ executables - , inputs ["**/GHC/Hs/Instances.hs", "**/GHC/Driver/Session.hs"] ? andM [stage0, expr(notM cross)] ? + , inputs ["**/GHC/Hs/Instances.hs", "**/GHC/Driver/Session.hs"] ? stage0 ? pure ["-O0"] ] , builder (Cabal Setup) ? mconcat @@ -91,7 +88,7 @@ packageArgs = do -- on the host and must rely on external interpreter to load -- target code, otherwise enable for stage2 since that runs on -- the target and can use target's own ghci object linker - [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage2]] `cabalFlag` "internal-interpreter" + [ expr (ghcWithInterpreter stage) `cabalFlag` "internal-interpreter" , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" , arg "-build-tool-depends" , staged (buildFlag UseLibzstd) `cabalFlag` "with-libzstd" @@ -113,8 +110,8 @@ packageArgs = do , compilerStageOption ghcDebugAssertions ? arg "-DDEBUG" ] , builder (Cabal Flags) ? mconcat - [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage1]] `cabalFlag` "interpreter" - , andM [expr (ghcWithInterpreter stage), notM (expr cross)] `cabalFlag` "internal-interpreter" + [ expr (ghcWithInterpreter stage) `cabalFlag` "interpreter" + , andM [expr (ghcWithInterpreter stage), notM (pure isCrossStage)] `cabalFlag` "internal-interpreter" , ifM stage0 -- We build a threaded stage 1 if the bootstrapping compiler -- supports it. @@ -165,10 +162,8 @@ packageArgs = do -- builder (Cabal Setup) ? cabalExtraDirs ffiIncludeDir ffiLibraryDir , builder (Cabal Flags) ? mconcat - [ ifM stage0 - (andM [cross, bootCross] `cabalFlag` "internal-interpreter") - (arg "internal-interpreter") - , stage0 `cabalFlag` "bootstrap" + [ stage0 `cabalFlag` "bootstrap", + andM [expr (ghcWithInterpreter stage), notM (pure isCrossStage)] `cabalFlag` "internal-interpreter" ] ] ===================================== hadrian/src/Settings/Program.hs ===================================== @@ -6,7 +6,6 @@ module Settings.Program import Base import Context import Oracles.Flavour -import Oracles.Flag import Packages import GHC.Platform.ArchOS @@ -40,7 +39,6 @@ programContext stage pkg = do -- Also checks whether the target supports GHCi. ghcWithInterpreter :: Stage -> Action Bool ghcWithInterpreter stage = do - is_cross <- flag CrossCompiling goodOs <- anyTargetOs stage [ OSMinGW32, OSLinux, OSSolaris2 , OSFreeBSD, OSDragonFly, OSNetBSD, OSOpenBSD , OSDarwin, OSKFreeBSD @@ -58,6 +56,4 @@ ghcWithInterpreter stage = do -- fall back on dynamic linking: dynamicGhcProgs <- askDynGhcPrograms stage - -- Maybe this should just be false for cross compilers. But for now - -- I've kept the old behaviour where it will say yes. (See #25939) - return $ ((goodOs && goodArch) || dynamicGhcProgs) && (stage >= Stage1 || is_cross) + return $ ((goodOs && goodArch) || dynamicGhcProgs) && (stage >= Stage2) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/20a054035434d8e2b881abfb02860a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/20a054035434d8e2b881abfb02860a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fendor/linkable-usage] Add linkable regression test
by Hannes Siebenhandl (＠fendor) 17 Feb '26

17 Feb '26

Hannes Siebenhandl pushed to branch wip/fendor/linkable-usage at Glasgow Haskell Compiler / GHC Commits: 47420bcb by fendor at 2026-02-17T15:03:49+01:00 Add linkable regression test - - - - - 5 changed files: - + testsuite/ghc-config/ghc-config - testsuite/tests/bytecode/TLinkable/Makefile - testsuite/tests/bytecode/TLinkable/all.T - + testsuite/tests/bytecode/TLinkable/genSplices2 - + testsuite/tests/bytecode/TLinkable/linkable_bytecodelib.stdout Changes: ===================================== testsuite/ghc-config/ghc-config ===================================== Binary files /dev/null and b/testsuite/ghc-config/ghc-config differ ===================================== testsuite/tests/bytecode/TLinkable/Makefile ===================================== @@ -11,3 +11,20 @@ TLinkable_Prep: TLinkable2_Prep: ./genSplices TLinkable2 '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -fprefer-byte-code -fwrite-byte-code -v0 TLinkable2.hs + +.PHONY: linkable_bytecodelib_Prep linkable_bytecodelib +PKGCONF01=bytecode.package.conf +LOCAL_GHC_PKG01='$(GHC_PKG)' --no-user-package-db -f $(PKGCONF01) +MAIN_MOD=BytecodeUsage +linkable_bytecodelib_Prep: + $(LOCAL_GHC_PKG01) init $(PKGCONF01) + mkdir outdir + cd outdir && ../genSplices2 $(MAIN_MOD) + mv outdir/$(MAIN_MOD).hs $(MAIN_MOD).hs + cd outdir && $(TEST_HC) -bytecodelib -hisuf=$(ghciWayExt) $(ghciWayFlags) \ + -o testpkg-1.2.3.4-XXX.bytecodelib -fbyte-code -fwrite-interface -fwrite-byte-code -this-unit-id=testpkg-1.2.3.4-XXX \ + *.hs + $(LOCAL_GHC_PKG01) register --force outdir/bytecode.pkg + +linkable_bytecodelib: + $(TEST_HC) $(TEST_HC_OPTS) $(ghcThWayFlags) --make -fprefer-byte-code $(MAIN_MOD) -package testpkg -package-db $(PKGCONF01) +RTS -l -hT -i0.001 -RTS ===================================== testsuite/tests/bytecode/TLinkable/all.T ===================================== @@ -2,6 +2,9 @@ # Bytecode libraries # Depend on that bytecode, look at the bytecode library tests to make sure this ends up in the EPS +def normaliseDynlibNames(str): + return re.sub(r'-ghc[0-9.]+\.', '-ghc<VERSION>.', str) + test('TLinkable', [ collect_compiler_stats('bytes allocated',2), pre_cmd('$MAKE -s --no-print-directory TLinkable_Prep'), @@ -19,3 +22,12 @@ test('TLinkable2', ], compile, ['-fprefer-byte-code -fforce-recomp ' + config.ghc_th_way_flags]) + +test('linkable_bytecodelib', + [ extra_files(["genSplices2"]) + , normalise_errmsg_fun(normaliseDynlibNames) + , pre_cmd('$MAKE -s --no-print-directory linkable_bytecodelib_Prep') + , copy_files + , req_bco ], + makefile_test, + []) ===================================== testsuite/tests/bytecode/TLinkable/genSplices2 ===================================== @@ -0,0 +1,98 @@ +#!/bin/bash + +MODNAME=${1} +NMOD=${2:-20} # Default 20 modules +NDEF=${3:-50} # Default 50 functions per module + +# Generate the modules +for ((i=1; i<=NMOD; i++)); do + module_name="Module$(printf "%03d" $i)" + file_path="${module_name}.hs" + + cat > "$file_path" << EOF +module ${module_name} where + +EOF + + for ((j=1; j<=NDEF; j++)); do + func_name="func$(printf "%03d" $j)" + cat >> "$file_path" << EOF +{-# NOINLINE ${func_name} #-} +${func_name} :: Int -> Int +${func_name} x = x + ${j} + +EOF + done +done + +# Generate imports section +imports="" +for ((i=1; i<=NMOD; i++)); do + imports="${imports}import splice Module$(printf "%03d" $i) +" +done + +# Generate the hard-coded TH expression +# Build: Module001.func001 1 + Module001.func002 2 + ... + Module{NMOD}.func{NDEF} {NMOD*NDEF} +expressions="" +all_mods="" +for ((i=1; i<=NMOD; i++)); do + mod_name="Module$(printf "%03d" $i)" + all_mods="${all_mods} ${mod_name}" + single_expression="" + count=1 + for ((j=1; j<=NDEF; j++)); do + func_name="func$(printf "%03d" $j)" + if [ $count -gt 1 ]; then + single_expression="${single_expression} + " + fi + single_expression="${single_expression}${mod_name}.${func_name} ${count}" + ((count++)) + done + + expressions="comp$(printf "%03d" $i) = \$(lift \$ ${single_expression})\\n\\n${expressions}" +done + +# Generate the TH splice file +cat > bytecode.pkg << EOF +name: testpkg +version: 1.2.3.4 +id: testpkg-1.2.3.4-XXX +key: testpkg-1.2.3.4-XXX +license: BSD3 +copyright: (c) The Univsersity of Glasgow 2004 +maintainer: glasgow-haskell-users(a)haskell.org +stability: stable +homepage: http://www.haskell.org/ghc +package-url: http://www.haskell.org/ghc +description: A Test Package +category: none +author: simonmar(a)microsoft.com +exposed: True +exposed-modules: ${all_mods} +import-dirs: \${pkgroot}/outdir +library-dirs: \${pkgroot}/outdir +include-dirs: +bytecode-library-dirs: \${pkgroot}/outdir +hs-libraries: testpkg-1.2.3.4-XXX +EOF + +# Generate the TH splice file +cat > "${MODNAME}".hs << EOF +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE NumericUnderscores #-} +{-# LANGUAGE ExplicitLevelImports #-} + +module ${MODNAME} where + +import splice Language.Haskell.TH.Syntax (Lift(..)) +import Control.Concurrent (threadDelay) +import splice Prelude (Num(..), ($), Monad(..), pure) + +-- Import all generated modules +${imports} + +-- Use from each module +$(echo -e -n "${expressions}") + +EOF ===================================== testsuite/tests/bytecode/TLinkable/linkable_bytecodelib.stdout ===================================== @@ -0,0 +1 @@ +[1 of 1] Compiling BytecodeUsage ( BytecodeUsage.hs, BytecodeUsage.o ) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/47420bcbe490a7a36bbcb04fc329ab4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/47420bcbe490a7a36bbcb04fc329ab4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fendor/stack-annotation-ty] 3 commits: Support more x86 extensions: AVX-512 {BW,DQ,VL} and GFNI
by Hannes Siebenhandl (＠fendor) 17 Feb '26

17 Feb '26

Hannes Siebenhandl pushed to branch wip/fendor/stack-annotation-ty at Glasgow Haskell Compiler / GHC Commits: 14f485ee by ARATA Mizuki at 2026-02-17T09:09:24+09:00 Support more x86 extensions: AVX-512 {BW,DQ,VL} and GFNI Also, mark AVX-512 ER and PF as deprecated. AVX-512 instructions can be used for certain 64-bit integer vector operations. GFNI can be used to implement bitReverse (currently not used by NCG, but LLVM may use it). Closes #26406 Addresses #26509 - - - - - 016f79d5 by fendor at 2026-02-17T09:16:16-05:00 Hide implementation details from base exception stack traces Ensure we hide the implementation details of the exception throwing mechanisms: * `undefined` * `throwSTM` * `throw` * `throwIO` * `error` The `HasCallStackBacktrace` should always have a length of exactly 1, not showing internal implementation details in the stack trace, as these are vastly distracting to end users. CLC proposal [#387](https://github.com/haskell/core-libraries-committee/issues/387) - - - - - 624a8cb5 by fendor at 2026-02-17T15:22:09+01:00 Add optional `SrcLoc` to `StackAnnotation` class `StackAnnotation`s give access to an optional `SrcLoc` field that user-added stack annotations can use to provide better backtraces in both error messages and when decoding the callstack. We update builtin stack annotations such as `StringAnnotation` and `ShowAnnotation` to also capture the `SrcLoc` of the current `CallStack` to improve backtraces by default (if stack annotations are used). This change is backwards compatible with GHC 9.14.1. - - - - - 67 changed files: - compiler/GHC/CmmToAsm/Config.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToAsm/X86/Instr.hs - compiler/GHC/CmmToAsm/X86/Ppr.hs - compiler/GHC/Driver/Config/CmmToAsm.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/SysTools/Cpp.hs - docs/users_guide/9.16.1-notes.rst - docs/users_guide/phases.rst - docs/users_guide/using.rst - libraries/base/changelog.md - libraries/ghc-experimental/CHANGELOG.md - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - + libraries/ghc-experimental/tests/Makefile - + libraries/ghc-experimental/tests/all.T - + libraries/ghc-experimental/tests/backtraces/Makefile - + libraries/ghc-experimental/tests/backtraces/T26806a.hs - + libraries/ghc-experimental/tests/backtraces/T26806a.stderr - + libraries/ghc-experimental/tests/backtraces/T26806b.hs - + libraries/ghc-experimental/tests/backtraces/T26806b.stderr - + libraries/ghc-experimental/tests/backtraces/T26806c.hs - + libraries/ghc-experimental/tests/backtraces/T26806c.stderr - + libraries/ghc-experimental/tests/backtraces/all.T - libraries/ghc-internal/src/GHC/Internal/Exception.hs - libraries/ghc-internal/src/GHC/Internal/STM.hs - libraries/ghc-internal/src/GHC/Internal/Stack/Annotation.hs - + libraries/ghc-internal/tests/backtraces/T15395.hs - + libraries/ghc-internal/tests/backtraces/T15395.stdout - libraries/ghc-internal/tests/backtraces/all.T - libraries/ghc-internal/tests/stack-annotation/ann_frame001.stdout - libraries/ghc-internal/tests/stack-annotation/ann_frame002.stdout - libraries/ghc-internal/tests/stack-annotation/ann_frame003.stdout - libraries/ghc-internal/tests/stack-annotation/ann_frame004.stdout - libraries/ghc-internal/tests/stack-annotation/ann_frame005.stdout - testsuite/driver/cpu_features.py - testsuite/tests/arrows/should_compile/T21301.stderr - testsuite/tests/codeGen/should_gen_asm/all.T - + testsuite/tests/codeGen/should_gen_asm/avx512-int64-minmax.asm - + testsuite/tests/codeGen/should_gen_asm/avx512-int64-minmax.hs - + testsuite/tests/codeGen/should_gen_asm/avx512-int64-mul.asm - + testsuite/tests/codeGen/should_gen_asm/avx512-int64-mul.hs - + testsuite/tests/codeGen/should_gen_asm/avx512-word64-minmax.asm - + testsuite/tests/codeGen/should_gen_asm/avx512-word64-minmax.hs - testsuite/tests/deSugar/should_fail/DsStrictFail.stderr - testsuite/tests/deSugar/should_run/T20024.stderr - testsuite/tests/deSugar/should_run/dsrun005.stderr - testsuite/tests/deSugar/should_run/dsrun007.stderr - testsuite/tests/deSugar/should_run/dsrun008.stderr - testsuite/tests/deriving/should_run/T9576.stderr - testsuite/tests/ghci/scripts/Defer02.stderr - testsuite/tests/ghci/scripts/T15325.stderr - testsuite/tests/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/patsyn/should_run/ghci.stderr - testsuite/tests/quotes/LiftErrMsgDefer.stderr - testsuite/tests/safeHaskell/safeLanguage/SafeLang15.stderr - testsuite/tests/simd/should_run/all.T - testsuite/tests/type-data/should_run/T22332a.stderr - testsuite/tests/typecheck/should_run/T10284.stderr - testsuite/tests/typecheck/should_run/T13838.stderr - testsuite/tests/typecheck/should_run/T9497a-run.stderr - testsuite/tests/typecheck/should_run/T9497b-run.stderr - testsuite/tests/typecheck/should_run/T9497c-run.stderr - testsuite/tests/unsatisfiable/T23816.stderr - testsuite/tests/unsatisfiable/UnsatDefer.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d40ddcc09a573c99485ee110c7db12… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d40ddcc09a573c99485ee110c7db12… You're receiving this email because of your account on gitlab.haskell.org.

1 0