- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] 22 commits: compiler: use nubOrd from containers
by Sven Tennie (＠supersven) 05 Jun '26

05 Jun '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 576987d0 by Simon Jakobi at 2026-06-02T04:53:36-04:00 compiler: use nubOrd from containers Address #27103 by replacing GHC.Utils.Misc.ordNub[On] with Data.Containers.ListUtils.nubOrd[On]. Note that nubOrd suffers from a small inefficiency, a fix for which will be included in the next containers release: https://github.com/haskell/containers/issues/1202 - - - - - deea53c3 by David Eichmann at 2026-06-02T04:54:22-04:00 Hadrian: disable response files for GHC/Haddock builders on non-Windows This makes debugging build errors easier on non-windows hosts. See issue #27230 - - - - - f2f5c6ba by Nikita Efremov at 2026-06-02T16:04:54+00:00 fix typo : compete with performance, not complete - - - - - 5524ea0e by Wolfgang Jeltsch at 2026-06-03T08:01:26-04:00 Make the current `base` buildable with GHC 9.14 This comprises the following changes: * Disable some imports into `GHC.Base` for GHC 9.14 * Disable some imports into `Prelude` for GHC 9.14 * Disable separate `ArrowLoop` import for GHC 9.14 * Disable `GHC.Internal.STM` import for GHC 9.14 * Disable `GHC.Internal.Unicode.Version` import for GHC 9.14 * Disable `GHC.Internal.TH.Monad` import for GHC 9.14 * Add alternative `fixIO` import for GHC 9.14 * Add alternative `unsafeCodeCoerce` import for GHC 9.14 * Disable hiding of imported SIMD operations for GHC 9.14 * Disable use of GHC 9.14’s `printToHandleFinalizerExceptionHandler` * Enable use of `getFileHash` from `ghc-internal` for GHC 9.14 * Make `thenA` available for GHC 9.14 * Make `thenM` available for GHC 9.14 * Disable translation of `IoManagerFlagPoll` for GHC 9.14 * Add `hGetNewlineMode` for GHC 9.14 - - - - - d3438055 by Enrico Maria De Angelis at 2026-06-03T08:02:17-04:00 Fix #27067 - Clarify haddocks on `minusNaturalMaybe` - - - - - f9bcfac2 by sheaf at 2026-06-03T14:47:19-04:00 Avoid mkTick in Core Prep breaking ANF As discovered in #27182, mkTick can break ANF. This patch introduces a variant of mkTick that skips the single optimisation that could break ANF. This is preferrable over switching to the raw Tick constructor, as the latter may introduce spurious cost centres in profiling reports. This is a temporary measure until we more thoroughly refactor how mkTick works (see #27141). See Note [mkTick breaks ANF] in GHC.CoreToStg.Prep. Fixes #27182 - - - - - cf1fd661 by Artem Pelenitsyn at 2026-06-03T14:48:09-04:00 clarify comment for getSizeofMutableByteArray#: we get the size in bytes, not "elements" - - - - - a3b431f3 by David Eichmann at 2026-06-04T10:10:19+00:00 Hadrian: convert env variable ACLOCAL_PATH to unix paths. Convert ACLOCAL_PATH to a unix style path when invoking autoreconf. Autoreconf doesn't handle windows paths. See Note [Autoreconf unix paths from ACLOCAL_PATH]. Fixes #27311 - - - - - 18f6138a by Simon Jakobi at 2026-06-04T20:20:31-04:00 testsuite: Deduplicate --only test names config.only is assumed to be a set, but supplying --only overwrote it with the (list) argparse result, which can contain duplicates. When a test ran, config.only.remove(name) dropped only the first occurrence, so a duplicated name lingered and was later misreported as a "test not found" framework failure. Store it as a set instead. Fixes #27322 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 419cb385 by Matthew Pickering at 2026-06-05T16:49:55+02:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - 208871d1 by Matthew Pickering at 2026-06-05T16:49:55+02:00 hadrian: Fill in more of the default.host toolchain file When you are building a cross compiler this file will be used to build stage1 and it's libraries, so we need enough information here to work accurately. There is still more work to be done (see for example, word size is still fixed). - - - - - 68b92164 by Matthew Pickering at 2026-06-05T16:49:55+02:00 hadrian: Disable docs when cross compiling Before there were a variety of ad-hoc places where doc building was disabled when cross compiling. * Some CI jobs sets --docs=none in gen_ci.hs * Some CI jobs set --docs=none in .gitlab/ci.sh * There was some logic in hadrian to not need the ["docs"] target when making a bindist. Now the situation is simple: * If you are cross compiling then defaultDocsTargets is empty by default. In theory, there is no reason why we can't build documentation for cross compiler bindists, but this is left to future work to generalise the documentation building rules to allow this (#24289) - - - - - ec898664 by Matthew Pickering at 2026-06-05T14:51:27+00:00 hadrian: Build stage 2 cross compilers * Most of hadrian is abstracted over the stage in order to remove the assumption that the target of all stages is the same platform. This allows the RTS to be built for two different targets for example. * Abstracts the bindist creation logic to allow building either normal or cross bindists. Normal bindists use stage 1 libraries and a stage 2 compiler. Cross bindists use stage 2 libararies and a stage 2 compiler. * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 New hadrian target: * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler = stage 1, libraries = stage 2) This commit also contains various changes to make stage2 compilers feasible. ------------------------- Metric Decrease: ManyAlternatives MultiComponentModulesRecomp MultiLayerModulesRecomp T10421 T12425 T12707 T13035 T13379 T15703 T16577 T18698a T18698b T18923 T1969 T21839c T3294 T4801 T5030 T5321Fun T5642 T783 T9198 T9872d T9961 parsing001 T5321FD T6048 T12227 T18140 T18282 T9233 T5631 T9630 ------------------------- Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> Fix rebase: settings-use-distro-mingw is now staged - - - - - b03369fb by Matthew Pickering at 2026-06-05T14:51:28+00:00 ci: Test cross bindists We remove the special logic for testing in-tree cross compilers and instead test cross compiler bindists, like we do for all other platforms. - - - - - 6220b30c by Matthew Pickering at 2026-06-05T14:51:28+00:00 ci: Introduce CROSS_STAGE variable In preparation for building and testing stage3 bindists we introduce the CROSS_STAGE variable which is used by a CI job to determine what kind of bindist the CI job should produce. At the moment we are only using CROSS_STAGE=2 but in the future we will have some jobs which set CROSS_STAGE=3 to produce native bindists for a target, but produced by a cross compiler, which can be tested on by another CI job on the native platform. CROSS_STAGE=2: Build a normal cross compiler bindist CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target - - - - - 748a0360 by Sven Tennie at 2026-06-05T14:51:28+00:00 ghc: Distinguish between having an interpreter and having an internal one Otherwise, we fail with warnings when compiling tools. Actually, these are related but different things: - ghc can run an interpreter (either internal or external) - ghc is compiled with an internal interpreter - - - - - f5f844ac by Sven Tennie at 2026-06-05T14:51:28+00:00 ci: Increase timeout for emulators Test runs with emulators naturally take longer than on native machines. Generate jobs.yml - - - - - fc15695d by Matthew Pickering at 2026-06-05T14:51:28+00:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. - - - - - d011bc28 by Sven Tennie at 2026-06-05T14:51:28+00:00 Javascript skip T23697 See #22355 about how HSC2HS and the Javascript target don't play well together. - - - - - 3a3b0253 by Sven Tennie at 2026-06-05T14:51:28+00:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - a0c041e7 by Sven Tennie at 2026-06-05T14:51:28+00:00 Fix T22744 for GHCJS In fact, this test needs Template Haskell, not necessarily an interpreter. - - - - - 4f6d1ee1 by Sven Tennie at 2026-06-05T17:05:43+02:00 Add changelog entrie - - - - - 105 changed files: - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - boot - + changelog.d/T27182.md - + changelog.d/stage2-cross-compilers - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Misc.hs - configure.ac - distrib/configure.ac.in - docs/users_guide/javascript.rst - ghc/GHCi/UI.hs - hadrian/README.md - hadrian/bindist/config.mk.in - hadrian/cfg/default.host.target.in - + hadrian/cfg/system.config.host.in - hadrian/cfg/system.config.in - + hadrian/cfg/system.config.target.in - hadrian/hadrian.cabal - hadrian/src/Base.hs - + hadrian/src/BindistConfig.hs - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Expression.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Hadrian/Oracles/Path.hs - hadrian/src/Hadrian/Oracles/TextFile.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Flavour.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Changelog.hs - hadrian/src/Rules/Compile.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/Configure.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Validate.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - hadrian/src/Settings/Warnings.hs - libraries/base/src/Control/Applicative.hs - libraries/base/src/Control/Arrow.hs - libraries/base/src/Control/Monad.hs - libraries/base/src/Data/Array/Byte.hs - libraries/base/src/Data/Fixed.hs - libraries/base/src/GHC/Base.hs - libraries/base/src/GHC/Conc.hs - libraries/base/src/GHC/Conc/Sync.hs - libraries/base/src/GHC/Exts.hs - libraries/base/src/GHC/Fingerprint.hs - libraries/base/src/GHC/IO/Handle.hs - libraries/base/src/GHC/RTS/Flags.hs - libraries/base/src/GHC/Unicode.hs - libraries/base/src/GHC/Weak.hs - libraries/base/src/GHC/Weak/Finalize.hs - libraries/base/src/Prelude.hs - libraries/base/src/System/IO.hs - libraries/base/src/System/Mem/Weak.hs - libraries/base/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Natural.hs - m4/fp_find_nm.m4 - m4/prep_target_file.m4 - testsuite/driver/runtests.py - testsuite/ghc-config/ghc-config.hs - testsuite/tests/ghc-e/should_fail/all.T - testsuite/tests/javascript/closure/all.T - testsuite/tests/perf/compiler/all.T - + testsuite/tests/profiling/should_compile/T27182.hs - testsuite/tests/profiling/should_compile/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b7170645641ee26bdfe3569de358ce… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b7170645641ee26bdfe3569de358ce… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] Until finishing breakpoint output
by Wolfgang Jeltsch (＠jeltsch) 05 Jun '26

