- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/TTG-Fewer-Orphans] Resolving even more TTG related orphan type-class instances
by recursion-ninja (＠recursion-ninja) 29 Aug '26

29 Aug '26

recursion-ninja pushed to branch wip/TTG-Fewer-Orphans at Glasgow Haskell Compiler / GHC Commits: df67ac71 by Recursion Ninja at 2026-08-28T17:37:09-04:00 Resolving even more TTG related orphan type-class instances Related to #21262 and #27469, both closed by 43dd2b15a2. This commit addresses the technical debt remaining the end of the TTG project. Orphan instances of data-types from within 'L.H.S' have been moved to either: 1. The module which defines the data-type 2. The module which defines the type-class; i.e. moving an orphan 'Binary' instance to 'GHC.Utils.Binary' The instances remaining after 43dd2b15a2 could not be relocated verbatim. 'GHC.Utils.Outputable' and 'GHC.Utils.Binary' sat below the AST in the import graph, so a type-class module could see the 'GhcPass' type-family equations that the instance bodies rely on. A new module, 'GHC.Hs.Extension.Instances', collects the 'GhcPass' instantiation of the Trees-that-Grow extension points previously declared in 'GHC.Hs.Extension.Pass', allowing more orphan type-class instance to be reolved. Orphan instances resolved (82): | Data-type | Resolved instance(s) | Former orphan module(s) | | ------------------- | -------------------------------------- | ------------------------------ | | BCOByteArray | Binary | GHC.ByteCode.Binary | | BCONPtr | Binary | GHC.ByteCode.Binary | | BCOPtr | Binary | GHC.ByteCode.Binary | | ByteCodeHpcInfo | Binary | GHC.ByteCode.Binary | | CompiledByteCode | Binary | GHC.ByteCode.Binary | | UnlinkedBCO | Binary | GHC.ByteCode.Binary | | BooleanFormula | Outputable | GHC.Data.BooleanFormula | | HsLocalBindsLR | Outputable | GHC.Hs.Binds | | RecordPatSynField | Outputable | GHC.Hs.Binds | | ValBind | HasLoc | GHC.Hs.Binds | | DerivClauseTys | Outputable | GHC.Hs.Decls | | DocDecl | Outputable | GHC.Hs.Decls | | FamilyInfo | Outputable | GHC.Hs.Decls | | ForeignExport | Outputable | GHC.Hs.Decls | | FunDep | Outputable | GHC.Hs.Decls | | HsDecl | Outputable | GHC.Hs.Decls | | InstDecl | Outputable | GHC.Hs.Decls | | RoleAnnotDecl | Outputable | GHC.Hs.Decls | | SpliceDecoration | Outputable | GHC.Hs.Decls | | StandaloneKindSig | Outputable | GHC.Hs.Decls | | TyClGroup | Outputable | GHC.Hs.Decls | | WarnDecl | Outputable | GHC.Hs.Decls | | HsDocString | Binary, Outputable, Show | GHC.Hs.DocString | | ArithSeqInfo | Outputable | GHC.Hs.Expr | | DotFieldOcc | Outputable | GHC.Hs.Expr | | FieldLabelStrings | Outputable, OutputableBndr | GHC.Hs.Expr | | HsArrowMatchContext | Outputable | GHC.Hs.Expr | | HsLamVariant | Outputable | GHC.Hs.Expr | | HsMatchContext | Outputable | GHC.Hs.Expr | | Located | OutputableBndr | GHC.Hs.Expr | | ParStmtBlock | Outputable | GHC.Hs.Expr | | DataConCantHappen | Outputable | GHC.Hs.Extension | | NoExtField | Outputable | GHC.Hs.Extension | | IEWrappedName | Outputable, OutputableBndr, HasOccName | GHC.Hs.ImpExp | | FractionalLit | Outputable, Show | GHC.Hs.Lit | | HsLit | Outputable | GHC.Hs.Lit | | HsQualLit | Outputable | GHC.Hs.Lit | | IntegralLit | Outputable, Show | GHC.Hs.Lit | | OverLitVal | Outputable | GHC.Hs.Lit | | QualLitVal | Outputable | GHC.Hs.Lit | | StringLiteral | Outputable, Show | GHC.Hs.Lit | | HsFieldBind | Outputable | GHC.Hs.Pat | | FieldOcc | Outputable, OutputableBndr | GHC.Hs.Type | | GenLocated | OutputableBndr | GHC.Hs.Type | | HsBndrVar | Outputable | GHC.Hs.Type | | HsConDetails | Outputable | GHC.Hs.Type | | HsContextDetails | Outputable | GHC.Hs.Type | | HsForAllTelescope | Outputable | GHC.Hs.Type | | HsIPName | Outputable, OutputableBndr | GHC.Hs.Type | | HsPatSigType | Outputable | GHC.Hs.Type | | HsTyPat | Outputable | GHC.Hs.Type | | HsWildCardBndrs | Outputable | GHC.Hs.Type | | LHsQTyVars | Outputable | GHC.Hs.Type | | HsArg | Outputable, HasLoc | GHC.Hs.Type, GHC.Iface.Ext.Ast | | DataDefnCons | HasLoc | GHC.Iface.Ext.Ast | | HsDataDefn | HasLoc | GHC.Iface.Ext.Ast | | CCallConv | Binary, Outputable | GHC.Types.ForeignCall | | CCallTarget | Binary | GHC.Types.ForeignCall | | CExportSpec | Binary, Outputable | GHC.Types.ForeignCall | | CType | Binary | GHC.Types.ForeignCall | | ForeignKind | Binary | GHC.Types.ForeignCall | | Header | Binary, Outputable | GHC.Types.ForeignCall | | Safety | Binary, Outputable | GHC.Types.ForeignCall | | FieldLabel | NFData | GHC.Types.Name | | InWarningCategory | Outputable | GHC.Unit.Module.Warnings | | WarningCategory | Binary, Outputable | GHC.Unit.Module.Warnings | Two instances for 'GhcPass' cannot have thier orphaned status resolved, but were migrated to a "more defensible" home instead: - 'WrapXRec' to 'GHC.Hs.Extension' - 'BooleanFormulaDefault' to 'GHC.Hs.Extension.Instances' - - - - - 31 changed files: - compiler/GHC/ByteCode/Binary.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Core/Class.hs - compiler/GHC/Data/BooleanFormula.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/DocString.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Extension.hs - + compiler/GHC/Hs/Extension/Instances.hs - compiler/GHC/Hs/Extension/Pass.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Types/FieldLabel.hs - compiler/GHC/Types/ForeignCall.hs - compiler/GHC/Types/Name.hs - compiler/GHC/Types/Name/Occurrence.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Types/SrcLoc.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Lexeme.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax/Doc.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/ghc.cabal.in The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/df67ac719ed384ffc01b7ef6bdd968d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/df67ac719ed384ffc01b7ef6bdd968d… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/TTG-Fewer-Orphans] 26 commits: testsuite: Show baseline sample count and range in perf failures
by recursion-ninja (＠recursion-ninja) 29 Aug '26

