- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/spj-apporv-Oct24] enable NB for custom, user written HasField constraint errors
by Apoorv Ingle (＠ani) 12 Jan '26

12 Jan '26

Apoorv Ingle pushed to branch wip/spj-apporv-Oct24 at Glasgow Haskell Compiler / GHC Commits: 2a4c6ed5 by Apoorv Ingle at 2026-01-12T14:39:20-06:00 enable NB for custom, user written HasField constraint errors - - - - - 5 changed files: - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Utils/Monad.hs - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr Changes: ===================================== compiler/GHC/Tc/Errors.hs ===================================== @@ -81,6 +81,8 @@ import qualified GHC.Data.Strict as Strict import Language.Haskell.Syntax.Basic (FieldLabelString(..)) +import Language.Haskell.Syntax (HsExpr (RecordUpd, HsGetField, HsProjection)) +import GHC.Hs.Expr (SrcCodeOrigin(..)) import Control.Monad ( unless, when, foldM, forM_ ) import Data.Bifunctor ( bimap ) @@ -2685,6 +2687,10 @@ isHasFieldOrigin = \case RecordUpdOrigin {} -> True RecordFieldProjectionOrigin {} -> True GetFieldOrigin {} -> True + ExpansionOrigin (OrigExpr e) + | HsGetField{} <- e -> True + | RecordUpd{} <- e -> True + | HsProjection{} <- e -> True _ -> False ----------------------- ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -1079,7 +1079,7 @@ setSrcSpan :: SrcSpan -> TcRn a -> TcRn a setSrcSpan (RealSrcSpan loc _) thing_inside = updLclCtxt (\env -> env { tcl_loc = loc }) thing_inside -setSrcSpan loc thing_inside +setSrcSpan _ thing_inside = thing_inside getSrcCodeOrigin :: TcRn (Maybe SrcCodeOrigin) ===================================== testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr ===================================== @@ -1,9 +1,15 @@ RecordDotSyntaxFail10.hs:40:11: error: [GHC-39999] • No instance for ‘HasField "quux" Quux String’ + arising from a record update NB: ‘HasField’ is not the built-in ‘GHC.Internal.Records.HasField’ class. • In the second argument of ‘($)’, namely ‘a {foo.bar.baz.quux}’ - In a stmt of a 'do' block: print $ a {foo.bar.baz.quux} In the expression: - do let a = Foo {foo = ...} - let quux = "Expecto patronum!" - print $ a {foo.bar.baz.quux} + do let a = Foo {foo = ...} + let quux = "Expecto patronum!" + print $ a {foo.bar.baz.quux} + In an equation for ‘main’: + main + = do let a = ... + let quux = "Expecto patronum!" + print $ a {foo.bar.baz.quux} + ===================================== testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr ===================================== @@ -3,8 +3,11 @@ RecordDotSyntaxFail13.hs:26:11: error: [GHC-39999] arising from a record update NB: ‘HasField’ is not the built-in ‘GHC.Internal.Records.HasField’ class. • In the second argument of ‘($)’, namely ‘a {foo}’ - In a stmt of a 'do' block: print $ a {foo} In the expression: do let a = Foo {foo = 12} print $ a {foo} + In an equation for ‘main’: + main + = do let a = ... + print $ a {foo} ===================================== testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr ===================================== @@ -3,7 +3,6 @@ RecordDotSyntaxFail8.hs:47:17: error: [GHC-39999] arising from selecting the field ‘quux1’ NB: ‘HasField’ is not the built-in ‘GHC.Internal.Records.HasField’ class. • In the second argument of ‘($)’, namely ‘....bar.baz.quux1’ - In a stmt of a 'do' block: print @Quux $ ....baz.quux1 In the expression: do let a = Foo {foo = ...} print @Quux $ ....quux1 @@ -11,13 +10,19 @@ RecordDotSyntaxFail8.hs:47:17: error: [GHC-39999] print @Quux $ b.quux2 let c = Foo {foo = ...} ... + In an equation for ‘main’: + main + = do let a = ... + print @Quux $ ....quux1 + let b = myQuux + print @Quux $ b.quux2 + ... RecordDotSyntaxFail8.hs:50:17: error: [GHC-39999] • No instance for ‘HasField "quux2" Quux Quux’ arising from selecting the field ‘quux2’ NB: ‘HasField’ is not the built-in ‘GHC.Internal.Records.HasField’ class. • In the second argument of ‘($)’, namely ‘b.quux2’ - In a stmt of a 'do' block: print @Quux $ b.quux2 In the expression: do let a = Foo {foo = ...} print @Quux $ ....quux1 @@ -25,12 +30,31 @@ RecordDotSyntaxFail8.hs:50:17: error: [GHC-39999] print @Quux $ b.quux2 let c = Foo {foo = ...} ... + In an equation for ‘main’: + main + = do let a = ... + print @Quux $ ....quux1 + let b = myQuux + print @Quux $ b.quux2 + ... RecordDotSyntaxFail8.hs:53:17: error: [GHC-39999] - • No instance for ‘HasField "quux3" Quux r0’ + • No instance for ‘HasField "quux3" Quux a0’ arising from selecting the field ‘quux3’ NB: ‘HasField’ is not the built-in ‘GHC.Internal.Records.HasField’ class. • In the expression: ....bar.baz.quux3 - In the second argument of ‘($)’, namely ‘....baz.quux3.wob’ - In a stmt of a 'do' block: print @Bool $ ....quux3.wob + In the expression: + do let a = Foo {foo = ...} + print @Quux $ ....quux1 + let b = myQuux + print @Quux $ b.quux2 + let c = Foo {foo = ...} + ... + In an equation for ‘main’: + main + = do let a = ... + print @Quux $ ....quux1 + let b = myQuux + print @Quux $ b.quux2 + ... View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2a4c6ed571842a9fef2c486e675ab7e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2a4c6ed571842a9fef2c486e675ab7e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mtl-2.3.2] 5 commits: hurd: Fix getExecutablePath build
by Bodigrim (＠Bodigrim) 12 Jan '26

12 Jan '26