05 Jun '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: 22e83285 by Wolfgang Jeltsch at 2026-06-05T16:49:08+03:00 Until finishing breakpoint output - - - - - 1 changed file: - compiler/GHC/ByteCode/Show.hs Changes: ===================================== compiler/GHC/ByteCode/Show.hs ===================================== @@ -6,20 +6,25 @@ module GHC.ByteCode.Show (showByteCode) where import Prelude ((+), (-), Integral, div) +import Control.Applicative ((<$>), (<*>)) import Control.Arrow ((>>>)) import Control.Exception (assert) import Data.Eq ((==)) import Data.Bits (FiniteBits, finiteBitSize) -import Data.Function (($), (.)) -import Data.Tuple (uncurry) -import Data.Bool (Bool, otherwise, not) +import Data.Function (($), id, (.)) +import Data.Tuple (fst, snd, uncurry) +import Data.Bool (Bool, otherwise, not, (&&)) import Data.Int (Int) import Data.Word (Word, Word16) import Data.Maybe (Maybe, maybe) +import Data.Either (Either, either) import Data.List (length, (++), map, zipWith, take, drop, replicate) import Data.String (String) import Data.ByteString (ByteString, unpack) -import Data.Array.IArray (IArray, elems) +import Data.ByteString.Short (ShortByteString) +import Data.IntMap (IntMap) +import Data.IntMap qualified as IntMap (toList) +import Data.Array.IArray (IArray, bounds, indices, elems) import Data.Array.Unboxed (UArray) import Numeric (showHex) import Text.Show (show) @@ -30,9 +35,13 @@ import GHC.Data.FlatBag (FlatBag, elemsFlatBag) import GHC.Fingerprint (Fingerprint) import GHC.Types.SrcLoc (noSrcSpan) import GHC.Types.Name (Name) +import GHC.Types.Name.Occurrence (OccName) +import GHC.Types.Tickish (BreakTickIndex, BreakpointId (..)) import GHC.Types.SptEntry (SptEntry) import GHC.Types.Error (MessageClass (MCDump)) import GHC.Utils.Logger (Logger, logMsg) +import GHC.Utils.Binary (BinSrcSpan (..)) +import GHC.Utils.Encoding.UTF8 (utf8DecodeShortByteString) import GHC.Utils.Outputable ( defaultDumpStyle, @@ -47,6 +56,8 @@ import GHC.Utils.Outputable ppr ) import GHC.Unit.Types (Module) +import GHC.Iface.Type (IfaceType, IfaceTvBndr, IfaceIdBndr) +import GHC.HsToCore.Breakpoints (ModBreaks (..)) import GHC.ByteCode.Types ( FFIInfo (..), @@ -56,7 +67,13 @@ import GHC.ByteCode.Types ByteCodeHpcInfo, CompiledByteCode (..) ) -import GHC.ByteCode.Breakpoints (InternalBreakpointId (..), InternalModBreaks) +import GHC.ByteCode.Breakpoints + ( + InternalBreakpointId (..), + InternalBreakLoc (..), + CgBreakInfo (..), + InternalModBreaks (..) + ) import GHC.ByteCode.Binary (OnDiskModuleByteCode (..)) import GHC.ByteCode.Serialize (readOnDiskModuleByteCode) import GHC.Driver.Env.Types (HscEnv) @@ -95,7 +112,7 @@ pprCompiledByteCode currentModule CompiledByteCode {..} pprByteCodeObjects currentModule $ bc_bcos, pprDataConstructorInfoTables $ bc_itbls, pprTopLevelStrings $ bc_strs, - pprBreakpoints $ bc_breaks, + pprBreakpoints currentModule $ bc_breaks, pprStaticPointerTableEntries $ bc_spt_entries, pprHPCInfo $ bc_hpc_info ] @@ -178,7 +195,8 @@ pprLiteral currentModule literal = case literal of BCONPtrFFIInfo ffiInfo -> text "foreign function" <+> pprFFIInfo ffiInfo BCONPtrCostCentre breakpointID - -> text "cost center" <+> pprBreakpointID currentModule breakpointID + -> text "cost center" <+> + pprInternalBreakpointID currentModule breakpointID -- | […] pprFFIInfo :: FFIInfo -> SDoc @@ -194,8 +212,8 @@ pprFFIType ffiType = assert (take 3 ident == "FFI") $ text (drop 3 ident) where ident = show ffiType -- | […] -pprBreakpointID :: Module -> InternalBreakpointId -> SDoc -pprBreakpointID currentModule InternalBreakpointId {..} +pprInternalBreakpointID :: Module -> InternalBreakpointId -> SDoc +pprInternalBreakpointID currentModule InternalBreakpointId {..} | ibi_info_mod == currentModule = indexDoc | otherwise = indexDoc <+> text "in" <+> @@ -228,19 +246,19 @@ pprPointer currentModule pointer = case pointer of pprDataConstructorInfoTables :: [(Name, ConInfoTable)] -> SDoc pprDataConstructorInfoTables = entry (text "data constructor info tables:") . vcatOrNone . - map (uncurry pprDataConstructorInfoTableOf) + map (uncurry pprDataConstructorInfoTable) -- | […] -pprDataConstructorInfoTableOf :: Name -> ConInfoTable -> SDoc -pprDataConstructorInfoTableOf dataConstrName ConInfoTable {..} +pprDataConstructorInfoTable :: Name -> ConInfoTable -> SDoc +pprDataConstructorInfoTable dataConstrName ConInfoTable {..} = entry (text "info table of" <+> ppr dataConstrName <> text ":") $ vcat [ - pprTablePositioning $ conItblTablesNextToCode, - pprLiteralCount $ conItblNPtrs, - pprPointerCount $ conItblPtrs, - pprConstructorTag $ conItblConTag, - pprPointerTag $ conItblPtrTag, - pprDescription $ conItblDescr + pprTablePositioning $ conItblTablesNextToCode, + pprPointerWordCount $ conItblPtrs, + pprNonPointerWordCount $ conItblNPtrs, + pprConstructorTag $ conItblConTag, + pprPointerTag $ conItblPtrTag, + pprDescription $ conItblDescr ] {-FIXME: Check based on any answers to my message on 4 June 2026, 13:17 EEST whether @@ -252,12 +270,12 @@ pprTablePositioning :: Bool -> SDoc pprTablePositioning = entry (text "tables next to code:") . noOrYes -- | […] -pprLiteralCount :: Int -> SDoc -pprLiteralCount = entry (text "number of literals:") . ppr +pprPointerWordCount :: Int -> SDoc +pprPointerWordCount = entry (text "number of words for pointers:") . ppr -- | […] -pprPointerCount :: Int -> SDoc -pprPointerCount = entry (text "number of pointers:") . ppr +pprNonPointerWordCount :: Int -> SDoc +pprNonPointerWordCount = entry (text "number of words for non-pointers:") . ppr -- | […] pprConstructorTag :: Int -> SDoc @@ -274,17 +292,172 @@ pprDescription = entry (text "description:") . pprByteString -- | […] pprTopLevelStrings :: [(Name, ByteString)] -> SDoc pprTopLevelStrings = entry (text "top-level strings:") . - pprTopLevelStrings + vcatOrNone . + map (uncurry pprTopLevelString) + +-- | […] +pprTopLevelString :: Name -> ByteString -> SDoc +pprTopLevelString stringName encodedString + = entry (text "string" <+> ppr stringName <> text ":") $ + pprByteString encodedString + +-- | […] +pprBreakpoints :: Module -> Maybe InternalModBreaks -> SDoc +pprBreakpoints currentModule + = entry (text "breakpoints:") . + maybe (text "<none>") (pprBreakpointsData currentModule) + +-- | […] +pprBreakpointsData :: Module -> InternalModBreaks -> SDoc +pprBreakpointsData currentModule InternalModBreaks {..} + = vcat [ + pprBreakpointsInSource currentModule $ imodBreaks_modBreaks, + pprBreakpointsInByteCode currentModule $ imodBreaks_breakInfo + ] + +-- | […] +pprBreakpointsInSource :: Module -> ModBreaks -> SDoc +pprBreakpointsInSource currentModule ModBreaks {..} + = entry (text "breakpoints in source:") $ + assert (modBreaks_module == currentModule) $ + assert boundsAreIdentical $ + vcatOrNone $ + pprBreakpointInSource <$> indices modBreaks_locs_ <*> + elems modBreaks_locs_ <*> + elems modBreaks_decls <*> + elems modBreaks_vars <*> + elems modBreaks_ccs + where + + boundsAreIdentical :: Bool + boundsAreIdentical = bounds modBreaks_locs_ == bounds modBreaks_decls && + bounds modBreaks_locs_ == bounds modBreaks_vars && + bounds modBreaks_locs_ == bounds modBreaks_ccs -- | […] -pprBreakpoints :: Maybe InternalModBreaks -> SDoc -pprBreakpoints = entry (text "breakpoints:") . - maybe (text "<none>") pprBreakpointsData +pprBreakpointInSource :: BreakTickIndex + -> BinSrcSpan + -> [String] + -> [OccName] + -> (ShortByteString, ShortByteString) + -> SDoc +pprBreakpointInSource ix srcSpan declarationPath freeVars costCenterInfo + = entry (text "breakpoint" <+> ppr ix <> text ":") $ + vcat [ + pprSrcSpan $ srcSpan, + pprDeclarationPath $ declarationPath, + pprFreeVariables $ freeVars, + pprCostCenterPath $ costCenterPath, + pprCostCenterLocation $ costCenterLocation + ] + where + + costCenterPath :: String + costCenterPath = utf8DecodeShortByteString (fst costCenterInfo) + + costCenterLocation :: String + costCenterLocation = utf8DecodeShortByteString (snd costCenterInfo) + + -- The structure of the cost center information is apparent from the + -- implementation of 'GHC.HsToCore.Breakpoints.mkModBreaks'. -- | […] -pprBreakpointsData :: InternalModBreaks -> SDoc -pprBreakpointsData = pprBreakpointsData ---FIXME: Either render the module also, or document why this is not necessary. +pprSrcSpan :: BinSrcSpan -> SDoc +pprSrcSpan = entry (text "source span:") . ppr . unBinSrcSpan + +-- | […] +pprDeclarationPath :: [String] -> SDoc +pprDeclarationPath = entry (text "declaration path:") . vcat . map text + +-- | […] +pprFreeVariables :: [OccName] -> SDoc +pprFreeVariables = entry (text "free variables:") . hsep . map ppr + +-- | […] +pprCostCenterPath :: String -> SDoc +pprCostCenterPath = entry (text "cost center path:") . text + +-- | […] +pprCostCenterLocation :: String -> SDoc +pprCostCenterLocation = entry (text "cost center location:") . text + +-- | […] +pprBreakpointsInByteCode :: Module -> IntMap CgBreakInfo -> SDoc +pprBreakpointsInByteCode currentModule + = entry (text "breakpoints in bytecode:") . + vcatOrNone . + map (uncurry (pprBreakpointInByteCode currentModule)) . + IntMap.toList + +-- | […] +pprBreakpointInByteCode :: Module -> Int -> CgBreakInfo -> SDoc +pprBreakpointInByteCode currentModule ix CgBreakInfo {..} + = entry (text "breakpoint" <+> ppr ix <> text ":") $ + vcat [ + pprType $ cgb_resty, + pprTypeVariables $ cgb_tyvars, + pprVariables $ cgb_vars, + pprOrigin currentModule $ cgb_tick_id + ] + -- That the 'cgb_resty' field holds the type of the breakpoint is apparent + -- from the fact that this field is set by + -- 'GHC.StgToByteCode.dehydrateCgBreakInfo' using one of its arguments and + -- 'dehydrateCgBreakInfo' is always invoked with this argument set to the + -- extension field of 'Breakpoint', which in turn holds the type of the + -- breakpoint, according to Note [Tickish passes] and the comment on the + -- instance declaration of @XBreakpoint 'TickishPassStg@. + +pprType :: IfaceType -> SDoc +pprType = entry (text "type:") . ppr + +-- | […] +pprTypeVariables :: [IfaceTvBndr] -> SDoc +pprTypeVariables = entry (text "type variables:") . + vcat . + map pprTypeVariableBinder + +-- | […] +pprTypeVariableBinder :: IfaceTvBndr -> SDoc +pprTypeVariableBinder (name, kind) = ppr name <+> text "::" <+> ppr kind + +-- | […] +pprVariables :: [Maybe (IfaceIdBndr, Word)] -> SDoc +pprVariables = entry (text "variables:") . + vcat . + map pprVariable + +-- | […] +pprVariable :: Maybe (IfaceIdBndr, Word) -> SDoc +pprVariable = maybe (text "<unknown>") (uncurry pprKnown) where + + pprKnown :: IfaceIdBndr -> Word -> SDoc + pprKnown binder offset = pprVariableBinder binder <+> + text "@" <+> + pprFixedSizeNatural offset + -- That the second argument is an offset is apparent from the use of the + -- identifier @offset@ in the implementation of + -- 'GHC.StgToByteCode.dehydrateCgBreakInfo'. + +-- | […] +pprVariableBinder :: IfaceIdBndr -> SDoc +pprVariableBinder (multiplicity, name, type_) + = text "%" <> ppr multiplicity <+> + ppr name <+> text "::" <+> ppr type_ + +pprOrigin :: Module -> Either InternalBreakLoc BreakpointId -> SDoc +pprOrigin currentModule = entry (text "origin:") . + pprBreakpointID currentModule . + either internalBreakLoc id + +-- | […] [analogous to 'pprInternalBreakpointID' but the meanging of the index is different] +pprBreakpointID :: Module -> BreakpointId -> SDoc +pprBreakpointID currentModule BreakpointId {..} + | bi_tick_mod == currentModule = indexDoc + | otherwise = indexDoc <+> text "in" <+> ppr bi_tick_mod + where + + indexDoc :: SDoc + indexDoc = ppr bi_tick_index -- | […] pprStaticPointerTableEntries :: [SptEntry] -> SDoc @@ -304,11 +477,12 @@ pprHPCInfoData = pprHPCInfoData pprObjectFileContents :: [ByteString] -> SDoc pprObjectFileContents = entry (text "contents of object files:") . vcatOrNone . - zipWith pprContentOfObjectFile [0 ..] + zipWith pprObjectFileContent [0 ..] -pprContentOfObjectFile :: Int -> ByteString -> SDoc -pprContentOfObjectFile ix = entry (text "file" <+> ppr ix <> text ":") . - pprByteString +-- | […] +pprObjectFileContent :: Int -> ByteString -> SDoc +pprObjectFileContent ix = entry (text "file" <+> ppr ix <> text ":") . + pprByteString -- | […] pprByteString :: ByteString -> SDoc View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/22e832854630e3d6c65f76f45ac4ace… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/22e832854630e3d6c65f76f45ac4ace… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T27296-stable-simpl] Add -dstable-core-dump-order for stable Core dump ordering (#27296)
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T27296-stable-simpl at Glasgow Haskell Compiler / GHC Commits: 69b3d03a by Simon Jakobi at 2026-06-05T13:56:09+02:00 Add -dstable-core-dump-order for stable Core dump ordering (#27296) The order of top-level bindings in Core dumps (-ddump-simpl etc.) is the compiler's internal processing order, which is sensitive to Uniques. Uniques can shift whenever an unrelated upstream module changes, so the bindings get re-ordered and a textual diff of two dumps fails to line up the real changes. This adds an opt-in flag -dstable-core-dump-order that reorders the top-level bindings of Core dumps routed through dumpPassResult into a stable, unique-independent order: by source location, then a $-rank so a derived $w/$s binder sorts before its origin (mirroring GHC's default dependency order, where the wrapper calls the worker), then the OccName. Workers and specialisations inherit their origin's source span, so they cluster next to the binding they come from; anonymous floats (noSrcSpan) sort to the end; Rec groups are kept intact. The default order is retained as it is useful when debugging the compiler itself. The flag is unique-independent, so it improves diffability with or without -dsuppress-uniques. See Note [Stable Core dump order] in GHC.Core.Ppr. Adds test T27296, a small Data.Map-style module whose binders GHC emits in a non-source order by default, asserting they come out stably ordered under the flag. Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 12 changed files: - + changelog.d/stable-core-dump-order-27296 - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Utils/Outputable.hs - docs/users_guide/debugging.rst - testsuite/tests/simplCore/should_compile/Makefile - + testsuite/tests/simplCore/should_compile/T27296.hs - + testsuite/tests/simplCore/should_compile/T27296.stdout - testsuite/tests/simplCore/should_compile/all.T Changes: ===================================== changelog.d/stable-core-dump-order-27296 ===================================== @@ -0,0 +1,4 @@ +section: compiler +synopsis: Add :ghc-flag:`-dstable-core-dump-order` to print top-level Core bindings in a stable, source-location-based order that does not depend on uniques, making Core dumps easier to diff. +issues: #27296 +mrs: !16143 ===================================== compiler/GHC/Core/Lint.hs ===================================== @@ -327,12 +327,17 @@ dumpPassResult logger dump_core_sizes name_ppr_ctx mb_flag hdr extra_info binds where size_doc = sep [text "Result size of" <+> text hdr, nest 2 (equals <+> ppr (coreBindsStats binds))] + -- See Note [Stable Core dump order] in GHC.Core.Ppr + binds' | sdocStableCoreDumpOrder (log_default_dump_context (logFlags logger)) + = sortCoreBindingsForDump binds + | otherwise = binds + dump_doc = vcat [ nest 2 extra_info , size_doc , blankLine , if dump_core_sizes - then pprCoreBindingsWithSize binds - else pprCoreBindings binds + then pprCoreBindingsWithSize binds' + else pprCoreBindings binds' , ppUnless (null rules) pp_rules ] pp_rules = vcat [ blankLine , text "------ Local rules for imported ids --------" ===================================== compiler/GHC/Core/Ppr.hs ===================================== @@ -19,6 +19,7 @@ module GHC.Core.Ppr ( pprCoreExpr, pprParendExpr, pprCoreBinding, pprCoreBindings, pprCoreAlt, pprCoreBindingWithSize, pprCoreBindingsWithSize, + sortCoreBindingsForDump, pprCoreBinder, pprCoreBinders, pprId, pprIds, pprRule, pprRules, pprOptCo, pprOcc, pprOccWithTick @@ -30,7 +31,7 @@ import GHC.Core import GHC.Core.Stats (exprStats) import GHC.Types.Fixity (LexicalFixity(..)) import GHC.Types.Literal( pprLiteral ) -import GHC.Types.Name( pprInfixName, pprPrefixName ) +import GHC.Types.Name( pprInfixName, pprPrefixName, getOccString, getSrcSpan ) import GHC.Types.Var import GHC.Types.Id import GHC.Types.Id.Info @@ -44,9 +45,13 @@ import GHC.Core.Coercion import GHC.Types.Basic import GHC.Utils.Misc import GHC.Utils.Outputable -import GHC.Types.SrcLoc ( pprUserRealSpan ) +import GHC.Utils.Panic (panic) +import GHC.Types.SrcLoc ( SrcSpan(..), srcSpanStartLine, srcSpanStartCol + , pprUserRealSpan ) import GHC.Types.Tickish +import Data.List ( sortOn ) + {- ************************************************************************ * * @@ -71,6 +76,70 @@ pprCoreBindingWithSize :: CoreBind -> SDoc pprCoreBindingsWithSize = pprTopBinds sizeAnn pprCoreBindingWithSize = pprTopBind sizeAnn +{- Note [Stable Core dump order] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The order of top-level bindings in a Core dump (-ddump-simpl etc.) is the +compiler's internal processing order, which is sensitive to Uniques. Uniques +can shift whenever an unrelated upstream module changes, so the bindings get +re-ordered and a textual diff of two dumps fails to line up the real changes +(#27296). + +With -dstable-core-dump-order we reorder the top-level bindings at dump time into +a stable, diffable order. 'sortCoreBindingsForDump' sorts by a key that is +*independent of Uniques* (so the output is diffable even without +-dsuppress-uniques): + + 1. the binder's source span (real spans in source order; noSrcSpan last). + Workers and specialisations inherit their origin's source span (see + 'mkWorkerId' and 'newSpecIdSM'), so they cluster next to the binding they + come from. + 2. a "$-rank" so that within one source span the compiler-derived binders sort + *before* the origin they come from (e.g. @$wfoo@ before @foo@), mirroring + GHC's default dependency order (the wrapper calls the worker, so the worker + comes first; specialisations likewise precede their origin). We rank by + whether the OccName *contains* a '$', which marks a derived binder: a worker + is @$wfoo@, but a call-site specialisation is tidied to @bar_$sfoo@ (no + leading '$'), so a leading-'$' test would miss it. + 3. the OccName string, as a final lexical, deterministic tie-break. + +Recursive groups are never split: a 'Rec' is one 'CoreBind', placed as a unit by +its earliest-source member, with its members sorted by the same key. + +-dstable-core-dump-order is opt-in; the default order is retained because it is +useful for debugging the compiler itself. +-} + +-- | Reorder a 'CoreProgram' into a stable, source-location-driven order for +-- dumping. See Note [Stable Core dump order]. Used by 'dumpPassResult' when +-- -dstable-core-dump-order is enabled. +sortCoreBindingsForDump :: CoreProgram -> CoreProgram +sortCoreBindingsForDump = sortOn bindKey . map sortRecMembers + where + sortRecMembers (Rec prs) = Rec (sortOn (bndrKey . fst) prs) + sortRecMembers b = b + + -- 'sortRecMembers' runs first, so a 'Rec' is already sorted by 'bndrKey' + -- when 'bindKey' sees it; its first member is therefore the minimum key. + bindKey :: CoreBind -> (Int, Int, Int, Int, String) + bindKey (NonRec b _) = bndrKey b + bindKey (Rec ((b,_):_)) = bndrKey b + bindKey (Rec []) = panic "sortCoreBindingsForDump: empty Rec" + + bndrKey :: CoreBndr -> (Int, Int, Int, Int, String) + bndrKey b = (bucket, line, col, dollar_rank, s) + where + s = getOccString b + (bucket, line, col) = case getSrcSpan b of + RealSrcSpan rs _ -> (0, srcSpanStartLine rs, srcSpanStartCol rs) + _ -> (1, 0, 0) -- noSrcSpan: sort last + -- A '$' anywhere in a tidied top-level OccName marks a compiler-derived + -- binder ($wfoo, but also call-site specialisations tidied to + -- bar_$sfoo); rank those before their origin within a shared source span, + -- mirroring GHC's default dependency order (the wrapper calls the worker, + -- so the worker comes first). + dollar_rank | '$' `elem` s = 0 + | otherwise = 1 + instance OutputableBndr b => Outputable (Bind b) where ppr bind = ppr_bind noAnn bind ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -1594,6 +1594,7 @@ initSDocContext dflags style = SDC , sdocSuppressModulePrefixes = gopt Opt_SuppressModulePrefixes dflags , sdocSuppressStgExts = gopt Opt_SuppressStgExts dflags , sdocSuppressStgReps = gopt Opt_SuppressStgReps dflags + , sdocStableCoreDumpOrder = gopt Opt_StableCoreDumpOrder dflags , sdocErrorSpans = gopt Opt_ErrorSpans dflags , sdocStarIsType = xopt LangExt.StarIsType dflags , sdocLinearTypes = xopt LangExt.LinearTypes dflags ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -859,6 +859,10 @@ data GeneralFlag | Opt_SuppressTimestamps -- ^ Suppress timestamps in dumps | Opt_SuppressCoreSizes -- ^ Suppress per binding Core size stats in dumps + -- | Reorder top-level bindings in Core dumps into a stable, diffable order. + -- See Note [Stable Core dump order] in GHC.Core.Ppr. + | Opt_StableCoreDumpOrder + -- Error message suppression | Opt_ShowErrorContext ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -2468,6 +2468,7 @@ dFlagsDeps = [ flagSpec "ppr-case-as-let" Opt_PprCaseAsLet, depFlagSpec' "ppr-ticks" Opt_PprShowTicks (\turn_on -> useInstead "-d" "suppress-ticks" (not turn_on)), + flagSpec "stable-core-dump-order" Opt_StableCoreDumpOrder, flagSpec "suppress-ticks" Opt_SuppressTicks, depFlagSpec' "suppress-stg-free-vars" Opt_SuppressStgExts (useInstead "-d" "suppress-stg-exts"), ===================================== compiler/GHC/Utils/Outputable.hs ===================================== @@ -422,6 +422,7 @@ data SDocContext = SDC , sdocSuppressModulePrefixes :: !Bool , sdocSuppressStgExts :: !Bool , sdocSuppressStgReps :: !Bool + , sdocStableCoreDumpOrder :: !Bool , sdocErrorSpans :: !Bool , sdocStarIsType :: !Bool , sdocLinearTypes :: !Bool @@ -490,6 +491,7 @@ defaultSDocContext = SDC , sdocSuppressModulePrefixes = False , sdocSuppressStgExts = False , sdocSuppressStgReps = True + , sdocStableCoreDumpOrder = False , sdocErrorSpans = False , sdocStarIsType = False , sdocLinearTypes = False ===================================== docs/users_guide/debugging.rst ===================================== @@ -959,6 +959,33 @@ parts that you are not interested in. has shown you where to look, you can try again without :ghc-flag:`-dsuppress-uniques` +.. ghc-flag:: -dstable-core-dump-order + :shortdesc: Reorder top-level bindings in Core dumps into a stable, + diffable order + :type: dynamic + :reverse: -dno-stable-core-dump-order + :category: verbosity + + :since: FIXME + + Normally the order of top-level bindings in a Core dump (such as the + output of :ghc-flag:`-ddump-simpl`) reflects the compiler's internal + processing order, which depends on ``Unique`` values. Those uniques can + shift whenever an unrelated upstream module changes, so the bindings get + re-ordered and a textual ``diff`` of two dumps fails to line up the real + changes. + + This flag is opt-in and reorders the top-level bindings of Core dumps that + go through the pass-result printer (e.g. :ghc-flag:`-ddump-simpl`, + :ghc-flag:`-ddump-prep`, :ghc-flag:`-ddump-ds`, + :ghc-flag:`-ddump-simpl-iterations`) into a stable, source-location-driven + order that does not depend on uniques. + + It is intended to be combined with :ghc-flag:`-dsuppress-uniques` when + diffing two dumps, but because the ordering does not depend on uniques the + output is also more diffable without it. The default (in-compiler) order is + retained because it is useful when debugging the compiler itself. + .. ghc-flag:: -dsuppress-idinfo :shortdesc: Suppress extended information about identifiers where they are bound ===================================== testsuite/tests/simplCore/should_compile/Makefile ===================================== @@ -298,3 +298,15 @@ T17901: $(RM) -f T17901.o T17901.hi '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques T17901.hs | grep 'wombat' # All three functions should get their case alternatives combined + +# T27296: check -dstable-core-dump-order on a small Data.Map-style module. The +# sed allow-list prints, deduplicated, the top-level binders we care about in +# dump order. It inspects names only, so it is insensitive to unrelated +# Core-format churn. +T27296: + $(RM) -f T27296.o T27296.hi + '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques \ + -dsuppress-idinfo -dsuppress-module-prefixes -dno-typeable-binds \ + -dstable-core-dump-order T27296.hs 2> /dev/null \ + | sed -nE 's/^(\$$fEqKey|\$$fOrdKey|\$$fOrdKey_\$$ccompare|size|lookupG|member|findI|insertG|insertManyI|insertTwoI|weight|balance|ratios|fromAscI|\$$wweight|findI_\$$slookupG|fromAscI_\$$sinsertG|lvl)( .*)?$$/\1/p' \ + | uniq ===================================== testsuite/tests/simplCore/should_compile/T27296.hs ===================================== @@ -0,0 +1,77 @@ +{-# LANGUAGE BangPatterns #-} + +-- See #27296 and Note [Stable Core dump order] in GHC.Core.Ppr. +-- +-- A small Data.Map-style module exercising the trickier parts of the stable +-- dump ordering: under -O it produces specialisations ($slookupG, $sinsertG), +-- a worker ($wweight), a floated lvl, and derived Eq/Ord instances for a custom +-- Key type, alongside the user functions. The source order is deliberately +-- neither alphabetical nor the default dump order (insertG forward-references +-- balance), so the test pins source-position ordering specifically. +module T27296 + ( Key(..), size, lookupG, member, findI, insertG, insertManyI, insertTwoI + , weight, balance, ratios, fromAscI ) + where + +-- A custom key with a derived Ord instance: the derived $fEqKey/$fOrdKey +-- binders inherit this declaration's source span, so they cluster here. +data Key = Key Int deriving (Eq, Ord) + +data Map k a = Tip | Bin !Int k a !(Map k a) !(Map k a) + +data Sizes = Sizes !Int !Int + +size :: Map k a -> Int +size Tip = 0 +size (Bin sz _ _ _ _) = sz + +lookupG :: Ord k => k -> Map k a -> Maybe a +lookupG _ Tip = Nothing +lookupG k (Bin _ kx x l r) = case compare k kx of + LT -> lookupG k l + GT -> lookupG k r + EQ -> Just x +{-# SPECIALISE lookupG :: Key -> Map Key a -> Maybe a #-} + +member :: Key -> Map Key a -> Bool +member k m = case lookupG k m of + Nothing -> False + Just _ -> True + +findI :: Key -> Map Key a -> a -> a +findI k m def = case lookupG k m of + Nothing -> def + Just v -> v + +-- insertG references 'balance', which is defined further down (forward ref). +insertG :: Ord k => k -> a -> Map k a -> Map k a +insertG k x Tip = Bin 1 k x Tip Tip +insertG k x (Bin sz kx kv l r) = case compare k kx of + LT -> balance kx kv (insertG k x l) r + GT -> balance kx kv l (insertG k x r) + EQ -> Bin sz k x l r +{-# SPECIALISE insertG :: Key -> a -> Map Key a -> Map Key a #-} + +insertManyI :: [(Key, a)] -> Map Key a -> Map Key a +insertManyI xs m0 = foldr (\(k, x) m -> insertG k x m) m0 xs + +insertTwoI :: Key -> Key -> a -> Map Key a +insertTwoI k1 k2 x = insertG k1 x (insertG k2 x Tip) + +-- weight unboxes the strict fields of Sizes -> worker/wrapper $wweight. +weight :: Sizes -> Int +weight (Sizes a b) = a * a + 3 * b * b + a * b + 1 + +balance :: k -> a -> Map k a -> Map k a -> Map k a +balance k x l r = Bin (weight (Sizes sl sr)) k x l r + where + sl = size l + sr = size r + +-- baseRatios is a closed constant under a lambda -> floated to a top-level lvl. +ratios :: Int -> [Int] +ratios n = map (n +) baseRatios + where baseRatios = [2, 3, 5, 7, 11, 13] + +fromAscI :: [(Key, a)] -> Map Key a +fromAscI = foldr (\(k, x) m -> insertG k x m) Tip ===================================== testsuite/tests/simplCore/should_compile/T27296.stdout ===================================== @@ -0,0 +1,18 @@ +$fEqKey +$fOrdKey +$fOrdKey_$ccompare +size +findI_$slookupG +lookupG +member +findI +fromAscI_$sinsertG +insertG +insertManyI +insertTwoI +$wweight +weight +balance +ratios +fromAscI +lvl ===================================== testsuite/tests/simplCore/should_compile/all.T ===================================== @@ -602,3 +602,4 @@ test('T25718b', normal, compile, ['-O -ddump-simpl -dsuppress-uniques -dsuppress test('T25718c', normal, compile, ['-O -ddump-simpl -dsuppress-uniques -dsuppress-all -dno-typeable-binds']) test('T19166', normal, compile, ['-O -ddump-simpl -dsuppress-uniques -dsuppress-all -dno-typeable-binds']) test('T27261', [extra_files(['T27261_aux.hs'])], multimod_compile, ['T27261', '-v0 -O']) +test('T27296', [], makefile_test, ['T27296']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/69b3d03abc04b5da1faa864059b58da… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/69b3d03abc04b5da1faa864059b58da… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sjakobi/T27296-stable-simpl
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed new branch wip/sjakobi/T27296-stable-simpl at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sjakobi/T27296-stable-simpl You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/hsctxt-data-instance
by sheaf (＠sheaf) 05 Jun '26

05 Jun '26

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

1 0

[Git][ghc/ghc][wip/sjakobi/multi-caret] Read related spans from the message class in decorateDiagnostic
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/multi-caret at Glasgow Haskell Compiler / GHC Commits: 3f4a9632 by Simon Jakobi at 2026-06-05T12:35:40+02:00 Read related spans from the message class in decorateDiagnostic The related locations are already carried by the MCDiagnostic message class, so decorateDiagnostic can take them from there rather than via a separate parameter. This removes the redundant argument at the call sites and makes the message class the single source of truth for the related spans. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 2 changed files: - compiler/GHC/Driver/Errors.hs - compiler/GHC/Utils/Logger.hs Changes: ===================================== compiler/GHC/Driver/Errors.hs ===================================== @@ -47,7 +47,7 @@ printMessages logger msg_opts opts = mapM_ (printMessage logger msg_opts opts) . printMessage :: forall a. (Diagnostic a) => Logger -> DiagnosticOpts a -> DiagOpts -> MsgEnvelope a -> IO () printMessage logger msg_opts opts message | log_diags_as_json = do - decorated <- decorateDiagnostic logflags messageClass location relatedSpans doc + decorated <- decorateDiagnostic logflags messageClass location doc let rendered :: String rendered = renderWithContext (log_default_user_context logflags) decorated ===================================== compiler/GHC/Utils/Logger.hs ===================================== @@ -424,8 +424,8 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg MCInfo -> printErrs msg MCFatal -> printErrs msg MCDiagnostic SevIgnore _ _ _ -> pure () -- suppress the message - MCDiagnostic _sev _rea _code relatedSpans -> - decorateDiagnostic logflags msg_class srcSpan relatedSpans msg >>= printErrs + MCDiagnostic{} -> + decorateDiagnostic logflags msg_class srcSpan msg >>= printErrs where printOut = defaultLogActionHPrintDoc logflags False out printErrs = defaultLogActionHPrintDoc logflags False err @@ -465,13 +465,19 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg -- `defaultLogActionWithHandles`) -- -- This story is tracked by #24113. -decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> [SrcSpan] -> SDoc -> IO SDoc -decorateDiagnostic logflags msg_class srcSpan relatedSpans msg = addCaret +decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> SDoc -> IO SDoc +decorateDiagnostic logflags msg_class srcSpan msg = addCaret where -- Pretty print the warning flag, if any (#10752) message :: SDoc message = mkLocMessageWarningGroups (log_show_warn_groups logflags) msg_class srcSpan msg + -- The related locations are carried by the 'MCDiagnostic' message class. + relatedSpans :: [SrcSpan] + relatedSpans = case msg_class of + MCDiagnostic _ _ _ spans -> spans + _ -> [] + -- The primary span is always caret'd, with the related spans drawn as -- additional carets. Dedup so the primary isn't drawn twice when it -- also appears among the related spans. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4a96323f7e2826bc5cc4ccad16730… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3f4a96323f7e2826bc5cc4ccad16730… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/multi-caret] Centralize primary/caret span merge in decorateDiagnostic
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/multi-caret at Glasgow Haskell Compiler / GHC Commits: 518b59ad by Simon Jakobi at 2026-06-05T12:13:29+02:00 Centralize primary/caret span merge in decorateDiagnostic Move the nub (srcSpan :| relatedSpans) merge inside decorateDiagnostic so callers pass the bare related spans rather than pre-injecting the primary span. This stops passing the primary span twice at each call site and keeps the source span model in one place. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 2 changed files: - compiler/GHC/Driver/Errors.hs - compiler/GHC/Utils/Logger.hs Changes: ===================================== compiler/GHC/Driver/Errors.hs ===================================== @@ -15,7 +15,6 @@ import GHC.Utils.Json import GHC.Utils.Error import GHC.Utils.Outputable import GHC.Utils.Logger -import Data.List.NonEmpty (NonEmpty(..), nub) reportError :: Logger -> NamePprCtx -> DiagOpts -> SrcSpan -> SDoc -> IO () reportError logger nameContext opts span doc = do @@ -48,7 +47,7 @@ printMessages logger msg_opts opts = mapM_ (printMessage logger msg_opts opts) . printMessage :: forall a. (Diagnostic a) => Logger -> DiagnosticOpts a -> DiagOpts -> MsgEnvelope a -> IO () printMessage logger msg_opts opts message | log_diags_as_json = do - decorated <- decorateDiagnostic logflags messageClass location sourceSpans doc + decorated <- decorateDiagnostic logflags messageClass location relatedSpans doc let rendered :: String rendered = renderWithContext (log_default_user_context logflags) decorated @@ -84,9 +83,6 @@ printMessage logger msg_opts opts message relatedSpans :: [SrcSpan] relatedSpans = diagnosticRelatedLocations diagnostic - sourceSpans :: NonEmpty SrcSpan - sourceSpans = nub (location :| relatedSpans) - severity :: Severity severity = errMsgSeverity message ===================================== compiler/GHC/Utils/Logger.hs ===================================== @@ -425,7 +425,7 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg MCFatal -> printErrs msg MCDiagnostic SevIgnore _ _ _ -> pure () -- suppress the message MCDiagnostic _sev _rea _code relatedSpans -> - decorateDiagnostic logflags msg_class srcSpan (nub (srcSpan :| relatedSpans)) msg >>= printErrs + decorateDiagnostic logflags msg_class srcSpan relatedSpans msg >>= printErrs where printOut = defaultLogActionHPrintDoc logflags False out printErrs = defaultLogActionHPrintDoc logflags False err @@ -465,13 +465,20 @@ defaultLogActionWithHandles out err logflags msg_class srcSpan msg -- `defaultLogActionWithHandles`) -- -- This story is tracked by #24113. -decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> NonEmpty SrcSpan -> SDoc -> IO SDoc -decorateDiagnostic logflags msg_class srcSpan sourceSpans msg = addCaret +decorateDiagnostic :: LogFlags -> MessageClass -> SrcSpan -> [SrcSpan] -> SDoc -> IO SDoc +decorateDiagnostic logflags msg_class srcSpan relatedSpans msg = addCaret where -- Pretty print the warning flag, if any (#10752) message :: SDoc message = mkLocMessageWarningGroups (log_show_warn_groups logflags) msg_class srcSpan msg + -- The primary span is always caret'd, with the related spans drawn as + -- additional carets. Dedup so the primary isn't drawn twice when it + -- also appears among the related spans. + -- See Note [The source span model for diagnostics] in GHC.Types.Error. + sourceSpans :: NonEmpty SrcSpan + sourceSpans = nub (srcSpan :| relatedSpans) + addCaret :: IO SDoc addCaret = do caretDiagnostic <- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/518b59ad457ee71e6d4d5dbbf183d6a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/518b59ad457ee71e6d4d5dbbf183d6a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T26964] Report the module in -fcheck-prim-bounds failures
by Simon Jakobi (＠sjakobi2) 05 Jun '26