29 Aug '26

recursion-ninja pushed to branch wip/TTG-Fewer-Orphans at Glasgow Haskell Compiler / GHC Commits: b9160962 by Simon Jakobi at 2026-08-20T14:57:52-04:00 testsuite: Show baseline sample count and range in perf failures A perf baseline is the mean of all samples recorded for a commit, and it prints as a single number, hiding how far the samples spread. When the spread is wide, this can indicate an unstable metric that isn't actually useful as a signal for the perf tests. For example, in #27602, T27336's peak_megabytes_allocated baseline showed as 757 when the underlying samples were 605 and 909. When the baseline is averaged from more than one sample, say so in the failure output: the one-line stat-failure reason shows the sample range, and the detail block lists the raw samples. Single-sample baselines print exactly as before. Context: #27602 Assisted-by: Claude Fable 5 - - - - - a4979877 by Simon Jakobi at 2026-08-20T14:57:52-04:00 testsuite: Fold Baseline into CommitMetric A Baseline was just a CommitMetric plus the commit it came from, built by copying fields across. Since get_commit_metric already knows that commit, record it on CommitMetric itself and drop Baseline. This also collapses both branches of find_baseline into plain returns. Assisted-by: Claude Fable 5 - - - - - 99fb8d68 by Simon Jakobi at 2026-08-20T14:57:52-04:00 ci: Clarify comment on pushing perf notes after failures Context: #27602 Assisted-by: Claude Fable 5 - - - - - 2ca87972 by Alan Zimmerman at 2026-08-20T14:58:36-04:00 EPA: Remove LocatedBC / SrcSpanBF The custom annotations are now in the BooleanFormula TTG extension points, so LBooleanFormula can now use the standard LocatedA. - - - - - d2bc32aa by Simon Peyton Jones at 2026-08-21T12:59:26-04:00 Better handling of serialisation of wired-in names Fixes #27501 - - - - - d2795ffc by Alan Zimmerman at 2026-08-21T13:00:05-04:00 EPA: Remove NoEpTok/NoEpUniTok, using an unhelpful SrcSpan instead Also introduce helper functions noEpTok and noEpUniTok to serve as simple replacements in code inserting an token annotation without location information. - - - - - b5d29ab8 by Brandon Chinn at 2026-08-25T18:42:08-04:00 Add Data.RealFloat and Infinity/NegInfinity/NaN pattern synonyms (#26961) - - - - - e60eb3bc by Andreas Klebinger at 2026-08-25T18:42:59-04:00 rts linker: Fix pointer arithmetic issue in flushInstructionCacheRISCV64 We accidentally operated over `uint64_t*` when we should use `uint8_t`. Fixes #27569 - - - - - e9bbe8f9 by Andreas Klebinger at 2026-08-26T15:09:23-04:00 cmm dumps: Add machop width info with -dppr-debug for infix ops. - - - - - 86e3a9d8 by Andreas Klebinger at 2026-08-26T15:09:24-04:00 CmmLint: Check for unsupported MachOp widths machOpArgReps now maps MachOp + Width to a list of supported argument widths or Nothing if the given operation is not supported at the given width. This allows us to check for nonsensical combinations like FloatToInt at Word16. Similarly we now check that every address is actually wordwidth. - - - - - 13781cca by Andreas Klebinger at 2026-08-26T15:09:24-04:00 arm64 ncg: The big subword truncation fix. A set of slightly related fixes to arm subword handling: Bitmask immediates: Don't produce overflowing assembly literals. There is still another bug here that causes us to miss some valid literals but we will fix that later. Improve subword truncation handling: We now use a small set of helpers to truncate `Register` values rather than truncating immediate `Reg` values which greatly simplifies the code structure. This fixes a great many bugs to do with sign/zero extending subwords or the lack thereof. We now establish the invariant that subword values are zero-extended at every site at which they come into "scope" of the ncg, and rely on the invariant throughout rather than pessimistically inserting redundant extensions in a hodgepodge manner at the use sites of these values. This fixes at least the bugs described in issues #27533, #27430 #27537, #27538, #27539, and #27550. But likely more bugs yet not found. Subword ffi results: Apply truncations when calling functions returning subword values. genCondJump: Don't sign extend signed values in the input register as it might map to a local variable, corrupting the value stored within. Fix subword store/load instructions.: We used to read those at 32bit width even for smaller values possibly resulting in invalid memory access. Now we construct the suffix for subword variants based on the instruction format for these. - - - - - d8fa5d7c by Andreas Klebinger at 2026-08-26T15:09:24-04:00 arm64 ncg: Fix MO_V_Broadcast for non-literals. We now use OpReg instead of OpScalarAsVec as required since we broadcast a gp register. Also adds a test. Fixes #27565. - - - - - 94822c95 by Andreas Klebinger at 2026-08-26T15:09:24-04:00 Add some test cases covering bugs in the arm ncg. * Test for #27430 (subword ffi results) * #27537 - subword conversions * #27538 - subwords used in conditional * #27533 - single byte read - - - - - dd1ba88a by Andreas Klebinger at 2026-08-26T15:09:24-04:00 cmmLint: Lint against MO_FS_Truncate subword use. - - - - - fd22f71e by Zubin Duggal at 2026-08-26T15:10:20-04:00 ghc-internal: annotateSTM should use catchSTM# rather than catch# A catch# frame inside a transaction breaks retry and async exception delivery. Fixes #27657 - - - - - bb324171 by Rodrigo Mesquita at 2026-08-26T15:10:59-04:00 rts: refactor to reduce THREADED_RTS in MSG_UPD_TSO_FLAGS - No behavior change in this commit (well, a small optimization here makes us do less work if the target TSO owned by the curr. capability) - Move all THREADED_RTS CPP needed into `updThreadFlag` - Merge MSG_SET_TSO_FLAGS and MSG_UNSET_TSO_FLAGS into MSG_UPD_TSO_FLAGS plus a `set` bool field in the MessageUpdTSOFlag struct Towards #27729 - - - - - ed99b7b7 by Rodrigo Mesquita at 2026-08-26T15:10:59-04:00 rts: Fix race condition in MSG_UPD_TSO_FLAGS execution The code for processing the MSG_UPD_TSO_FLAGS message was not taking into consideration that the TSO's owner might have moved in between that capability receiving the message (since it was its previous owner) and starting to process its inbox (a point at which it was no longer the owner) Added Note [TSO owner may change in between Msg being sent and received] to explain this race and the pattern used to fix this, where we just forward the message to the new owner. Fixes #27729 - - - - - cd653714 by Alan Zimmerman at 2026-08-26T15:11:49-04:00 EPA: Uses Parsers.parseModule for exactprint tests Parsers.parseModule is the advertised way to parse for use for exact printing in the ghc-exactprint library. This commit updates the GHC exact print testing to use it. This requires moving the comment balancing that was occurring only in the test path into the advertising parser path, so it moves from Transforms.hs to Utils.hs. Also update the comment adding to honour trailing annotations - - - - - d1d01fa5 by Wolfgang Jeltsch at 2026-08-27T13:17:59+03:00 Add `rethrowSTM` and improve STM-related documentation Adding `rethrowSTM` resolves #26758. The implementation of `rethrowSTM` is completely analogous to the one of `rethrowIO`. The following is established for the documentation of `throwSTM` and `catchSTM`: * Both operations are directly described as analogs of their `IO` counterparts. * There is no reference to `throw` in the documentation of `throwSTM`, because, although such a reference is great in the documentation of `throwIO`, it is somewhat out of place in the documentation of `throwSTM`. * Instead of repeating part of `throwIO`’s documentation, the documentation of `throwSTM` just recommends using `throwSTM` instead of `throw` and references the corresponding arguments in the documentation of `throwIO`. - - - - - 06fde293 by fendor at 2026-08-28T06:06:44-04:00 GHCi: Fix order of `PackageDBFlag`s for interactive home unit `PackageDBFlag`s are stored in reverse order of cli specification. When sorting the `PackageDBFlag`s by longest common prefix, we need thus to reverse the package db stacks before calculating the prefix. We make sure to reverse the package db stack for the interactive home unit to uphold that later specified package dbs overwrite earlier ones. Resolved and adds regression test for #27640 - - - - - 024c4d04 by fendor at 2026-08-28T06:07:23-04:00 Reuse the UnitIndexCache after initialising multiple home units - - - - - 55326fa0 by Alan Zimmerman at 2026-08-28T06:08:03-04:00 EPA: Some Haddock processing tweaks These changes to the Haddock postprocessing should not change behaviour, but just bring it more closely in line with the original, changed at 44309cd377f And add some haddock exactprint tests to show they work. - - - - - b3ddee95 by Andreas Klebinger at 2026-08-28T13:57:46-04:00 hadrian: Deprecate quickest flavour. It was more of a trap for new users than actually beneficial so we deprecate it and suggest quick+no_dynamic_libs to users instead. - - - - - a1d81390 by Andreas Klebinger at 2026-08-28T13:58:37-04:00 cmm: Always favour entry block during block deduplication. We now always keep the first block in the CmmGraph. This way we avoid the need to update the entry info table. Failing to do so caused #27722. Fixes #27722. - - - - - 5bd65f00 by Andreas Klebinger at 2026-08-28T13:59:16-04:00 test: FamAppCachePerf - Only collect bytes allocated. Fixes 27747 - - - - - d12115a4 by Recursion Ninja at 2026-08-28T17:23:25-04:00 Resolving even more TTG related orphan type-class instances Related to #21262 and #27469, both closed by 43dd2b15a2. This commit addresses the technical debt remaining the end of the TTG project. Orphan instances of data-types from within 'L.H.S' have been moved to either: 1. The module which defines the data-type 2. The module which defines the type-class; i.e. moving an orphan 'Binary' instance to 'GHC.Utils.Binary' The instances remaining after 43dd2b15a2 could not be relocated verbatim. 'GHC.Utils.Outputable' and 'GHC.Utils.Binary' sat below the AST in the import graph, so a type-class module could see the 'GhcPass' type-family equations that the instance bodies rely on. A new module, 'GHC.Hs.Extension.Instances', collects the 'GhcPass' instantiation of the Trees-that-Grow extension points previously declared in 'GHC.Hs.Extension.Pass', allowing more orphan type-class instance to be reolved. Orphan instances resolved (82): | Data-type | Resolved instance(s) | Former orphan module(s) | | ------------------- | -------------------------------------- | ------------------------------ | | BCOByteArray | Binary | GHC.ByteCode.Binary | | BCONPtr | Binary | GHC.ByteCode.Binary | | BCOPtr | Binary | GHC.ByteCode.Binary | | ByteCodeHpcInfo | Binary | GHC.ByteCode.Binary | | CompiledByteCode | Binary | GHC.ByteCode.Binary | | UnlinkedBCO | Binary | GHC.ByteCode.Binary | | BooleanFormula | Outputable | GHC.Data.BooleanFormula | | HsLocalBindsLR | Outputable | GHC.Hs.Binds | | RecordPatSynField | Outputable | GHC.Hs.Binds | | ValBind | HasLoc | GHC.Hs.Binds | | DerivClauseTys | Outputable | GHC.Hs.Decls | | DocDecl | Outputable | GHC.Hs.Decls | | FamilyInfo | Outputable | GHC.Hs.Decls | | ForeignExport | Outputable | GHC.Hs.Decls | | FunDep | Outputable | GHC.Hs.Decls | | HsDecl | Outputable | GHC.Hs.Decls | | InstDecl | Outputable | GHC.Hs.Decls | | RoleAnnotDecl | Outputable | GHC.Hs.Decls | | SpliceDecoration | Outputable | GHC.Hs.Decls | | StandaloneKindSig | Outputable | GHC.Hs.Decls | | TyClGroup | Outputable | GHC.Hs.Decls | | WarnDecl | Outputable | GHC.Hs.Decls | | HsDocString | Binary, Outputable, Show | GHC.Hs.DocString | | ArithSeqInfo | Outputable | GHC.Hs.Expr | | DotFieldOcc | Outputable | GHC.Hs.Expr | | FieldLabelStrings | Outputable, OutputableBndr | GHC.Hs.Expr | | HsArrowMatchContext | Outputable | GHC.Hs.Expr | | HsLamVariant | Outputable | GHC.Hs.Expr | | HsMatchContext | Outputable | GHC.Hs.Expr | | Located | OutputableBndr | GHC.Hs.Expr | | ParStmtBlock | Outputable | GHC.Hs.Expr | | DataConCantHappen | Outputable | GHC.Hs.Extension | | NoExtField | Outputable | GHC.Hs.Extension | | IEWrappedName | Outputable, OutputableBndr, HasOccName | GHC.Hs.ImpExp | | FractionalLit | Outputable, Show | GHC.Hs.Lit | | HsLit | Outputable | GHC.Hs.Lit | | HsQualLit | Outputable | GHC.Hs.Lit | | IntegralLit | Outputable, Show | GHC.Hs.Lit | | OverLitVal | Outputable | GHC.Hs.Lit | | QualLitVal | Outputable | GHC.Hs.Lit | | StringLiteral | Outputable, Show | GHC.Hs.Lit | | HsFieldBind | Outputable | GHC.Hs.Pat | | FieldOcc | Outputable, OutputableBndr | GHC.Hs.Type | | GenLocated | OutputableBndr | GHC.Hs.Type | | HsBndrVar | Outputable | GHC.Hs.Type | | HsConDetails | Outputable | GHC.Hs.Type | | HsContextDetails | Outputable | GHC.Hs.Type | | HsForAllTelescope | Outputable | GHC.Hs.Type | | HsIPName | Outputable, OutputableBndr | GHC.Hs.Type | | HsPatSigType | Outputable | GHC.Hs.Type | | HsTyPat | Outputable | GHC.Hs.Type | | HsWildCardBndrs | Outputable | GHC.Hs.Type | | LHsQTyVars | Outputable | GHC.Hs.Type | | HsArg | Outputable, HasLoc | GHC.Hs.Type, GHC.Iface.Ext.Ast | | DataDefnCons | HasLoc | GHC.Iface.Ext.Ast | | HsDataDefn | HasLoc | GHC.Iface.Ext.Ast | | CCallConv | Binary, Outputable | GHC.Types.ForeignCall | | CCallTarget | Binary | GHC.Types.ForeignCall | | CExportSpec | Binary, Outputable | GHC.Types.ForeignCall | | CType | Binary | GHC.Types.ForeignCall | | ForeignKind | Binary | GHC.Types.ForeignCall | | Header | Binary, Outputable | GHC.Types.ForeignCall | | Safety | Binary, Outputable | GHC.Types.ForeignCall | | FieldLabel | NFData | GHC.Types.Name | | InWarningCategory | Outputable | GHC.Unit.Module.Warnings | | WarningCategory | Binary, Outputable | GHC.Unit.Module.Warnings | Two instances for 'GhcPass' cannot have thier orphaned status resolved, but were migrated to a "more defensible" home instead: - 'WrapXRec' to 'GHC.Hs.Extension' - 'BooleanFormulaDefault' to 'GHC.Hs.Extension.Instances' - - - - - 157 changed files: - .gitlab/ci.sh - changelog.d/T27202 - + changelog.d/T27657 - + changelog.d/T27722-cbe-entry-block.md - + changelog.d/arm_ncg_fixes_T27430 - + changelog.d/rethrow-stm - changelog.d/unit-index - compiler/GHC/Builtin.hs - compiler/GHC/ByteCode/Binary.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Cmm/CommonBlockElim.hs - compiler/GHC/Cmm/Expr.hs - compiler/GHC/Cmm/Lint.hs - compiler/GHC/Cmm/MachOp.hs - compiler/GHC/Cmm/Parser.y - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/AArch64/Instr.hs - compiler/GHC/CmmToAsm/AArch64/Ppr.hs - compiler/GHC/Core/Class.hs - compiler/GHC/Data/BooleanFormula.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Hs.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/DocString.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Extension.hs - + compiler/GHC/Hs/Extension/Instances.hs - compiler/GHC/Hs/Extension/Pass.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Types/FieldLabel.hs - compiler/GHC/Types/ForeignCall.hs - compiler/GHC/Types/Name.hs - compiler/GHC/Types/Name/Occurrence.hs - compiler/GHC/Types/SourceText.hs - compiler/GHC/Types/SrcLoc.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Lexeme.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax/Doc.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/ghc.cabal.in - ghc/GHCi/UI.hs - hadrian/README.md - hadrian/doc/cross-compile.md - hadrian/doc/flavours.md - hadrian/doc/make.md - hadrian/doc/windows.md - hadrian/hadrian.cabal - hadrian/src/CommandLine.hs - hadrian/src/Flavour.hs - hadrian/src/Settings.hs - − hadrian/src/Settings/Flavours/Quickest.hs - libraries/base/base.cabal.in - libraries/base/changelog.md - + libraries/base/src/Data/RealFloat.hs - libraries/base/src/GHC/Conc.hs - libraries/ghc-internal/src/GHC/Internal/STM.hs - rts/CloneStack.c - rts/Interpreter.c - rts/Messages.c - rts/StgMiscClosures.cmm - rts/Threads.c - rts/Threads.h - rts/include/rts/storage/Closures.h - rts/include/stg/MiscClosures.h - rts/linker/elf_reloc_riscv64.c - testsuite/driver/perf_notes.py - testsuite/driver/testglobals.py - testsuite/tests/cmm/should_compile/Makefile - + testsuite/tests/cmm/should_compile/T27368-ppr-debug.stderr - − testsuite/tests/cmm/should_compile/T27368-ppr-debug.stdout - testsuite/tests/cmm/should_compile/all.T - + testsuite/tests/codeGen/should_run/T27430.hs - + testsuite/tests/codeGen/should_run/T27430.stdout - + testsuite/tests/codeGen/should_run/T27430_c.c - + testsuite/tests/codeGen/should_run/T27533.hs - + testsuite/tests/codeGen/should_run/T27533.stdout - + testsuite/tests/codeGen/should_run/T27533_cmm.cmm - + testsuite/tests/codeGen/should_run/T27537.hs - + testsuite/tests/codeGen/should_run/T27537.stdout - + testsuite/tests/codeGen/should_run/T27538.hs - + testsuite/tests/codeGen/should_run/T27538.stdout - testsuite/tests/codeGen/should_run/all.T - + testsuite/tests/concurrent/should_run/T27657a.hs - + testsuite/tests/concurrent/should_run/T27657a.stdout - + testsuite/tests/concurrent/should_run/T27657b.hs - + testsuite/tests/concurrent/should_run/T27657b.stdout - testsuite/tests/concurrent/should_run/all.T - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - + testsuite/tests/ghci/prog-mhu007/Makefile - + testsuite/tests/ghci/prog-mhu007/a/A.hs - + testsuite/tests/ghci/prog-mhu007/all.T - + testsuite/tests/ghci/prog-mhu007/b/B.hs - + testsuite/tests/ghci/prog-mhu007/prog-mhu007.script - + testsuite/tests/ghci/prog-mhu007/prog-mhu007.stdout - + testsuite/tests/ghci/prog-mhu007/testpkg-bar/Bar.hs - + testsuite/tests/ghci/prog-mhu007/testpkg-bar/testpkg-bar.pkg - + testsuite/tests/ghci/prog-mhu007/testpkg-foo/Foo.hs - + testsuite/tests/ghci/prog-mhu007/testpkg-foo/testpkg-foo.pkg - + testsuite/tests/ghci/prog-mhu007/unitA - + testsuite/tests/ghci/prog-mhu007/unitB - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/module/mod185.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - testsuite/tests/perf/compiler/all.T - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - + testsuite/tests/printer/Haddock1.hs - testsuite/tests/printer/Makefile - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - testsuite/tests/printer/all.T - + testsuite/tests/simd/should_run/T27565.hs - + testsuite/tests/simd/should_run/T27565.stdout - testsuite/tests/simd/should_run/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Parsers.hs - utils/check-exact/Transform.hs - utils/check-exact/Utils.hs - utils/ghc-toolchain/src/GHC/Toolchain/Target.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ee9391b447235000df03e8deb63745… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ee9391b447235000df03e8deb63745… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/TTG-Fewer-Orphans
by recursion-ninja (＠recursion-ninja) 29 Aug '26