Bodigrim pushed to branch wip/mtl-2.3.2 at Glasgow Haskell Compiler / GHC Commits: f3c18890 by Samuel Thibault at 2026-01-10T15:48:22+01:00 hurd: Fix getExecutablePath build 3939a8bf93e27 ("GNU/Hurd: Add getExecutablePath support") added using /proc/self/exe for GNU/Hurd but missed adding the required imports for the corresponding code. - - - - - 7f15bd15 by Samuel Thibault at 2026-01-12T07:16:25-05:00 Fix the OS string encoding for GNU/Hurd Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do. - - - - - 1db2f240 by Andrew Lelechenko at 2026-01-12T07:17:06-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - e038a383 by Sven Tennie at 2026-01-12T07:17:49-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - 0e93a79b by Andrew Lelechenko at 2026-01-12T19:39:07+00:00 Upgrade mtl submodule to 2.3.2 Fixes #26656 - - - - - 5 changed files: - .gitignore - libraries/base/src/Data/Bifoldable1.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-platform/src/GHC/Platform/ArchOS.hs - libraries/mtl Changes: ===================================== .gitignore ===================================== @@ -256,3 +256,12 @@ ghc.nix/ # clangd .clangd dist-newstyle/ + +# ----------------------------------------------------------------------------- +# CI + +# Windows CI +toolchain/ +ghc-*/ +inplace/ +tmp/ ===================================== libraries/base/src/Data/Bifoldable1.hs ===================================== @@ -2,6 +2,7 @@ -- Copyright: Edward Kmett, Oleg Grenrus -- License: BSD-3-Clause -- +-- @since 4.18.0.0 {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE Safe #-} ===================================== libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc ===================================== @@ -51,7 +51,7 @@ import GHC.Internal.Foreign.Ptr import GHC.Internal.Foreign.Storable import GHC.Internal.System.IO.Error (isDoesNotExistError) import GHC.Internal.System.Posix.Internals -#elif defined(linux_HOST_OS) +#elif defined(linux_HOST_OS) || defined(gnu_HOST_OS) import GHC.Internal.Data.Functor import GHC.Internal.Data.List (isSuffixOf) import GHC.Internal.Foreign.C.Types ===================================== libraries/ghc-platform/src/GHC/Platform/ArchOS.hs ===================================== @@ -156,7 +156,7 @@ stringEncodeOS = \case OSHaiku -> "haiku" OSQNXNTO -> "nto-qnx" OSAIX -> "aix" - OSHurd -> "hurd" + OSHurd -> "gnu" OSWasi -> "wasi" OSGhcjs -> "ghcjs" ===================================== libraries/mtl ===================================== @@ -1 +1 @@ -Subproject commit 37cbd924cb71eba591a2e2b6b131767f632d22c9 +Subproject commit 4b5080f43cbc372a437d5fecb144c7b75aadd86b View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8cc00bf8aa64b29550acbeee93592d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8cc00bf8aa64b29550acbeee93592d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Fix the OS string encoding for GNU/Hurd
by Marge Bot (＠marge-bot) 12 Jan '26