05 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T26964 at Glasgow Haskell Compiler / GHC Commits: e35ce402 by Simon Jakobi at 2026-06-05T02:48:49+02:00 Report the module in -fcheck-prim-bounds failures A failing bounds-checked primop now reports the Haskell module being compiled alongside the primop name and access details, e.g. readSmallArray#: array access out of bounds in module Main: index -1 is not within [0, 5). The module string is rendered in StgToCmm from stgToCmmThisModule and passed as an extra argument to the rtsOutOfBoundsAccess and rtsMemcpyRangeOverlap RTS helpers. The DEBUG ASSERT_IN_BOUNDS path in PrimOps.cmm has no user module and passes "<RTS>". Adds a cross-module regression test (T26964Module) asserting the module reported is the one containing the failing primop, not its caller. - - - - - 10 changed files: - compiler/GHC/StgToCmm/Prim.hs - rts/PrimOps.cmm - rts/RtsMessages.c - rts/include/rts/Messages.h - testsuite/tests/codeGen/should_fail/T26964.stderr - + testsuite/tests/codeGen/should_fail/T26964Module.hs - + testsuite/tests/codeGen/should_fail/T26964Module.stderr - + testsuite/tests/codeGen/should_fail/T26964ModuleA.hs - testsuite/tests/codeGen/should_fail/T26964b.stderr - testsuite/tests/codeGen/should_fail/all.T Changes: ===================================== compiler/GHC/StgToCmm/Prim.hs ===================================== @@ -3625,10 +3625,12 @@ emitCheckedMemcpyCall dst src n align = do doCheck platform = do name <- fromMaybe "<unknown primop>" <$> getCurrentPrimOpName nameLbl <- newStringCLit name + modLbl <- getCurrentModuleCLit overlapCheckFailed <- getCode $ emitCCallNeverReturns [] (mkLblExpr mkMemcpyRangeOverlapLabel) - [ (CmmLit nameLbl, AddrHint) ] + [ (CmmLit nameLbl, AddrHint) + , (CmmLit modLbl, AddrHint) ] emit =<< mkCmmIfThen' rangesOverlap overlapCheckFailed (Just False) where rangesOverlap = (checkDiff dst src `or` checkDiff src dst) `ne` zero @@ -3740,11 +3742,20 @@ whenCheckBounds a = do False -> pure () True -> a +-- | Render the module currently being code-generated as a string literal, for +-- use in @-fcheck-prim-bounds@ failure diagnostics. +getCurrentModuleCLit :: FCode CmmLit +getCurrentModuleCLit = do + mod <- getModuleName + ctx <- getContext + newStringCLit (renderWithContext ctx (ppr mod)) + -- | Emit a call to the RTS @rtsOutOfBoundsAccess@ bounds-check failure -- handler, passing the offending index, the number of accessed elements and -- the array size, so that the runtime can produce an informative error -- message. The name of the offending primop is read from the code generator --- environment (see 'withCurrentPrimOpName'). +-- environment (see 'withCurrentPrimOpName'), and the module being compiled is +-- read from the 'StgToCmmConfig'. emitBoundsCheckFailed :: CmmExpr -- ^ accessed index -> CmmExpr -- ^ number of accessed elements -> CmmExpr -- ^ array size (in elements) @@ -3752,12 +3763,14 @@ emitBoundsCheckFailed :: CmmExpr -- ^ accessed index emitBoundsCheckFailed idx count sz = do name <- fromMaybe "<unknown primop>" <$> getCurrentPrimOpName nameLbl <- newStringCLit name + modLbl <- getCurrentModuleCLit emitCCallNeverReturns [] (mkLblExpr mkOutOfBoundsAccessLabel) [ (idx, NoHint) , (count, NoHint) , (sz, NoHint) - , (CmmLit nameLbl, AddrHint) ] + , (CmmLit nameLbl, AddrHint) + , (CmmLit modLbl, AddrHint) ] emitBoundsCheck :: CmmExpr -- ^ accessed index -> CmmExpr -- ^ array size (in elements) ===================================== rts/PrimOps.cmm ===================================== @@ -93,7 +93,7 @@ import CLOSURE ghc_hs_iface; // the index reported here may be in bytes. count is 1 since these checks cover // a single access. #define ASSERT_IN_BOUNDS(op, ind, sz) \ - if (ind >= sz) { ccall rtsOutOfBoundsAccess(ind, 1, sz, op); } + if (ind >= sz) { ccall rtsOutOfBoundsAccess(ind, 1, sz, op, "<RTS>"); } #else #define ASSERT_IN_BOUNDS(op, ind, sz) #endif ===================================== rts/RtsMessages.c ===================================== @@ -352,32 +352,31 @@ rtsBadAlignmentBarf(void) } void -rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op) +rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op, const char *module) { if (count <= 1) { - errorBelch("%s: array access out of bounds:\n" + errorBelch("%s: array access out of bounds in module %s:\n" " index %" FMT_Int " is not within [0, %" FMT_Word ").\n" "This is usually caused by incorrect use of unsafe primops " "in user or library code.", - op, index, size); + op, module, index, size); } else { - errorBelch("%s: array access out of bounds:\n" + errorBelch("%s: array access out of bounds in module %s:\n" " range of %" FMT_Word " elements starting at index %" FMT_Int " is not within [0, %" FMT_Word ").\n" "This is usually caused by incorrect use of unsafe primops " "in user or library code.", - op, count, index, size); + op, module, count, index, size); } stg_exit(EXIT_FAILURE); } void -rtsMemcpyRangeOverlap(const char *op) +rtsMemcpyRangeOverlap(const char *op, const char *module) { - errorBelch("%s: overlapping source and destination ranges in a " - "memcpy-using operation.\n" + errorBelch("%s: overlapping source and destination ranges in module %s.\n" "This is usually caused by incorrect use of unsafe primops " "in user or library code.", - op); + op, module); stg_exit(EXIT_FAILURE); } ===================================== rts/include/rts/Messages.h ===================================== @@ -108,5 +108,5 @@ extern RtsMsgFunction rtsSysErrorMsgFn; /* Used by code generator */ void rtsBadAlignmentBarf(void) STG_NORETURN; -void rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op) STG_NORETURN; -void rtsMemcpyRangeOverlap(const char *op) STG_NORETURN; +void rtsOutOfBoundsAccess(StgInt index, StgWord count, StgWord size, const char *op, const char *module) STG_NORETURN; +void rtsMemcpyRangeOverlap(const char *op, const char *module) STG_NORETURN; ===================================== testsuite/tests/codeGen/should_fail/T26964.stderr ===================================== @@ -1,3 +1,3 @@ -readSmallArray#: array access out of bounds: +readSmallArray#: array access out of bounds in module Main: index -1 is not within [0, 5). This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/T26964Module.hs ===================================== @@ -0,0 +1,6 @@ +module Main where + +import T26964ModuleA (bad) + +main :: IO () +main = bad ===================================== testsuite/tests/codeGen/should_fail/T26964Module.stderr ===================================== @@ -0,0 +1,3 @@ +readSmallArray#: array access out of bounds in module T26964ModuleA: + index -1 is not within [0, 5). +This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/T26964ModuleA.hs ===================================== @@ -0,0 +1,17 @@ +{-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE MagicHash #-} + +-- The failing -fcheck-prim-bounds primop is emitted while code-generating this +-- helper module, so the runtime diagnostic should report T26964ModuleA, not the +-- Main module that merely calls 'bad'. + +module T26964ModuleA (bad) where + +import GHC.Exts +import GHC.IO + +{-# NOINLINE bad #-} +bad :: IO () +bad = IO $ \s0 -> + case newSmallArray# 5# () s0 of + (# s1, marr #) -> readSmallArray# marr (-1#) s1 ===================================== testsuite/tests/codeGen/should_fail/T26964b.stderr ===================================== @@ -1,3 +1,3 @@ -copyMutableByteArray#: array access out of bounds: +copyMutableByteArray#: array access out of bounds in module Main: range of 4 elements starting at index 6 is not within [0, 8). This is usually caused by incorrect use of unsafe primops in user or library code. ===================================== testsuite/tests/codeGen/should_fail/all.T ===================================== @@ -42,3 +42,9 @@ test('T26964', test('T26964b', [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix)], compile_and_run, ['-fcheck-prim-bounds']) +# T26964Module checks that the reported module is the one containing the failing +# primop (the helper T26964ModuleA), not the Main module that calls it. +test('T26964Module', + [omit_ghci, js_skip, exit_code(1), normalise_errmsg_fun(strip_prog_prefix), + extra_files(['T26964ModuleA.hs'])], + multimod_compile_and_run, ['T26964Module', '-fcheck-prim-bounds']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e35ce4028800b8b7117fa3cbf223ba8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e35ce4028800b8b7117fa3cbf223ba8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][ghc-9.12] 3 commits: release engineering: update sources to make it work at all
by Magnus (＠MangoIV) 05 Jun '26