29 Aug '26

recursion-ninja pushed new branch wip/TTG-Fewer-Orphans at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/TTG-Fewer-Orphans You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/jeltsch/improve-closure-property-check] Document the local variables of `checkHomeUnitsClosed`
by Wolfgang Jeltsch (＠jeltsch) 29 Aug '26

29 Aug '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/improve-closure-property-check at Glasgow Haskell Compiler / GHC Commits: 0d8dbbf4 by Wolfgang Jeltsch at 2026-08-28T21:59:19+03:00 Document the local variables of `checkHomeUnitsClosed` - - - - - 1 changed file: - compiler/GHC/Driver/Downsweep.hs Changes: ===================================== compiler/GHC/Driver/Downsweep.hs ===================================== @@ -949,19 +949,33 @@ checkHomeUnitsClosed unit_env ] where + -- | The 'UnitId' and 'HomeUnitEnv' of each home unit. home_unit_data :: [(UnitId, HomeUnitEnv)] home_unit_data = HUG.unitEnv_assocs (ue_home_unit_graph unit_env) + -- | The 'UnitId's of all home units. home_units :: UniqSet UnitId home_units = mkUniqSet (map fst home_unit_data) + -- | All offending dependencies. A dependency of a unit _u_ on a unit _v_ is + -- offending exactly if _u_ is an external unit reachable from a home unit + -- and _v_ is a home unit. Each such dependency is represented in this list + -- by the pair of the 'UnitId' of _u_ and the 'UnitId' of _v_. offenders :: [(UnitId, UnitId)] offenders = evalState (collect (map (homeUnitEnv_units . snd) home_unit_data)) $ Set.empty where - collect :: [UnitState] -> State (Set GlobalUnitKey) [(UnitId, UnitId)] + -- | Collects offending dependencies. + collect :: [UnitState] + -- ^ The 'UnitState's of the home units from which to traverse + -- the dependency graph. + -> State (Set GlobalUnitKey) [(UnitId, UnitId)] + -- ^ A stateful computation that collects the offending + -- dependencies, using its state to keep track of which units + -- have already been considered as sources of offending + -- dependencies. collect [] = pure [] collect (current_unit_state : remaining_unit_states) @@ -971,23 +985,35 @@ checkHomeUnitsClosed unit_env <*> collect remaining_unit_states where - collect_for_home_unit :: UnitInfoMap - -> [UnitId] - -> State (Set GlobalUnitKey) [(UnitId, UnitId)] + -- | Collects offending dependencies that are reachable from a single home + -- unit. + collect_for_home_unit + :: UnitInfoMap + -- ^ The 'UnitInfoMap' of the home unit. + -> [UnitId] + -- ^ The 'UnitId's of the units from which to traverse the dependency + -- graph. + -> State (Set GlobalUnitKey) [(UnitId, UnitId)] + -- ^ A stateful computation that collects the offending dependencies, + -- using its state to keep track of which units have already been + -- considered as sources of offending dependencies. collect_for_home_unit _ [] = return [] collect_for_home_unit unit_info_map (current_unit : remaining_units) = do let + -- | The 'UnitInfo' of the current unit. unit_info :: UnitInfo unit_info = fromMaybe (pprPanic unit_not_found_msg (ppr current_unit)) $ lookupUniqMap unit_info_map current_unit where + -- | The message that says that a unit was not found. unit_not_found_msg :: String unit_not_found_msg = "Unit not found during closure property check" + -- | A 'GlobalUnitKey' that identifies the current unit. global_unit_key :: GlobalUnitKey global_unit_key = mkGlobalUnitKey current_unit (unitAbiHash unit_info) @@ -998,9 +1024,11 @@ checkHomeUnitsClosed unit_env modify (Set.insert global_unit_key) let + -- | The 'UnitId's of the units that the current unit depends on. needed_units :: [UnitId] needed_units = unitDepends unit_info + -- | The offending dependencies of the current unit. current_offenders :: [(UnitId, UnitId)] current_offenders | current_unit `elementOfUniqSet` home_units @@ -1014,6 +1042,7 @@ checkHomeUnitsClosed unit_env needed_units ++ remaining_units return $ current_offenders ++ remaining_offenders + -- | A fake source span used for reporting violations of the closure property. error_source_span :: SrcSpan error_source_span = mkGeneralSrcSpan (fsLit "<command line>") View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0d8dbbf4a75a120430eefc411e39a69… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0d8dbbf4a75a120430eefc411e39a69… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/sjakobi/T12934-line-buffer-stdout] testsuite: Line-buffer the driver's stdout
by Simon Jakobi (＠sjakobi) 29 Aug '26