12 Jan '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 7f15bd15 by Samuel Thibault at 2026-01-12T07:16:25-05:00 Fix the OS string encoding for GNU/Hurd Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do. - - - - - 1db2f240 by Andrew Lelechenko at 2026-01-12T07:17:06-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - e038a383 by Sven Tennie at 2026-01-12T07:17:49-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - be3829a4 by sheaf at 2026-01-12T12:56:25-05:00 Don't re-use stack slots for growing registers This commit avoids re-using a stack slot for a register that has grown but already had a stack slot. For example, suppose we have stack slot assigments %v1 :: FF64 |-> StackSlot 0 %v2 :: FF64 |-> StackSlot 1 Later, we start using %v1 at a larger format (e.g. F64x2) and we need to spill it again. Then we **must not** use StackSlot 0, as a spill at format F64x2 would clobber the data in StackSlot 1. This can cause some fragmentation of the `StackMap`, but that's probably OK. Fixes #26668 - - - - - 9f61ac3b by fendor at 2026-01-12T12:56:25-05:00 Remove `traceId` from ghc-pkg executable - - - - - 6 changed files: - .gitignore - compiler/GHC/CmmToAsm/Reg/Linear.hs - compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs - libraries/base/src/Data/Bifoldable1.hs - libraries/ghc-platform/src/GHC/Platform/ArchOS.hs - utils/ghc-pkg/Main.hs Changes: ===================================== .gitignore ===================================== @@ -256,3 +256,12 @@ ghc.nix/ # clangd .clangd dist-newstyle/ + +# ----------------------------------------------------------------------------- +# CI + +# Windows CI +toolchain/ +ghc-*/ +inplace/ +tmp/ ===================================== compiler/GHC/CmmToAsm/Reg/Linear.hs ===================================== @@ -406,7 +406,7 @@ linearRA block_live block_id = go [] [] -- | Do allocation for a single instruction. raInsn :: OutputableRegConstraint freeRegs instr - => BlockMap Regs -- ^ map of what vregs are love on entry to each block. + => BlockMap Regs -- ^ map of what vregs are live on entry to each block. -> [instr] -- ^ accumulator for instructions already processed. -> BlockId -- ^ the id of the current block, for debugging -> LiveInstr instr -- ^ the instr to have its regs allocated, with liveness info. ===================================== compiler/GHC/CmmToAsm/Reg/Linear/StackMap.hs ===================================== @@ -37,7 +37,11 @@ data StackMap -- See Note [UniqFM and the register allocator] -- | Assignment of vregs to stack slots. - , stackMapAssignment :: UniqFM Unique StackSlot } + -- + -- We record not just the slot, but also how many stack slots the vreg + -- takes up, in order to avoid re-using a stack slot for a register + -- that has grown but already had a stack slot (#26668). + , stackMapAssignment :: UniqFM Unique (StackSlot, Int) } -- | An empty stack map, with all slots available. @@ -50,14 +54,19 @@ emptyStackMap = StackMap 0 emptyUFM -- getStackSlotFor :: StackMap -> Format -> Unique -> (StackMap, Int) -getStackSlotFor fs@(StackMap _ reserved) _fmt regUnique - | Just slot <- lookupUFM reserved regUnique = (fs, slot) - -getStackSlotFor (StackMap freeSlot reserved) fmt regUnique = - let - nbSlots = (formatInBytes fmt + 7) `div` 8 - in - (StackMap (freeSlot+nbSlots) (addToUFM reserved regUnique freeSlot), freeSlot) +getStackSlotFor fs@(StackMap freeSlot reserved) fmt regUnique + -- The register already has a stack slot; try to re-use it. + | Just (slot, nbSlots) <- lookupUFM reserved regUnique + -- Make sure the slot is big enough for this format, in case the register + -- has grown (#26668). + , nbNeededSlots <= nbSlots + = (fs, slot) + | otherwise + = (StackMap (freeSlot+nbNeededSlots) (addToUFM reserved regUnique (freeSlot, nbNeededSlots)), freeSlot) + -- NB: this can create fragmentation if a register keeps growing. + -- That's probably OK, as this is only happens very rarely. + where + !nbNeededSlots = (formatInBytes fmt + 7) `div` 8 -- | Return the number of stack slots that were allocated getStackUse :: StackMap -> Int ===================================== libraries/base/src/Data/Bifoldable1.hs ===================================== @@ -2,6 +2,7 @@ -- Copyright: Edward Kmett, Oleg Grenrus -- License: BSD-3-Clause -- +-- @since 4.18.0.0 {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE Safe #-} ===================================== libraries/ghc-platform/src/GHC/Platform/ArchOS.hs ===================================== @@ -156,7 +156,7 @@ stringEncodeOS = \case OSHaiku -> "haiku" OSQNXNTO -> "nto-qnx" OSAIX -> "aix" - OSHurd -> "hurd" + OSHurd -> "gnu" OSWasi -> "wasi" OSGhcjs -> "ghcjs" ===================================== utils/ghc-pkg/Main.hs ===================================== @@ -23,7 +23,6 @@ module Main (main) where -import Debug.Trace import qualified GHC.Unit.Database as GhcPkg import GHC.Unit.Database hiding (mkMungePathUrl) import GHC.HandleEncoding @@ -1634,7 +1633,7 @@ listPackages verbosity my_flags mPackageName mModuleName = do simplePackageList :: [Flag] -> [InstalledPackageInfo] -> IO () simplePackageList my_flags pkgs = do let showPkg :: InstalledPackageInfo -> String - showPkg | FlagShowUnitIds `elem` my_flags = traceId . display . installedUnitId + showPkg | FlagShowUnitIds `elem` my_flags = display . installedUnitId | FlagNamesOnly `elem` my_flags = display . mungedName . mungedId | otherwise = display . mungedId strs = map showPkg pkgs View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0f55a0d72cf10e8115729368e0bdef… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0f55a0d72cf10e8115729368e0bdef… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-try-opt-coercion] Comments -- almost all just about core invariants [skip ci]
by Simon Peyton Jones (＠simonpj) 12 Jan '26

12 Jan '26

Simon Peyton Jones pushed to branch wip/spj-try-opt-coercion at Glasgow Haskell Compiler / GHC Commits: 2b2ee165 by Simon Peyton Jones at 2026-01-12T17:31:42+00:00 Comments -- almost all just about core invariants [skip ci] - - - - - 18 changed files: - compiler/GHC/Builtin/PrimOps.hs - compiler/GHC/Core.hs - compiler/GHC/Core/Coercion/Opt.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Make.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/ConstantFold.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/SetLevels.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Stg/Lint.hs Changes: ===================================== compiler/GHC/Builtin/PrimOps.hs ===================================== @@ -435,12 +435,12 @@ follows, in decreasing order of permissiveness: NoEffect, we may float such an invalid call out of a dead branch and speculatively evaluate it. - In particular, we cannot safely rewrite such an invalid call to a - runtime error; we must emit code that produces a valid Word32#. - (If we're lucky, Core Lint may complain that the result of such a - rewrite violates the let-can-float invariant (#16742), but the - rewrite is always wrong!) See also Note [Guarding against silly shifts] - in GHC.Core.Opt.ConstantFold. + In particular, we cannot safely rewrite such an invalid call to a runtime + error; we must emit code that produces a valid Word32#. (If we're lucky, + Core Lint may complain that the result of such a rewrite violates + Note [Core binding invariants: nested non-rec] (#16742), but the rewrite + is always wrong!) See also Note [Guarding against silly shifts] in + GHC.Core.Opt.ConstantFold. Marking uncheckedShiftLWord32# as CanFail instead of NoEffect would give us the freedom to rewrite such invalid calls to runtime @@ -578,12 +578,12 @@ Several predicates on primops test this flag: where it is guarded by exprOkToDiscard, which in turn checks primOpOkToDiscard. - * The "no-float-out" thing is achieved by ensuring that we never - let-bind a saturated primop application unless it has NoEffect. - The RHS of a let-binding (which can float in and out freely) - satisfies exprOkForSpeculation; this is the let-can-float - invariant. And exprOkForSpeculation is false of a saturated - primop application unless it has NoEffect. + * The "no-float-out" thing is achieved by ensuring that we never let-bind a + saturated primop application unless it has NoEffect. The RHS of a + let-binding (which can float in and out freely) satisfies + exprOkForSpeculation; this is Note [Core binding invariants: nested non-rec]. + And exprOkForSpeculation is false of a saturated primop application unless it + has NoEffect. * So primops that aren't NoEffect will appear only as the scrutinees of cases, and that's why the FloatIn pass is capable ===================================== compiler/GHC/Core.hs ===================================== @@ -188,8 +188,7 @@ These data types are the heart of the compiler -- this corresponds to allocating a thunk for the things -- bound and then executing the sub-expression. -- --- See Note [Core letrec invariant] --- See Note [Core let-can-float invariant] +-- See Note [Core binding invariants] -- See Note [Representation polymorphism invariants] -- See Note [Core type and coercion invariant] -- @@ -393,25 +392,37 @@ extremely difficult to GUARANTEE it: * See Note [Shadowing in SpecConstr] in GHC.Core.Opt.SpecContr -Note [Core letrec invariant] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The Core letrec invariant: +Note [Core binding invariants] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +A core binding, `CoreBind`, obeys these invariants: - The right hand sides of all /top-level/ or /recursive/ - bindings must be of lifted type +* For /top level/ or /recursive/ bindings, + see Note [Top-level binding invariants] -See "Type#type_classification" in GHC.Core.Type -for the meaning of "lifted" vs. "unlifted". +* For /nested/ (not top-level) /non-recursive/ bindings, + see Note [Nested binding invariants] + +Note [Top-level binding invariants] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +A /top-level/ or /recursive/ binding must -For the non-top-level, non-recursive case see -Note [Core let-can-float invariant]. + * be of lifted type +OR + * have a RHS that is a primitive string literal + (see Note [Core top-level string literals], or +OR + * have a rhs that is (Coercion co) +OR + * be a worker or wrapper for an unlifted non-newtype data constructor; see (TL1). -At top level, however, there are two exceptions to this rule: +For the non-top-level, non-recursive case see Note [Nested binding invariants]. +(NB: this Note applies to recursive as well as top-level bindings, but I wanted +a short title!) -(TL1) A top-level binding is allowed to bind primitive string literal, - (which is unlifted). See Note [Core top-level string literals]. +See "Type#type_classification" in GHC.Core.Type +for the meaning of "lifted" vs. "unlifted". -(TL2) In Core, we generate a top-level binding for every non-newtype data +(TL1) In Core, we generate a top-level binding for every non-newtype data constructor worker or wrapper e.g. data T = MkT Int we generate @@ -428,16 +439,17 @@ constructor worker or wrapper S1 = S1 We allow this top-level unlifted binding to exist. -Note [Core let-can-float invariant] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The let-can-float invariant: - - The right hand side of a /non-top-level/, /non-recursive/ binding - may be of unlifted type, but only if - the expression is ok-for-speculation - or the 'Let' is for a join point. +Note [Nested binding invariants] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +A /non-top-level/, /non-recursive/ binding must + * Be a join point; see Note [Invariants on join points] +OR + * Be of lifted type +OR + * Have a RHS that is ok-for-speculation - (For top-level or recursive lets see Note [Core letrec invariant].) +NB: this only applies to /non-recursive/ bindings. For recursive +(or top-level) bindings see Note [Top-level binding invariants]. This means that the let can be floated around without difficulty. For example, this is OK: @@ -454,14 +466,14 @@ In this situation you should use @case@ rather than a @let@. The function alternatively use 'GHC.Core.Make.mkCoreLet' rather than this constructor directly, which will generate a @case@ if necessary -The let-can-float invariant is initially enforced by mkCoreLet in GHC.Core.Make. +The Core binding invariants are initially enforced by mkCoreLet in GHC.Core.Make. Historical Note [The let/app invariant] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Before 2022 GHC used the "let/app invariant", which applied the let-can-float rules -to the argument of an application, as well as to the RHS of a let. This made some -kind of sense, because 'let' can always be encoded as application: - let x=rhs in b = (\x.b) rhs +Before 2022 GHC used the "let/app invariant", which applied +Note [Nested binding invariants] to the argument of an application, +as well as to the RHS of a let. This made some kind of sense, because 'let' can +always be encoded as application: let x=rhs in b = (\x.b) rhs But the let/app invariant got in the way of RULES; see #19313. For example up :: Int# -> Int# @@ -472,7 +484,7 @@ Indeed RULES is a big reason that GHC doesn't use ANF, where the argument of an application is always a variable or a constant. To allow RULES to work nicely we need to allow lots of things in the arguments of a call. -TL;DR: we relaxed the let/app invariant to become the let-can-float invariant. +TL;DR: we relaxed the let/app invariant to focus just on /bindings/. Note [Core top-level string literals] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -631,13 +643,33 @@ checked by Core Lint. Note [Core type and coercion invariant] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -We allow a /non-recursive/, /non-top-level/ let to bind type and -coercion variables. These can be very convenient for postponing type -substitutions until the next run of the simplifier. +We allow `let` to bind type and coercion variables. + +* A type or coercion binding is always /non-recursive/ + +* A type binding cannot be top level (yet) but a coercion binding + can be top-level. * A type variable binding must have a RHS of (Type ty) * A coercion variable binding must have a RHS of (Coercion co) + See Note [Coercion bindings] + + +Note [Coercion bindings] +~~~~~~~~~~~~~~~~~~~~~~~~ +We allow non-recursive let-bindings for coercion variables, CoVars, +of type (t1 ~r# t2). + +The /main motivation/ is to support sharing: + let g::T a ~# b + g = Coercion <some big coercion? + in ...g..g..g... +If we simply duplicate `g` at every occurrence site, we can bloat the +size of the program, increasing both compile time and .hi-file sizes. + +* A coercion binding always has a RHS of (Coercion co). + See Note [Core type and coercion invariants]. It is possible to have terms that return a coercion, but we use case-binding for those; e.g. @@ -650,6 +682,15 @@ substitutions until the next run of the simplifier. Note [Equality superclasses in quantified constraints] in GHC.Tc.Solver.Dict +* Coercion bindings can be top level. And a top-level coercion binding can be + exported, and hence must: + * Have a GlobalId. + * Appear as a declaration in an interface file + That means that a coercion might mention a CoVar that is an imported GlobalId. + Just as for Core expressions, the free variable finder for Coercions can + ignore GlobalIds. + + Note [Representation polymorphism invariants] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ GHC allows us to abstract over calling conventions using **representation polymorphism**. @@ -846,7 +887,7 @@ Join points must follow these invariants: However, join points have simpler invariants in other ways 5. A join point can have an unboxed type without the RHS being - ok-for-speculation (i.e. drop the let-can-float invariant) + ok-for-speculation; see e.g. let j :: Int# = factorial x in ... 6. The RHS of join point is not required to have a fixed runtime representation, @@ -2053,8 +2094,8 @@ mkDoubleLitDouble :: Double -> Expr b mkDoubleLit d = Lit (mkLitDouble d) mkDoubleLitDouble d = Lit (mkLitDouble (toRational d)) --- | Bind all supplied binding groups over an expression in a nested let expression. Assumes --- that the rhs satisfies the let-can-float invariant. Prefer to use +-- | Bind all supplied binding groups over an expression in a nested let expression. +-- Assumes that the rhs satisfies Note [Nested binding invariants]. Prefer to use -- 'GHC.Core.Make.mkCoreLets' if possible, which does guarantee the invariant mkLets :: [Bind b] -> Expr b -> Expr b -- | Bind all supplied binders over an expression in a nested lambda expression. Prefer to ===================================== compiler/GHC/Core/Coercion/Opt.hs ===================================== @@ -46,7 +46,7 @@ Note [Coercion optimisation] This module does coercion optimisation. The purpose is to reduce the size of the coercions that the compiler carries around -- they are just proofs, and serve no runtime need. So the purpose of coercion optimisation is simply -to shrink coercions and thereby reduce compile time. +to shrink coercions and thereby reduce compile time and .hi file sizes. See the paper Evidence normalization in Systtem FV (RTA'13) @@ -57,7 +57,7 @@ However, although powerful and occasionally very effective, coercion optimisation can itself be very expensive (#26679). So we apply it sparingly: * In the Simplifier, function `rebuild_go`, we use `isReflexiveCo` (which - computes the type of the coercion) to eliminate reflexive coercion, just + computes the type of the coercion) to eliminate reflexive coercions, just before we build a cast (e |> co). (More precisely, we use `isReflexiveCoIgnoringMultiplicity; @@ -196,6 +196,10 @@ We use the following invariants: %********************************************************************* -} optCoProgram :: CoreProgram -> CoreProgram +-- Apply optCoercion to all coercions in /expressions/ +-- There may also be coercions in /types/ but we `optCoProgram` doesn't +-- look at them; they are typically fewer and smaller, and it doesn't seem +-- worth the cost of traversing and rebuilding all the types in the program. optCoProgram binds = map go binds where @@ -237,7 +241,24 @@ optCoAlt is (Alt k bs e) %* * %********************************************************************* -} +{- Note [optCoRefl] +~~~~~~~~~~~~~~~~~~~~ +`optCoRefl` is an experimental cheap-and-cheerful version of `optCoercion`. + +* It focuses entirely on chains of TransCo, thus + co1 ; co2 ; co3 ; ... ; con + +* It looks for sub-sequences in this chain that are Refl, based on their + types. The clever business is all in `gobble`, which springs into action + when we find a `TransCo`. + +* It can sometimes do a bit more than `optCoercion`. It'll eliminate /any/ + subsequence of co1..con that is reflexive, whereas `optCoercion` just works + left-to-right, and won't spot (co1 ; co2 ; sym co2) +-} + optCoRefl :: Coercion -> Coercion +-- See Note [optCoRefl] optCoRefl in_co #ifdef DEBUG -- Debug check that optCoRefl doesn't change the type ===================================== compiler/GHC/Core/Lint.hs ===================================== @@ -586,8 +586,7 @@ lintLetBind top_lvl rec_flag binder rhs rhs_ty ; checkL (not (isCoVar binder) || isCoArg rhs) (mkLetErr binder rhs) - -- Check the let-can-float invariant - -- See Note [Core let-can-float invariant] in GHC.Core + -- Check Note [Core binding invariants] in GHC.Core ; checkL (bindingIsOk top_lvl rec_flag binder binder_ty rhs) $ mkLetErr binder rhs @@ -647,6 +646,7 @@ lintLetBind top_lvl rec_flag binder rhs rhs_ty -- the unfolding is a SimplifiableCoreExpr. Give up for now. bindingIsOk :: TopLevelFlag -> RecFlag -> OutId -> OutType -> CoreExpr -> Bool +-- Checks the invariants of Note [Core binding invariants] in GHC.Core bindingIsOk top_lvl rec_flag binder binder_ty rhs | isCoVar binder = isCoArg rhs ===================================== compiler/GHC/Core/Make.hs ===================================== @@ -112,8 +112,9 @@ sortQuantVars vs = sorted_tcvs ++ ids -- | Bind a binding group over an expression, using a @let@ or @case@ as -- appropriate (see "GHC.Core#let_can_float_invariant") mkCoreLet :: HasDebugCallStack => CoreBind -> CoreExpr -> CoreExpr -mkCoreLet (NonRec bndr rhs) body -- See Note [Core let-can-float invariant] - = bindNonRec bndr rhs body +mkCoreLet (NonRec bndr rhs) body + = -- See Note [Core binding invariants: nested non-rec] + bindNonRec bndr rhs body mkCoreLet bind body = Let bind body ===================================== compiler/GHC/Core/Opt/CSE.hs ===================================== @@ -288,8 +288,8 @@ all trivial expressions. Consider case x |> co of (y::Array# Int) { ... } We do not want to extend the substitution with (y -> x |> co); since y -is of unlifted type, this would destroy the let-can-float invariant if -(x |> co) was not ok-for-speculation. +is of unlifted type, this would destroy Note [Nested binding invariants] +if (x |> co) was not ok-for-speculation. But surely (x |> co) is ok-for-speculation, because it's a trivial expression, and x's type is also unlifted, presumably. Well, maybe ===================================== compiler/GHC/Core/Opt/ConstantFold.hs ===================================== @@ -1606,11 +1606,11 @@ as follows: let x = I# (error "invalid shift") in ... -This was originally done in the fix to #16449 but this breaks the -let-can-float invariant (see Note [Core let-can-float invariant] in -GHC.Core) as noted in #16742. For the reasons discussed under -"NoEffect" in Note [Classifying primop effects] (in GHC.Builtin.PrimOps) -there is no safe way to rewrite the argument of I# such that it bottoms. +This was originally done in the fix to #16449 but this breaks +Note [Nested binding invariants] in GHC.Core, as noted in #16742. For the +reasons discussed under "NoEffect" in Note [Classifying primop effects] (in +GHC.Builtin.PrimOps) there is no safe way to rewrite the argument of I# such +that it bottoms. Consequently we instead take advantage of the fact that the result of a large shift is unspecified (see associated documentation in primops.txt.pp) @@ -2177,15 +2177,15 @@ BigNat). These rules implement the same kind of constant folding as we have for Int#/Word#/etc. primops. See builtinBignumRules. These rules are built-in because they can't be expressed as regular rules for -now. The reason is that due to the let-can-float invariant (see Note [Core -let-can-float invariant] in GHC.Core), GHC is too conservative with some bignum -operations and they don't match rules. For example: +now. The reason is that due to Note [Nested binding invariants] in GHC.Core, +GHC is too conservative with some bignum operations and they don't match rules. +For example: case integerAdd 1 x of r { _ -> integerAdd 1 r } doesn't constant-fold into `integerAdd 2 x` with a regular rule. That's because GHC never floats in `integerAdd 1 x` to form `integerAdd 1 (integerAdd 1 x)` -because of the let-can-float invariant (it doesn't know if `integerAdd` +because of Note [Nested binding invariants] (it doesn't know if `integerAdd` terminates). In the built-in rule for `integerAdd` we can access the unfolding of `r` and we ===================================== compiler/GHC/Core/Opt/FloatIn.hs ===================================== @@ -665,7 +665,8 @@ noFloatIntoRhs is_rec bndr rhs = isRec is_rec -- Joins are one-shot iff non-recursive | definitelyUnliftedType (idType bndr) - = True -- Preserve let-can-float invariant, see Note [noFloatInto considerations] + = True -- Preserve Note [Nested binding invariants], + -- see Note [noFloatInto considerations] | otherwise = noFloatIntoArg rhs @@ -690,7 +691,7 @@ When do we want to float bindings into - noFloatIntoArg: the argument of a function application Definitely don't float into RHS if it has unlifted type; -that would destroy the let-can-float invariant. +that would destroy Note [Nested binding invariants]. * Wrinkle 1: do not float in if (a) any non-one-shot value lambdas ===================================== compiler/GHC/Core/Opt/SetLevels.hs ===================================== @@ -1003,12 +1003,11 @@ Why? Because it's important /not/ to transform let x = a /# 3 to let x = case bx of I# a -> a /# 3 -because the let binding no -longer obeys the let-can-float invariant. But (a /# 3) is ok-for-spec -due to a special hack that says division operators can't fail -when the denominator is definitely non-zero. And yet that -same expression says False to exprIsCheap. Simplest way to -guarantee the let-can-float invariant is to use the same function! +because the let binding no longer obeys Note [Nested binding invariants]. +But (a /# 3) is ok-for-spec due to a special hack that says division operators +can't fail when the denominator is definitely non-zero. And yet that same +expression says False to exprIsCheap. Simplest way to guarantee +Note [Nested binding invariants] is to use the same function! If an expression is okay for speculation, we could also float it out *without* boxing and unboxing, since evaluating it early is okay. ===================================== compiler/GHC/Core/Opt/Simplify/Env.hs ===================================== @@ -749,8 +749,8 @@ Examples NonRec x# (y +# 3) FltOkSpec -- Unboxed, but ok-for-spec'n NonRec x* (f y) FltCareful -- Strict binding; might fail or diverge - NonRec x# (a /# b) FltCareful -- Might fail; does not satisfy let-can-float invariant - NonRec x# (f y) FltCareful -- Might diverge; does not satisfy let-can-float invariant + NonRec x# (a /# b) FltCareful -- Might fail; does not satisfy Note [Nested binding invariants] + NonRec x# (f y) FltCareful -- Might diverge; does not satisfy Note [Nested binding invariants] -} data LetFloats = LetFloats (OrdList OutBind) FloatFlag @@ -763,7 +763,7 @@ data FloatFlag = FltLifted -- All bindings are lifted and lazy *or* -- consist of a single primitive string literal -- Hence ok to float to top level, or recursive - -- NB: consequence: all bindings satisfy let-can-float invariant + -- NB: consequence: all bindings satisfy Note [Nested binding invariants] | FltOkSpec -- All bindings are FltLifted *or* -- strict (perhaps because unlifted, @@ -772,12 +772,12 @@ data FloatFlag -- Hence ok to float out of the RHS -- of a lazy non-recursive let binding -- (but not to top level, or into a rec group) - -- NB: consequence: all bindings satisfy let-can-float invariant + -- NB: consequence: all bindings satisfy Note [Nested binding invariants] | FltCareful -- At least one binding is strict (or unlifted) -- and not guaranteed cheap -- Do not float these bindings out of a lazy let! - -- NB: some bindings may not satisfy let-can-float + -- NB: some bindings may not satisfy Note [Nested binding invariants] instance Outputable LetFloats where ppr (LetFloats binds ff) = ppr ff $$ ppr (fromOL binds) @@ -962,8 +962,8 @@ wrapFloats (SimplFloats { sfLetFloats = LetFloats bs flag -- Note: Always safe to put the joins on the inside -- since the values can't refer to them where - mk_let | FltCareful <- flag = mkCoreLet -- need to enforce let-can-float-invariant - | otherwise = Let -- let-can-float invariant hold + mk_let | FltCareful <- flag = mkCoreLet -- Need to enforce Note [Nested binding invariants] + | otherwise = Let -- Note [Nested binding invariants] holds wrapJoinFloatsX :: SimplFloats -> OutExpr -> (SimplFloats, OutExpr) -- Wrap the sfJoinFloats of the env around the expression, ===================================== compiler/GHC/Core/Opt/Simplify/Iteration.hs ===================================== @@ -315,7 +315,7 @@ simplLazyBind :: TopLevelFlag -> RecFlag -> (InExpr, SimplEnv) -- The RHS and its static environment -> SimplM (SimplFloats, SimplEnv) -- Precondition: Ids only, no TyVars; not a JoinId --- Precondition: rhs obeys the let-can-float invariant +-- Precondition: rhs obeys Note [Nested binding invariants] simplLazyBind top_lvl is_rec (bndr,unf_se) (bndr1,env) (rhs,rhs_se) = assert (isId bndr ) assertPpr (not (isJoinId bndr)) (ppr bndr) $ @@ -397,7 +397,7 @@ simplAuxBind :: String -- The binder comes from a case expression (case binder or alternative) -- and so does not have rules, unfolding, inline pragmas etc. -- --- Precondition: rhs satisfies the let-can-float invariant +-- Precondition: rhs satisfies Note [Nested binding invariants] simplAuxBind _str env bndr new_rhs | assertPpr (isId bndr && not (isJoinId bndr)) (ppr bndr) $ @@ -950,7 +950,7 @@ completeBind :: BindContext -- * or by adding to the floats in the envt -- -- Binder /can/ be a JoinId --- Precondition: rhs obeys the let-can-float invariant +-- Precondition: rhs obeys Note [Nested binding invariants] completeBind bind_cxt (old_bndr, unf_se) (new_bndr, new_rhs, env) | isCoVar old_bndr = case new_rhs of @@ -1290,7 +1290,7 @@ simplExprF1 env (Let (NonRec bndr rhs) body) cont ; simplExprF (extendTvSubst env bndr ty') body cont } | Just env' <- preInlineUnconditionally env NotTopLevel bndr rhs env - -- Because of the let-can-float invariant, it's ok to + -- Because of Note [Nested binding invariants], it's ok to -- inline freely, or to drop the binding if it is dead. = do { simplTrace "SimplBindr:inline-uncond2" (ppr bndr <+> ppr rhs) $ tick (PreInlineUnconditionally bndr) @@ -1594,13 +1594,13 @@ rebuild_go env expr cont completeBindX :: SimplEnv -> FromWhat -> InId -> OutExpr -- Non-recursively bind this Id to this (simplified) expression - -- (the let-can-float invariant may not be satisfied) + -- (Note [Nested binding invariants] may not be satisfied) -> InExpr -- In this body -> SimplCont -- Consumed by this continuation -> SimplM (SimplFloats, OutExpr) completeBindX env from_what bndr rhs body cont | FromBeta arg_levity <- from_what - , needsCaseBindingL arg_levity rhs -- Enforcing the let-can-float-invariant + , needsCaseBindingL arg_levity rhs -- Enforcing Note [Nested binding invariants] = do { (env1, bndr1) <- simplNonRecBndr env bndr -- Lambda binders don't have rules ; (floats, expr') <- simplNonRecBody env1 from_what body cont -- Do not float floats past the Case binder below @@ -1887,7 +1887,7 @@ simplNonRecE :: HasDebugCallStack -- It deals with strict bindings, via the StrictBind continuation, -- which may abort the whole process. -- --- from_what=FromLet => the RHS satisfies the let-can-float invariant +-- from_what=FromLet => the RHS satisfies Note [Nested binding invariants] -- Otherwise it may or may not satisfy it. simplNonRecE env from_what bndr (rhs, rhs_se) body cont @@ -1910,7 +1910,7 @@ simplNonRecE env from_what bndr (rhs, rhs_se) body cont is_strict_bind = case from_what of FromBeta Unlifted -> True -- If we are coming from a beta-reduction (FromBeta) we must - -- establish the let-can-float invariant, so go via StrictBind + -- establish Note [Nested binding invariants], so go via StrictBind -- If not, the invariant holds already, and it's optional. -- (FromBeta Lifted) or FromLet: look at the demand info @@ -2857,7 +2857,7 @@ this transformation: We treat the unlifted and lifted cases separately: * Unlifted case: 'e' satisfies exprOkForSpeculation - (ok-for-spec is needed to satisfy the let-can-float invariant). + (ok-for-spec is needed to satisfy Note [Nested binding invariants]. This turns case a +# b of r -> ...r... into let r = a +# b in ...r... and thence .....(a +# b).... @@ -3112,7 +3112,7 @@ rebuildCase env scrut case_bndr alts cont assert (null bs) $ do { (floats1, env') <- simplAuxBind "rebuildCase" env case_bndr case_bndr_rhs -- scrut is a constructor application, - -- hence satisfies let-can-float invariant + -- hence satisfies Note [Nested binding invariants] ; (floats2, expr') <- simplExprF env' rhs cont ; case wfloats of [] -> return (floats1 `addFloats` floats2, expr') @@ -3624,11 +3624,11 @@ We pin on a (OtherCon []) unfolding to the case-binder of a Case, even though it'll be over-ridden in every case alternative with a more informative unfolding. Why? Because suppose a later, less clever, pass simply replaces all occurrences of the case binder with the binder itself; -then Lint may complain about the let-can-float invariant. Example +then Lint may complain about failing Note [Nested binding invariants]. Example case e of b { DEFAULT -> let v = reallyUnsafePtrEquality# b y in .... ; K -> blah } -The let-can-float invariant requires that y is evaluated in the call to +Note [Nested binding invariants] requires that y is evaluated in the call to reallyUnsafePtrEquality#, which it is. But we still want that to be true if we propagate binders to occurrences. @@ -3732,7 +3732,8 @@ knownCon env scrut dc_floats dc dc_ty_args dc_args bndr bs rhs cont -- occur in the RHS; and simplAuxBind may therefore discard it. -- Nevertheless we must keep it if the case-binder is alive, -- because it may be used in the con_app. See Note [knownCon occ info] - ; (floats1, env2) <- simplAuxBind "knownCon" env' b' arg -- arg satisfies let-can-float invariant + -- NB: arg satisfies Note [Nested binding invariants] + ; (floats1, env2) <- simplAuxBind "knownCon" env' b' arg ; (floats2, env3) <- bind_args env2 bs' args ; return (floats1 `addFloats` floats2, env3) } ===================================== compiler/GHC/Core/Opt/Simplify/Utils.hs ===================================== @@ -1491,8 +1491,8 @@ preInlineUnconditionally :: SimplEnv -> TopLevelFlag -> InId -> InExpr -> StaticEnv -- These two go together -> Maybe SimplEnv -- Returned env has extended substitution --- Precondition: rhs satisfies the let-can-float invariant --- See Note [Core let-can-float invariant] in GHC.Core +-- Precondition: rhs satisfies Note [Nested binding invariants] +-- See Note [Nested binding invariants] in GHC.Core -- Reason: we don't want to inline single uses, or discard dead bindings, -- for unlifted, side-effect-ful bindings preInlineUnconditionally env top_lvl bndr rhs rhs_env @@ -1638,8 +1638,7 @@ postInlineUnconditionally -> InId -> OutId -- The binder (*not* a CoVar), including its unfolding -> OutExpr -> Bool --- Precondition: rhs satisfies the let-can-float invariant --- See Note [Core let-can-float invariant] in GHC.Core +-- Precondition: rhs satisfies Note [Nested binding invariants] in GHC.Core -- Reason: we don't want to inline single uses, or discard dead bindings, -- for unlifted, side-effect-ful bindings postInlineUnconditionally env bind_cxt old_bndr bndr rhs ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -1944,7 +1944,7 @@ case) do not float the binding itself unless it satisfies exprIsTopLevelBindable This is conservative: maybe the RHS of `x` has a free var that would stop it floating to top level anyway; but that is hard to spot (since we don't know what the non-top-level in-scope binders are) and rare (since the binding must satisfy -Note [Core let-can-float invariant] in GHC.Core). +Note [Nested binding invariants] in GHC.Core). Note [Specialising Calls] ===================================== compiler/GHC/Core/SimpleOpt.hs ===================================== @@ -381,7 +381,7 @@ simple_app env e0@(Lam {}) as0@(_:_) -- See Note [Dark corner with representation polymorphism] needsCaseBinding (idType b') (snd a) -- This arg must not be inlined (side-effects) and cannot be let-bound, - -- due to the let-can-float invariant. So simply case-bind it here. + -- due to Note [Nested binding invariants]. So simply case-bind it here. , let a' = simple_opt_clo (soeInScope env) a = mkDefaultCase a' b' $ do_beta env' body as ===================================== compiler/GHC/Core/TyCo/FVs.hs ===================================== @@ -350,7 +350,8 @@ deepTcvFolder = TyCoFolder { tcf_view = noView -- See Note [Free vars and synon where do_tcv is v = EndoOS do_it where - do_it acc | not (isLocalVar v) = acc + do_it acc | not (isLocalVar v) = acc -- A CoVar can be a GlobalId + -- See Note [Coercion bindings] in GHC.Core | v `elemVarSet` is = acc | v `elemVarSet` acc = acc | otherwise = appEndoOS (deep_ty (varType v)) $ ===================================== compiler/GHC/Core/TyCo/Subst.hs ===================================== @@ -1040,7 +1040,7 @@ substTyCoBndr subst (Named (Bndr tv vis)) = (subst', Named (Bndr tv' vis)) {- Note [Keeping the substitution empty] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ A very common situation is where we run over a term doing no cloning, -no substitution, nothing. In that case the TCvSubst till be empty, and +no substitution, nothing. In that case the TCvSubst will be empty, and it is /very/ valuable to /keep/ it empty: * It's wasted effort to build up an identity substitution mapping ===================================== compiler/GHC/Core/Utils.hs ===================================== @@ -1813,13 +1813,11 @@ exprIsUnaryClassFun _ = False -- See also Note [Classifying primop effects] in "GHC.Builtin.PrimOps" -- and Note [Transformations affected by primop effects]. -- --- 'exprOkForSpeculation' is used to define Core's let-can-float --- invariant. (See Note [Core let-can-float invariant] in --- "GHC.Core".) It is therefore frequently called on arguments of --- unlifted type, especially via 'needsCaseBinding'. But it is --- sometimes called on expressions of lifted type as well. For --- example, see Note [Speculative evaluation] in "GHC.CoreToStg.Prep". - +-- 'exprOkForSpeculation' is used in the definition of Note [Nested binding +-- invariants]in GHC.Core. It is therefore frequently called on arguments of +-- unlifted type, especially via 'needsCaseBinding'. But it is sometimes +-- called on expressions of lifted type as well. For example, see +-- Note [Speculative evaluation] in "GHC.CoreToStg.Prep". exprOkForSpeculation, exprOkToDiscard :: CoreExpr -> Bool exprOkForSpeculation = expr_ok fun_always_ok primOpOkForSpeculation @@ -2044,12 +2042,14 @@ But we restrict it sharply: ; False -> e2 } in ...) ... - Does the RHS of v satisfy the let-can-float invariant? Previously we said - yes, on the grounds that y is evaluated. But the binder-swap done - by GHC.Core.Opt.SetLevels would transform the inner alternative to + Does the RHS of v satisfy Note [Nested binding invariants]? + Previously we said yes, on the grounds that y is evaluated. But the + binder-swap done by GHC.Core.Opt.SetLevels would transform the inner + alternative to + DEFAULT -> ... (let v::Int# = case x of { ... } in ...) .... - which does /not/ satisfy the let-can-float invariant, because x is + which does /not/ satisfy Note [Nested bindings invariants], because x is not evaluated. See Note [Binder-swap during float-out] in GHC.Core.Opt.SetLevels. To avoid this awkwardness it seems simpler to stick to unlifted scrutinees where the issue does not @@ -2134,7 +2134,7 @@ extremely useful for float-out, changes these expressions to And now the expression does not obey the let-can-float invariant! Yikes! Moreover we really might float (dataToTagLarge# x) outside the case, -and then it really, really doesn't obey the let-can-float invariant. +and then it really, really doesn't obey Note [Nested binding invariants]. The solution is simple: exprOkForSpeculation does not try to take advantage of the evaluated-ness of (lifted) variables. And it returns @@ -2144,7 +2144,8 @@ by marking the relevant primops as "ThrowsException" or GHC.Builtin.PrimOps. Note that exprIsHNF /can/ and does take advantage of evaluated-ness; -it doesn't have the trickiness of the let-can-float invariant to worry about. +it doesn't have the trickiness of Note [Nested binding invariants] +to worry about. ************************************************************************ * * ===================================== compiler/GHC/Stg/Lint.hs ===================================== @@ -5,9 +5,8 @@ A lint pass to check basic STG invariants: - Variables should be defined before used. -- Let bindings should not have unboxed types (unboxed bindings should only - appear in case), except when they're join points (see Note [Core let-can-float - invariant] and #14117). +- Let bindings: see Note [Core binding invariants] in GHC.Core. + (See #14117). - If linting after unarisation, invariants listed in Note [Post-unarisation invariants]. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2b2ee16577b5bb5146bb48ab7156b84… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2b2ee16577b5bb5146bb48ab7156b84… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/remove-iserv
by Cheng Shao (＠TerrorJack) 12 Jan '26

12 Jan '26

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

1 0

[Git][ghc/ghc][wip/T26615] Make SpecContr rules fire a bit later
by Simon Peyton Jones (＠simonpj) 12 Jan '26

12 Jan '26

Simon Peyton Jones pushed to branch wip/T26615 at Glasgow Haskell Compiler / GHC Commits: 22b7540f by Simon Peyton Jones at 2026-01-12T16:10:04+00:00 Make SpecContr rules fire a bit later See #26615 and Note [SpecConstr rule activation] - - - - - 19 changed files: - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Unfold/Make.hs - testsuite/tests/simplCore/should_compile/T14003.stderr - testsuite/tests/simplCore/should_compile/T19672.stderr - testsuite/tests/simplCore/should_compile/T21763.stderr - testsuite/tests/simplCore/should_compile/T21763a.stderr - + testsuite/tests/simplCore/should_compile/T26115a.hs - + testsuite/tests/simplCore/should_compile/T26615.hs - + testsuite/tests/simplCore/should_compile/T26615.stderr - + testsuite/tests/simplCore/should_compile/T26615a.hs - testsuite/tests/simplCore/should_compile/T4908.stderr - testsuite/tests/simplCore/should_compile/all.T - testsuite/tests/simplCore/should_compile/spec-inline.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/22b7540f08f5fef054217c204ec7a73… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/22b7540f08f5fef054217c204ec7a73… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/remove-cmm-tryputmvar
by Cheng Shao (＠TerrorJack) 12 Jan '26

12 Jan '26

Cheng Shao pushed new branch wip/remove-cmm-tryputmvar at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/remove-cmm-tryputmvar 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] T17912 now works for windows-validate
by Sven Tennie (＠supersven) 12 Jan '26