05 Jun '26

Magnus pushed to branch ghc-9.12 at Glasgow Haskell Compiler / GHC Commits: 347c77f7 by mangoiv at 2026-06-05T10:19:58+02:00 release engineering: update sources to make it work at all - - - - - 6c4f3d68 by mangoiv at 2026-06-05T10:50:42+02:00 release candidate 9.12.5: set release to no - - - - - a0a26f80 by mangoiv at 2026-06-05T11:01:21+02:00 bootstrap plans: move to proper file name - - - - - 7 changed files: - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/nix/sources.json - .gitlab/rel_eng/nix/sources.nix - .gitlab/rel_eng/upload.sh - configure.ac - hadrian/bootstrap/plan-9_12_5.json → hadrian/bootstrap/plan-9_12_4.json - hadrian/bootstrap/plan-bootstrap-9_12_5.json → hadrian/bootstrap/plan-bootstrap-9_12_4.json Changes: ===================================== .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py ===================================== @@ -3,6 +3,7 @@ from pathlib import Path import subprocess import gitlab import json +import traceback logging.basicConfig(level=logging.INFO) @@ -154,6 +155,7 @@ def fetch_artifacts(release: str, pipeline_id: int, bindist.replace(dest) except Exception as e: logging.error(f'Error fetching job {job.name}: {e}') + traceback.print_exc() pass def main(): ===================================== .gitlab/rel_eng/nix/sources.json ===================================== @@ -1,44 +1,26 @@ { - "binutils-gdb": { - "branch": "master", - "repo": "https://sourceware.org/git/binutils-gdb.git", - "rev": "49c843e6d2d0577200e7c1d2d02855f21a3a9dde", - "type": "git" - }, - "gdb-walkers": { - "branch": "master", - "description": "Bring mdb walkers to gdb, also add other helpful commands.", - "homepage": "", - "owner": "hardenedapple", - "repo": "gdb-walkers", - "rev": "c0701c4c87852bd09e21ca313c48dd4a649cfd0d", - "sha256": "1sd61a90lg8bkddl8lp15qady1wvbjmhjgm0d3lb813nwimlka9y", - "type": "tarball", - "url": "https://github.com/hardenedapple/gdb-walkers/archive/c0701c4c87852bd09e21ca…", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "niv": { "branch": "master", "description": "Easy dependency management for Nix projects", "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", - "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", + "rev": "e9519949d2b39bc9574b10f6ba216d65f014874e", + "sha256": "1mv379lsy030k2kh7000xwxxz4rzqk416yvmccsgsqnczs06r678", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0…", + "url": "https://github.com/nmattia/niv/archive/e9519949d2b39bc9574b10f6ba216d65f014…", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs": { - "branch": "nixos-22.11", + "branch": "nixos-25.05", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d10e73416ec1449ef74aeac7faf2cf8c556ff5a", - "sha256": "00s89np0sqr3jxxp5h9nrpqy30fy4vsrmis6mmryrrmjqh09lpfv", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "sha256": "0v6bd1xk8a2aal83karlvc853x44dg1n4nk08jg3dajqyy0s98np", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/2d10e73416ec1449ef74aeac7faf2cf8c5…", + "url": "https://github.com/NixOS/nixpkgs/archive/ac62194c3917d5f474c1a844b6fd6da2db…", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "processor-trace": { @@ -47,22 +29,10 @@ "homepage": "", "owner": "01org", "repo": "processor-trace", - "rev": "c848a85c3104e2f5780741f85de5c9e65476ece2", - "sha256": "1ml8g6pm2brlcqp90yvgc780xf64d6k2km7fiqs88wvhlwsl7vzf", - "type": "tarball", - "url": "https://github.com/01org/processor-trace/archive/c848a85c3104e2f5780741f85d…", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, - "rr": { - "branch": "master", - "description": "Record and Replay Framework", - "homepage": "http://rr-project.org/", - "owner": "rr-debugger", - "repo": "rr", - "rev": "e77b5f8ca4b360daffd31cf72cb6b093fa9e0b62", - "sha256": "sha256:1gxphqcv1yw2ffmjp0d2cv0mpccr00pf9jhf44rq57jqdsvlfn2c", + "rev": "911e654580e373c5a4d7e30bc84169fc3c50a128", + "sha256": "0fak9f7qh8yszb2wyygzp0j0y0wabf0k673vm4j9cl026h2vpx3z", "type": "tarball", - "url": "https://github.com/rr-debugger/rr/archive/3f87444659d1f063397fabc7791ed3b13…", + "url": "https://github.com/01org/processor-trace/archive/911e654580e373c5a4d7e30bc8…", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } ===================================== .gitlab/rel_eng/nix/sources.nix ===================================== @@ -10,33 +10,34 @@ let let name' = sanitizeName name + "-src"; in - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } - else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; name = name'; } + else + pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; fetch_tarball = pkgs: name: spec: let name' = sanitizeName name + "-src"; in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; + if spec.builtin or true then + builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + else + pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; fetch_git = name: spec: let ref = - if spec ? ref then spec.ref else + spec.ref or ( if spec ? branch then "refs/heads/${spec.branch}" else - if spec ? tag then "refs/tags/${spec.tag}" else - abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; - submodules = if spec ? submodules then spec.submodules else false; + if spec ? tag then "refs/tags/${spec.tag}" else + abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!" + ); + submodules = spec.submodules or false; submoduleArg = let nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0; emptyArgWithWarning = - if submodules == true + if submodules then builtins.trace ( @@ -44,15 +45,15 @@ let + "but your nix's (${builtins.nixVersion}) builtins.fetchGit " + "does not support them" ) - {} - else {}; + { } + else { }; in - if nixSupportsSubmodules - then { inherit submodules; } - else emptyArgWithWarning; + if nixSupportsSubmodules + then { inherit submodules; } + else emptyArgWithWarning; in - builtins.fetchGit - ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); + builtins.fetchGit + ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); fetch_local = spec: spec.path; @@ -86,16 +87,16 @@ let hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; hasThisAsNixpkgsPath = <nixpkgs> == ./.; in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import <nixpkgs> {} - else - abort - '' - Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; + if builtins.hasAttr "nixpkgs" sources + then sourcesNixpkgs + else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then + import <nixpkgs> { } + else + abort + '' + Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or + add a package called "nixpkgs" to your sources.json. + ''; # The actual fetching function. fetch = pkgs: name: spec: @@ -115,13 +116,13 @@ let # the path directly as opposed to the fetched source. replace = name: drv: let - saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; + saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name; ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; in - if ersatz == "" then drv else - # this turns the string into an actual Nix path (for both absolute and - # relative paths) - if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; + if ersatz == "" then drv else + # this turns the string into an actual Nix path (for both absolute and + # relative paths) + if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; # Ports of functions for older nix versions @@ -132,7 +133,7 @@ let ); # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fece… - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); + range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1); # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fece… stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); @@ -143,43 +144,46 @@ let concatStrings = builtins.concatStringsSep ""; # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d… - optionalAttrs = cond: as: if cond then as else {}; + optionalAttrs = cond: as: if cond then as else { }; # fetchTarball version that is compatible between all the versions of Nix builtins_fetchTarball = { url, name ? null, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchTarball; in - if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchTarball attrs; + if lessThan nixVersion "1.12" then + fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; })) + else + fetchTarball attrs; # fetchurl version that is compatible between all the versions of Nix builtins_fetchurl = { url, name ? null, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchurl; in - if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchurl attrs; + if lessThan nixVersion "1.12" then + fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; })) + else + fetchurl attrs; # Create the final "sources" from the config mkSources = config: - mapAttrs ( - name: spec: - if builtins.hasAttr "outPath" spec - then abort - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = replace name (fetch config.pkgs name spec); } - ) config.sources; + mapAttrs + ( + name: spec: + if builtins.hasAttr "outPath" spec + then + abort + "The values in sources.json should not have an 'outPath' attribute" + else + spec // { outPath = replace name (fetch config.pkgs name spec); } + ) + config.sources; # The "config" used by the fetchers mkConfig = { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) + , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile) , system ? builtins.currentSystem , pkgs ? mkPkgs sources system }: rec { @@ -191,4 +195,4 @@ let }; in -mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } +mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); } ===================================== .gitlab/rel_eng/upload.sh ===================================== @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash #! nix-shell -i bash -p moreutils lzip zip lftp gnupg set -Eeuo pipefail ===================================== configure.ac ===================================== @@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.4], [glasgow-ha AC_CONFIG_MACRO_DIRS([m4]) # Set this to YES for a released version, otherwise NO -: ${RELEASE=YES} +: ${RELEASE=NO} # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line # above. If this is not a released version, then we will append the ===================================== hadrian/bootstrap/plan-9_12_5.json → hadrian/bootstrap/plan-9_12_4.json ===================================== ===================================== hadrian/bootstrap/plan-bootstrap-9_12_5.json → hadrian/bootstrap/plan-bootstrap-9_12_4.json ===================================== View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e76917b659dc5d8cd16d319b066ab6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e76917b659dc5d8cd16d319b066ab6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] testsuite: Deduplicate --only test names
by Marge Bot (＠marge-bot) 05 Jun '26

05 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 18f6138a by Simon Jakobi at 2026-06-04T20:20:31-04:00 testsuite: Deduplicate --only test names config.only is assumed to be a set, but supplying --only overwrote it with the (list) argparse result, which can contain duplicates. When a test ran, config.only.remove(name) dropped only the first occurrence, so a duplicated name lingered and was later misreported as a "test not found" framework failure. Store it as a set instead. Fixes #27322 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 1 changed file: - testsuite/driver/runtests.py Changes: ===================================== testsuite/driver/runtests.py ===================================== @@ -133,7 +133,7 @@ if args.unexpected_output_dir: config.unexpected_output_dir = Path(args.unexpected_output_dir) if args.only: - config.only = args.only + config.only = set(args.only) config.run_only_some_tests = True if args.skip: View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/18f6138a01d73807afe9a09c5464a44… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/18f6138a01d73807afe9a09c5464a44… You're receiving this email because of your account on gitlab.haskell.org.

1 0