29 Aug '26

Simon Jakobi pushed to branch wip/sjakobi/T12934-line-buffer-stdout at Glasgow Haskell Compiler / GHC Commits: cd91c746 by Simon Jakobi at 2026-08-28T20:26:37+02:00 testsuite: Line-buffer the driver's stdout The driver prints a progress line every ~100 tests, but when stdout is a pipe — as under hadrian and in CI — Python block-buffers it at 8 KiB, which is more than a clean run's entire progress output. So CI logs would show no sign of life until the run ended. The type-ignore is for mypy, which types sys.stdout as TextIO — an interface without reconfigure. Fixes #12934. Assisted-by: Claude Fable 5 - - - - - 1 changed file: - testsuite/driver/runtests.py Changes: ===================================== testsuite/driver/runtests.py ===================================== @@ -38,6 +38,10 @@ import term_color from term_color import Color, colored import cpu_features +# Line-buffer stdout: when it is a pipe (hadrian, CI), the block-buffered +# default can delay all progress output until the run ends (#12934). +sys.stdout.reconfigure(line_buffering=True) # type: ignore[union-attr] + # Readline sometimes spews out ANSI escapes for some values of TERM, # which result in test failures. Thus set TERM to a nice, simple, safe # value. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cd91c746e4e6c7ccbd2a3cdda49f056… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cd91c746e4e6c7ccbd2a3cdda49f056… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][master] test: FamAppCachePerf - Only collect bytes allocated. Fixes 27747
by Marge Bot (＠marge-bot) 29 Aug '26