12 Jan '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 91cb5824 by Sven Tennie at 2026-01-12T14:47:09+01:00 T17912 now works for windows-validate Probably, because we're using default.target to build and run things. If this fails on windows (mingw32), feel free to add the "broken" expectation again. - - - - - 1 changed file: - libraries/base/tests/IO/all.T Changes: ===================================== libraries/base/tests/IO/all.T ===================================== @@ -182,7 +182,7 @@ test('T17414', compile_and_run, ['']) test('T17510', expect_broken(17510), compile_and_run, ['']) test('bytestringread001', extra_run_opts('test.data'), compile_and_run, ['']) -test('T17912', [only_ways(['threaded1']), when(opsys('mingw32'),expect_broken(1))], compile_and_run, ['']) +test('T17912', [only_ways(['threaded1'])], compile_and_run, ['']) test('T18832', only_ways(['threaded1']), compile_and_run, ['']) test('mkdirExists', [exit_code(1), when(opsys('mingw32'), ignore_stderr)], compile_and_run, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/91cb582462cda7f9d6257705a52f404… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/91cb582462cda7f9d6257705a52f404… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/remove-alloc_p_ticky] 6 commits: hurd: Fix getExecutablePath build
by Cheng Shao (＠TerrorJack) 12 Jan '26

12 Jan '26