29 Aug '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 5bd65f00 by Andreas Klebinger at 2026-08-28T13:59:16-04:00 test: FamAppCachePerf - Only collect bytes allocated. Fixes 27747 - - - - - 1 changed file: - testsuite/tests/perf/compiler/all.T Changes: ===================================== testsuite/tests/perf/compiler/all.T ===================================== @@ -192,7 +192,6 @@ test ('T13386', # Performance test for lookups in the family application cache test('FamAppCachePerf', [ only_ways(['normal']) - , collect_compiler_residency(20) , collect_compiler_stats('bytes allocated',2) ], compile, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5bd65f00e9ec53f6bf4a2fb1f0991bd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5bd65f00e9ec53f6bf4a2fb1f0991bd… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][master] cmm: Always favour entry block during block deduplication.
by Marge Bot (＠marge-bot) 29 Aug '26

29 Aug '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a1d81390 by Andreas Klebinger at 2026-08-28T13:58:37-04:00 cmm: Always favour entry block during block deduplication. We now always keep the first block in the CmmGraph. This way we avoid the need to update the entry info table. Failing to do so caused #27722. Fixes #27722. - - - - - 2 changed files: - + changelog.d/T27722-cbe-entry-block.md - compiler/GHC/Cmm/CommonBlockElim.hs Changes: ===================================== changelog.d/T27722-cbe-entry-block.md ===================================== @@ -0,0 +1,5 @@ +section: cmm +issues: #27722 +mrs: !16592 +synopsis: + Fix common block elimination dropping entry block info table in hand written cmm. ===================================== compiler/GHC/Cmm/CommonBlockElim.hs ===================================== @@ -26,6 +26,7 @@ import GHC.Types.Literal.Floating import GHC.Types.Unique.FM import GHC.Types.Unique import GHC.Utils.Word64 (truncateWord64ToWord32) +import GHC.Utils.Panic.Plain (assert) import Control.Arrow (first, second) import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NE @@ -60,16 +61,31 @@ import qualified Data.List.NonEmpty as NE -- TODO: Use optimization fuel elimCommonBlocks :: CmmGraph -> CmmGraph -elimCommonBlocks g = replaceLabels env $ copyTicks env g +elimCommonBlocks g = + assert (g_entry g == g_entry g') g' where + g' = replaceLabels env $ copyTicks env g env = iterate mapEmpty blocks_with_key -- The order of blocks doesn't matter here. While we could use -- revPostorder which drops unreachable blocks this is done in -- ContFlowOpt already which runs before this pass. So we use -- toBlockList since it is faster. - groups = groupByInt hash_block (toBlockList g) :: [[CmmBlock]] + -- One exception: The entry block most come first or we risk eliminating it + -- in favour of another block. See Note [Retain entry block during common block elimination.] + groups = groupByInt hash_block (toBlockListEntryFirst g) :: [[CmmBlock]] blocks_with_key = [ [ (successors b, [b]) | b <- bs] | bs <- groups] +-- Note [Retain entry block during common block elimination.] +-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-- At the stage we run common block elimination (CBE) we only have one info +-- table for the entry label. Which means we can get away without applying the +-- block label substitution to the info table *as long as we keep the first block*. +-- When combining blocks the first block in the list of blocks is kept, and the later +-- one eliminated, so we can achieve this by simply using toBlockListEntryFirst. +-- +-- If we don't we end up with #27722 where the entry block was eliminated in favour +-- of another block. + -- Invariant: The blocks in the list are pairwise distinct -- (so avoid comparing them again) type DistinctBlocks = [CmmBlock] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a1d8139054c4d329f3222da96675b3a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a1d8139054c4d329f3222da96675b3a… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][master] hadrian: Deprecate quickest flavour.
by Marge Bot (＠marge-bot) 29 Aug '26

29 Aug '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: b3ddee95 by Andreas Klebinger at 2026-08-28T13:57:46-04:00 hadrian: Deprecate quickest flavour. It was more of a trap for new users than actually beneficial so we deprecate it and suggest quick+no_dynamic_libs to users instead. - - - - - 11 changed files: - hadrian/README.md - hadrian/doc/cross-compile.md - hadrian/doc/flavours.md - hadrian/doc/make.md - hadrian/doc/windows.md - hadrian/hadrian.cabal - hadrian/src/CommandLine.hs - hadrian/src/Flavour.hs - hadrian/src/Settings.hs - − hadrian/src/Settings/Flavours/Quickest.hs - utils/ghc-toolchain/src/GHC/Toolchain/Target.hs Changes: ===================================== hadrian/README.md ===================================== @@ -55,10 +55,9 @@ changes. Build results are placed into `_build` by default. There are many different ways to build a compiler, each way is called a flavour. * `--flavour=FLAVOUR`: choose a build flavour. The following settings are -currently supported: `default`, `quick`, `quickest`, `perf`, `prof`, `devel1` -and `devel2`. As an example, the `quickest` flavour adds `-O0` flag to all GHC -invocations and builds libraries only in the `vanilla` way, which speeds up -builds by 3-4x. +currently supported: `default`, `quick`, `perf`, `prof`, `devel1` +and `devel2`. As an example, the `quick` flavour builds the GHC binary with `-O0` +which speeds up builds and rebuilds significantly. In addition to the overall build flavour there are also "flavour transformers" which can slightly modify the build settings for a flavour. Some common flavour ===================================== hadrian/doc/cross-compile.md ===================================== @@ -16,7 +16,7 @@ After all the dependencies are in place: - `git submodule update --init` - `./configure --target=arm-linux-gnueabihf` - `cd hadrian` -- Build the compiler by e.g. `./build.sh --flavour=quickest --integer-simple -V -j` +- Build the compiler by e.g. `./build.sh --flavour=quick --integer-simple -V -j` After that, you should have built `inplace/bin/ghc-stage1` cross compiler. We will go to the next section to validate this. ===================================== hadrian/doc/flavours.md ===================================== @@ -82,18 +82,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH <td>-O</td> <td>-debug (link)</td> </tr> - <tr> - <th>quickest</td> - <td></td> - <td>-O0 +RTS -O64M -RTS</td> - <td>-O0 +RTS -O64M -RTS</td> - <td></td> - <td></td> - <td>-O</td> - <td></td> - <td>-O</td> - <td></td> - </tr> <tr> <th>perf</td> <td> Yes (on supported platforms) </td> @@ -367,11 +355,4 @@ information. The following table lists ways that are built in different flavours <td>debug threaded threadedDebug debugDynamic threadedDynamic threadedDebugDynamic</td> <td>debug threaded threadedDebug debugDynamic threadedDynamic threadedDebugDynamic</td> </tr> -<tr> - <th>quickest</th> - <td>vanilla</td> - <td>vanilla</td> - <td>vanilla threaded</td> - <td>vanilla threaded</td> -</tr> </table> ===================================== hadrian/doc/make.md ===================================== @@ -80,15 +80,15 @@ time you fire up a build. This is not possible with the Make build system. build _build/stage1/lib/package.conf.d/text-1.2.3.0.conf # OR actual path ``` -- Building with a particular flavour (e.g `quickest`) +- Building with a particular flavour (e.g `quick`) ``` sh # Make - echo "BuildFlavour=quickest" >> mk/build.mk + echo "BuildFlavour=quick" >> mk/build.mk make # Hadrian - build --flavour=quickest + build --flavour=quick ``` See [flavours documentation](https://gitlab.haskell.org/ghc/ghc/blob/master/hadrian/doc/f… for info on flavours. ===================================== hadrian/doc/windows.md ===================================== @@ -20,7 +20,7 @@ stack exec -- pacman -S autoconf automake-wrapper make patch python tar --noconf stack build # Build GHC -stack exec hadrian -- --directory ".." -j --flavour=quickest +stack exec hadrian -- --directory ".." -j --flavour=quick # Test GHC cd .. @@ -28,7 +28,7 @@ _build\stage1\bin\ghc -e 1+2 ``` The entire process should take about 20 minutes. Note, this will build GHC -without optimisations. If you need an optimised GHC, drop the `--flavour=quickest` +without optimisations. If you need an optimised GHC, drop the `--flavour=quick` flag from the build command line (this will slow down the build to about an hour). These are currently not the @@ -37,7 +37,7 @@ but are much simpler and may also be more robust. The `stack build` and `stack exec hadrian` commands can be replaced by an invocation of Hadrian's Stack-based build script: -`build-stack.bat -j --flavour=quickest`. Use this script if you plan to work on +`build-stack.bat -j --flavour=quick`. Use this script if you plan to work on Hadrian and/or rebuild GHC often. ## Prerequisites ===================================== hadrian/hadrian.cabal ===================================== @@ -125,7 +125,6 @@ executable hadrian , Settings.Flavours.Performance , Settings.Flavours.Quick , Settings.Flavours.QuickCross - , Settings.Flavours.Quickest , Settings.Flavours.Validate , Settings.Flavours.Release , Settings.Packages ===================================== hadrian/src/CommandLine.hs ===================================== @@ -281,7 +281,7 @@ optDescrs = , Option ['o'] ["build-root"] (ReqArg readBuildRoot "BUILD_ROOT") "Where to store build artifacts. (Default _build)." , Option [] ["flavour"] (OptArg readFlavour "FLAVOUR") - "Build flavour (Default, Devel1, Devel2, Perf, Prof, Quick or Quickest)." + "Build flavour (Default, Devel1, Devel2, Perf, Prof or Quick)." , Option [] ["freeze1"] (NoArg readFreeze1) "Freeze Stage1 GHC." , Option [] ["freeze2"] (NoArg readFreeze2) ===================================== hadrian/src/Flavour.hs ===================================== @@ -531,7 +531,7 @@ It now also offers a more "old-school" interface, in the form of @foo.bar.baz = v@ or @foo.bar.baz += v@ expressions, that one can pass on the command line that invokes hadrian: -> $ hadrian/build --flavour=quickest -j "stage1.ghc-bin.ghc.link.opts += -v3" +> $ hadrian/build --flavour=quick -j "stage1.ghc-bin.ghc.link.opts += -v3" or in a file at <build root>/hadrian.settings, where <build root> is the build root to be used for the build, which is _build by default. ===================================== hadrian/src/Settings.hs ===================================== @@ -19,7 +19,6 @@ import Settings.Flavours.Development import Settings.Flavours.GhcInGhci import Settings.Flavours.Performance import Settings.Flavours.Quick -import Settings.Flavours.Quickest import Settings.Flavours.QuickCross import Settings.Flavours.Validate import Settings.Flavours.Release @@ -55,7 +54,6 @@ hadrianFlavours = , developmentFlavour Stage2, performanceFlavour , releaseFlavour , quickFlavour, quickValidateFlavour, quickDebugFlavour - , quickestFlavour , quickCrossFlavour , ghcInGhciFlavour, validateFlavour, slowValidateFlavour ] @@ -69,6 +67,10 @@ hadrianFlavours = flavour :: Action Flavour flavour = do flavourName <- fromMaybe userDefaultFlavour <$> cmdFlavour + when ("quickest" `isPrefixOf` flavourName) $ + fail $ "The `quickest` flavour has been deprecated. Use `quick` instead.\n" + ++ "Skip building dynamic libraries with `quick+no_dynamic_libs`\n" + ++ "to get closer to the old quickest behaviour." kvs <- userSetting ([] :: [KeyVal]) let flavours = hadrianFlavours ++ userFlavours (settingErrs, tweak) = applySettings kvs ===================================== hadrian/src/Settings/Flavours/Quickest.hs deleted ===================================== @@ -1,21 +0,0 @@ -module Settings.Flavours.Quickest (quickestFlavour) where - -import Expression -import Flavour -import {-# SOURCE #-} Settings.Default - --- Please update doc/flavours.md when changing this file. -quickestFlavour :: Flavour -quickestFlavour = disableDynamicLibs $ disableProfiledLibs $ defaultFlavour - { name = "quickest" - , extraArgs = quickestArgs - } - -quickestArgs :: Args -quickestArgs = sourceArgs SourceArgs - { hsDefault = mconcat $ - [ pure ["-O0", "+RTS", "-O64M", "-RTS"] - ] - , hsLibrary = mempty - , hsCompiler = stage0 ? arg "-O" - , hsGhc = stage0 ? arg "-O" } ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Target.hs ===================================== @@ -199,7 +199,7 @@ tgtSupportsSMP Target{..} = do -- 5. The testsuite driver will use dyn way for TH/ghci tests even -- when host GHC is static. -- 6. TH/ghci doesn't work if stage1 is built without shared libraries --- (e.g. quickest/fully_static). +-- (e.g. no_dynamic_libs/fully_static). tgtRTSLinkerOnlySupportsSharedLibs :: Target -> Bool tgtRTSLinkerOnlySupportsSharedLibs Target{tgtArchOs} = archOS_arch tgtArchOs `elem` View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b3ddee95feaf827e67f08ba327f0c74… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b3ddee95feaf827e67f08ba327f0c74… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/dcoutts/io-manager-io-primop-exceptions] FIXUP Change the encoding of results from the I/O manager to I/O primops
by Duncan Coutts (＠dcoutts) 29 Aug '26