Cheng Shao pushed to branch wip/remove-alloc_p_ticky at Glasgow Haskell Compiler / GHC Commits: f3c18890 by Samuel Thibault at 2026-01-10T15:48:22+01:00 hurd: Fix getExecutablePath build 3939a8bf93e27 ("GNU/Hurd: Add getExecutablePath support") added using /proc/self/exe for GNU/Hurd but missed adding the required imports for the corresponding code. - - - - - 7f15bd15 by Samuel Thibault at 2026-01-12T07:16:25-05:00 Fix the OS string encoding for GNU/Hurd Following https://github.com/haskell/cabal/pull/9434/files , and as seen in the various gnu_HOST_OS usages in the source code, it is expected that GNU/Hurd is advertised as "gnu", like the autotools do. - - - - - 1db2f240 by Andrew Lelechenko at 2026-01-12T07:17:06-05:00 Add since annotation for Data.Bifoldable1 Fixes #26432 - - - - - e038a383 by Sven Tennie at 2026-01-12T07:17:49-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - b6731ff9 by Cheng Shao at 2026-01-12T13:43:21+01:00 rts: fix typo in TICK_ALLOC_RTS This patch fixes a typo in the `TICK_ALLOC_RTS` macro, the original `bytes` argument was silently dropped. The Cmm code has its own version of `TICK_ALLOC_RTS` not affected by this typo, it affected the C RTS, and went unnoticed because the variable `n` happened to also be available at its call site. But the number was incorrect. Also fixes its call site since `WDS()` is not available in C. - - - - - c7d17058 by Cheng Shao at 2026-01-12T13:43:44+01:00 rts: remove broken & unused ALLOC_P_TICKY This patch removes the `ALLOC_P_TICKY` macro from the rts, it's unused, and its expanded code is already broken. - - - - - 7 changed files: - .gitignore - libraries/base/src/Data/Bifoldable1.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-platform/src/GHC/Platform/ArchOS.hs - rts/include/Cmm.h - rts/include/stg/Ticky.h - rts/sm/Storage.c Changes: ===================================== .gitignore ===================================== @@ -256,3 +256,12 @@ ghc.nix/ # clangd .clangd dist-newstyle/ + +# ----------------------------------------------------------------------------- +# CI + +# Windows CI +toolchain/ +ghc-*/ +inplace/ +tmp/ ===================================== libraries/base/src/Data/Bifoldable1.hs ===================================== @@ -2,6 +2,7 @@ -- Copyright: Edward Kmett, Oleg Grenrus -- License: BSD-3-Clause -- +-- @since 4.18.0.0 {-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE Safe #-} ===================================== libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc ===================================== @@ -51,7 +51,7 @@ import GHC.Internal.Foreign.Ptr import GHC.Internal.Foreign.Storable import GHC.Internal.System.IO.Error (isDoesNotExistError) import GHC.Internal.System.Posix.Internals -#elif defined(linux_HOST_OS) +#elif defined(linux_HOST_OS) || defined(gnu_HOST_OS) import GHC.Internal.Data.Functor import GHC.Internal.Data.List (isSuffixOf) import GHC.Internal.Foreign.C.Types ===================================== libraries/ghc-platform/src/GHC/Platform/ArchOS.hs ===================================== @@ -156,7 +156,7 @@ stringEncodeOS = \case OSHaiku -> "haiku" OSQNXNTO -> "nto-qnx" OSAIX -> "aix" - OSHurd -> "hurd" + OSHurd -> "gnu" OSWasi -> "wasi" OSGhcjs -> "ghcjs" ===================================== rts/include/Cmm.h ===================================== @@ -441,12 +441,6 @@ #define HP_CHK_P(bytes, fun, arg) \ HEAP_CHECK(bytes, GC_PRIM_P(fun,arg)) -// TODO I'm not seeing where ALLOC_P_TICKY is used; can it be removed? -// -NSF March 2013 -#define ALLOC_P_TICKY(bytes, fun, arg) \ - HP_CHK_P(bytes); \ - TICK_ALLOC_RTS(bytes); - // Load a field out of structure with relaxed ordering. #define RELAXED_LOAD_FIELD(fld, ptr) \ REP_##fld![(ptr) + OFFSET_##fld] ===================================== rts/include/stg/Ticky.h ===================================== @@ -246,7 +246,7 @@ EXTERN StgInt RET_UNBOXED_TUP_hst[TICKY_BIN_COUNT] INIT({0}); TICK_BUMP_BY(ALLOC_THK_gds,g);\ TICK_BUMP_BY(ALLOC_THK_slp,s);\ -#define TICK_ALLOC_RTS(bytes)\ +#define TICK_ALLOC_RTS(n)\ TICK_BUMP(ALLOC_RTS_ctr);\ TICK_BUMP_BY(ALLOC_RTS_tot,n); #endif ===================================== rts/sm/Storage.c ===================================== @@ -990,7 +990,7 @@ move_STACK (StgStack *src, StgStack *dest) void accountAllocation(Capability *cap, W_ n) { - TICK_ALLOC_RTS(WDS(n)); + TICK_ALLOC_RTS(n*sizeof(W_)); CCS_ALLOC(cap->r.rCCCS,n); if (cap->r.rCurrentTSO != NULL) { // cap->r.rCurrentTSO->alloc_limit -= n*sizeof(W_) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4332fbdd248c74164f043c0e5a984a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4332fbdd248c74164f043c0e5a984a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Ignore Windows CI tool directories in Git
by Marge Bot (＠marge-bot) 12 Jan '26

12 Jan '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: e038a383 by Sven Tennie at 2026-01-12T07:17:49-05:00 Ignore Windows CI tool directories in Git Otherwise, we see thousands of changes in `git status` which is very confusing to work with. - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== @@ -256,3 +256,12 @@ ghc.nix/ # clangd .clangd dist-newstyle/ + +# ----------------------------------------------------------------------------- +# CI + +# Windows CI +toolchain/ +ghc-*/ +inplace/ +tmp/ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e038a383a867198c448c712b2d5756d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e038a383a867198c448c712b2d5756d… You're receiving this email because of your account on gitlab.haskell.org.

1 0