29 Aug '26

Duncan Coutts pushed to branch wip/dcoutts/io-manager-io-primop-exceptions at Glasgow Haskell Compiler / GHC Commits: 3d73b7a6 by Duncan Coutts at 2026-08-28T17:56:38+01:00 FIXUP Change the encoding of results from the I/O manager to I/O primops - - - - - 1 changed file: - rts/PrimOps.cmm Changes: ===================================== rts/PrimOps.cmm ===================================== @@ -2314,22 +2314,22 @@ stg_waitReadyFd ( W_ fd, CInt rw ) (result) = ccall syncIOWaitReady(Capability_iomgr(MyCapability()) "ptr", CurrentTSO "ptr", rw, fd); - /* See Note [Encoding of I/O manager operation results to primops] */ + /* See Note [Encoding of result of I/O manager operations] */ /* case IOSubmitResultAsyncContinue */ - if (result == 0) (likely: True) { + if (result == 0::CInt) (likely: True) { /* See Note [Thread blocking for new I/O primops] */ jump stg_block_io_unit(); } /* case IOSubmitResultSyncSuccess*/ - if (result == 1) { + if (result == 1::CInt) { /* Success, don't even go via scheduler. */ return (); } /* negative numbers are -errno error codes */ - if (result < 0) { + if (result < 0::CInt) { /* See Note [Calling convention for raisePrimIOException] */ W_ dummyR1; W_ errno; dummyR1 = 0; @@ -2339,7 +2339,7 @@ stg_waitReadyFd ( W_ fd, CInt rw ) } /* case IOSubmitResultHeapOverflow */ - if (result == 2) { + if (result == 2::CInt) { jump stg_raisezh(HsIface_heapOverflow_closure(W_[ghc_hs_iface])); } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3d73b7a66c8d02181a8231be945d61c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3d73b7a66c8d02181a8231be945d61c… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/andreask/cfg-fix] Another CFG Fix
by Andreas Klebinger (＠AndreasK) 28 Aug '26

28 Aug '26

Andreas Klebinger pushed to branch wip/andreask/cfg-fix at Glasgow Haskell Compiler / GHC Commits: 601c8e8d by Andreas Klebinger at 2026-08-28T14:06:51+00:00 Another CFG Fix - - - - - 1 changed file: - compiler/GHC/CmmToAsm/X86/CodeGen.hs Changes: ===================================== compiler/GHC/CmmToAsm/X86/CodeGen.hs ===================================== @@ -514,7 +514,7 @@ assignMem_I64Code addrTree valueTree = do -- Little-endian store mov_lo = MOV II32 (OpReg rlo) (OpAddr addr) mov_hi = MOV II32 (OpReg rhi) (OpAddr (fromJust (addrOffset addr 4))) - return (vcode `appOL` addr_code `snocOL` mov_lo `snocOL` mov_hi) + return (addr_code `appOL` vcode `snocOL` mov_lo `snocOL` mov_hi) assignReg_I64Code :: CmmReg -> CmmExpr -> NatM InstrBlock View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/601c8e8d21526db86e3fe44dbd09ce9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/601c8e8d21526db86e3fe44dbd09ce9… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0