- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/amg/castz] 2 commits: WIP: introduce CastZ as an alternative to coercion zapping
by Adam Gundry (＠adamgundry) 08 Jun '25

08 Jun '25

Adam Gundry pushed to branch wip/amg/castz at Glasgow Haskell Compiler / GHC Commits: 69abb007 by Adam Gundry at 2025-06-08T19:57:27+02:00 WIP: introduce CastZ as an alternative to coercion zapping - - - - - 8f27dc29 by Adam Gundry at 2025-06-08T19:57:27+02:00 WIP: switch from CastZ to Cast + CastCoercion - - - - - 51 changed files: - compiler/GHC/Core.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/FVs.hs - compiler/GHC/Core/LateCC/OverloadedCalls.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Map/Expr.hs - compiler/GHC/Core/Map/Type.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/DmdAnal.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/SetLevels.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Seq.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Stats.hs - compiler/GHC/Core/Subst.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Ppr.hs - compiler/GHC/Core/TyCo/Ppr.hs-boot - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCo/Rep.hs-boot - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/TyCo/Tidy.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToIface.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Foreign/Prim.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Type.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Tc/Instance/Class.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/Types/EvTerm.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Id/Make.hs - docs/core-spec/CoreLint.ott - docs/core-spec/CoreSyn.ott - docs/core-spec/OpSem.ott The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ab7a57fd3ab3003ff3cfac12b675f0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ab7a57fd3ab3003ff3cfac12b675f0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T25974] 60 commits: Track rewriter sets more accurately in constraint solving
by Serge S. Gulin (＠gulin.serge) 08 Jun '25

08 Jun '25

Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC Commits: ac9fb269 by Simon Peyton Jones at 2025-05-20T09:19:04-04:00 Track rewriter sets more accurately in constraint solving This MR addresses #26003, by refactoring the arcane intricacies of Note [Equalities with incompatible kinds]. NB: now retitled to Note [Equalities with heterogeneous kinds]. and the main Note for this MR. In particular: * Abandon invariant (COERCION-HOLE) in Note [Unification preconditions] in GHC.Tc.Utils.Unify. * Abandon invariant (TyEq:CH)) in Note [Canonical equalities] in GHC.Tc.Types.Constraint. * Instead: add invariant (REWRITERS) to Note [Unification preconditions]: unify only if the constraint has an empty rewriter set. Implementation: * In canEqCanLHSFinish_try_unification, skip trying unification if there is a non-empty rewriter set. * To do this, make sure the rewriter set is zonked; do so in selectNextWorkItem, which also deals with prioritisation. * When a coercion hole is filled, kick out inert equalities that have that hole as a rewriter. It might now be unlocked and available to unify. * Remove the ad-hoc `ch_hetero_kind` field of `CoercionHole`. * In `selectNextWorkItem`, priorities equalities withan empty rewriter set. * Defaulting: see (DE6) in Note [Defaulting equalities] and Note [Limited defaulting in the ambiguity check] * Concreteness checks: there is some extra faff to try to get decent error messages when the FRR (representation-polymorphism) checks fail. In partiular, add a "When unifying..." explanation when the representation-polymorphism check arose from another constraint. - - - - - 86406f48 by Cheng Shao at 2025-05-20T09:19:47-04:00 rts: fix rts_clearMemory logic when sanity checks are enabled This commit fixes an RTS assertion failure when invoking rts_clearMemory with +RTS -DS. -DS implies -DZ which asserts that free blocks contain 0xaa as the designated garbage value. Also adds the sanity way to rts_clearMemory test to prevent future regression. Closes #26011. ChatGPT Codex automatically diagnosed the issue and proposed the initial patch in a single shot, given a GHC checkout and the following prompt: --- Someone is reporting the following error when attempting to use `rts_clearMemory` with the RTS option `-DS`: ``` test.wasm: internal error: ASSERTION FAILED: file rts/sm/Storage.c, line 1216 (GHC version 9.12.2.20250327 for wasm32_unknown_wasi) Please report this as a GHC bug: https://www.haskell.org/ghc/reportabug ``` What's the culprit? How do I look into this issue? --- I manually reviewed & revised the patch, tested and submitted it. - - - - - 7147370b by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: do not allocate strings in bytecode assembler This patch refactors the compiler to avoid allocating iserv buffers for BCONPtrStr at assemble-time. Now BCONPtrStr ByteStrings are recorded as a part of CompiledByteCode, and actual allocation only happens at link-time. This refactoring is necessary for adding bytecode serialization functionality, as explained by the revised comments in this commit. - - - - - a67db612 by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: make bc_strs serializable This commit makes the bc_strs field in CompiledByteCode serializable; similar to previous commit, we preserve the ByteString directly and defer the actual allocation to link-time, as mentioned in updated comment. - - - - - 5faf34ef by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: make bc_itbls serializable This commit makes bc_itbls in CompiledByteCode serializable. A dedicated ConInfoTable datatype has been added in ghci which is the recipe for dynamically making a datacon's info table, containing the payload of the MkConInfoTable iserv message. - - - - - 2abaf8c1 by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: remove FFIInfo bookkeeping in BCO This commit removes the bc_ffis field from CompiledByteCode completely, as well as all the related bookkeeping logic in GHC.StgToByteCode. bc_ffis is actually *unused* in the rest of GHC codebase! It is merely a list of FFIInfo, which is just a remote pointer of the libffi ffi_cif struct; once we allocate the ffi_cif struct and put its pointer in a CCALL instruction, we'll never free it anyway. So there is no point of bookkeeping. - - - - - adb9e4d2 by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: make FFIInfo serializable in BCO This commit makes all the FFIInfo needed in CCALL instructions serializable. Previously, when doing STG to BCO lowering, we would allocate a libffi ffi_cif struct and keep its remote pointer as FFIInfo; but actually we can just keep the type signature as FFIInfo and defer the actual allocation to link-time. - - - - - 200f401b by Cheng Shao at 2025-05-20T17:22:19-04:00 ghci: remove redundant NewBreakModule message This commit removes the redundant NewBreakModule message from ghci: it just allocates two strings! This functionality can be implemented with existing MallocStrings in one iserv call. - - - - - ddaadca6 by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: make breakpoint module name and unit id serializable This commit makes breakpoint module name and unit id serializable, in BRK_FUN instructions as well as ModBreaks. We can simply keep the module name and unit ids, and defer the buffer allocation to link time. - - - - - a0fde202 by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: remove unused newModule This commit removes the now unused newModule function from GHC. - - - - - 68c8f140 by Cheng Shao at 2025-05-20T17:22:19-04:00 compiler: add BCONPtrFS for interned top level string literals in BCO This commit adds BCONPtrFS as a BCO non-pointer literal kind, which has the same semantics of BCONPtrStr, except it contains a FastString instead of a ByteString. By using BCONPtrFS to represent top level string literals that are already FastString in the compilation pipeline, we enjoy the FastString interning logic and avoid allocating a bunch of redundant ByteStrings for the same FastStrings, especially when we lower the BRK_FUN instruction. - - - - - f2b532bc by Peng Fan at 2025-05-20T17:23:15-04:00 hadrian: enable GHCi for loongarch64 - - - - - 8ded2330 by kwxm at 2025-05-20T17:24:07-04:00 Fix bugs in `integerRecipMod` and `integerPowMod` This fixes #26017. * `integerRecipMod x 1` now returns `(# 1 | #)` for all x; previously it incorrectly returned `(# | () #)`, indicating failure. * `integerPowMod 0 e m` now returns `(# | () #)` for e<0 and m>1, indicating failure; previously it incorrectly returned `(# 0 | #)`. - - - - - c9abb87c by Andreas Klebinger at 2025-05-20T17:24:50-04:00 Specialise: Don't float out constraint components. It was fairly complex to do so and it doesn't seem to improve anything. Nofib allocations were unaffected as well. See also Historical Note [Floating dictionaries out of cases] - - - - - 202b201c by Andreas Klebinger at 2025-05-21T10:16:14-04:00 Interpreter: Add limited support for direct primop evaluation. This commit adds support for a number of primops directly to the interpreter. This avoids the indirection of going through the primop wrapper for those primops speeding interpretation of optimized code up massively. Code involving IntSet runs about 25% faster with optimized core and these changes. For core without breakpoints it's even more pronouced and I saw reductions in runtime by up to 50%. Running GHC itself in the interpreter was sped up by ~15% through this change. Additionally this comment does a few other related changes: testsuite: * Run foundation test in ghci and ghci-opt ways to test these primops. * Vastly expand the foundation test to cover all basic primops by comparing result with the result of calling the wrapper. Interpreter: * When pushing arguments for interpreted primops extend each argument to at least word with when pushing. This avoids some issues with big endian. We can revisit this if it causes performance issues. * Restructure the stack chunk check logic. There are now macros for read accesses which might cross stack chunk boundries and macros which omit the checks which are used when we statically know we access an address in the current stack chunk. - - - - - 67a177b4 by sheaf at 2025-05-21T10:17:04-04:00 QuickLook: do a shape test before unifying This commit ensures we do a shape test before unifying. This ensures we don't try to unify a TyVarTv with a non-tyvar, e.g. alpha[tyv] := Int On the way, we refactor simpleUnifyCheck: 1. Move the checkTopShape check into simpleUnifyCheck 2. Refactors simpleUnifyCheck to return a value of the new type SimpleUnifyResult type. Now, simpleUnifyCheck returns "can unify", "cannot unify" or "dunno" (with "cannot unify" being the new result it can return). Now: - touchabilityTest is included; it it fails we return "cannot unify" - checkTopShape now returns "cannot unify" instead of "dunno" upon failure 3. Move the call to simpleUnifyCheck out of checkTouchableTyVarEq. After that, checkTouchableTyVarEq becames a simple call to checkTyEqRhs, so we inline it. This allows the logic in canEqCanLHSFinish_try_unification to be simplified. In particular, we now avoid calling 'checkTopShape' twice. Two further changes suggested by Simon were also implemented: - In canEqCanLHSFinish, if checkTyEqRhs returns PuFail with 'do_not_prevent_rewriting', we now **continue with this constraint**. This allows us to use the constraint for rewriting. - checkTyEqRhs now has a top-level check to avoid flattening a tyfam app in a top-level equality of the form alpha ~ F tys, as this is going around in circles. This simplifies the implementation without any change in behaviour. Fixes #25950 Fixes #26030 - - - - - 4020972c by sheaf at 2025-05-21T10:17:04-04:00 FixedRuntimeRepError: omit unhelpful explanation This commit tweaks the FixedRuntimeRepError case of pprTcSolverReportMsg, to avoid including an explanation which refers to a type variable that appears nowhere else. For example, the old error message could look like the following: The pattern binding does not have a fixed runtime representation. Its type is: T :: TYPE R Cannot unify ‘R’ with the type variable ‘c0’ because the former is not a concrete ‘RuntimeRep’. With this commit, we now omit the last two lines, because the concrete type variable (here 'c0') does not appear in the type displayed to the user (here 'T :: TYPE R'). - - - - - 6d058a69 by Andrea Bedini at 2025-05-21T16:00:51-04:00 Don't fail when ghcversion.h can't be found (#26018) If ghcversion.h can't be found, don't try to include it. This happens when there is no rts package in the package db and when -ghcversion-file argument isn't passed. Co-authored-by: Syvlain Henry <sylvain(a)haskus.fr> - - - - - b1212fbf by Vladislav Zavialov at 2025-05-21T16:01:33-04:00 Implement -Wpattern-namespace-specifier (#25900) In accordance with GHC Proposal #581 "Namespace-specified imports", section 2.3 "Deprecate use of pattern in import/export lists", the `pattern` namespace specifier is now deprecated. Test cases: T25900 T25900_noext - - - - - e650ec3e by Ben Gamari at 2025-05-23T03:42:46-04:00 base: Forward port changelog language from 9.12 - - - - - 94cd9ca4 by Ben Gamari at 2025-05-23T03:42:46-04:00 base: Fix RestructuredText-isms in changelog - - - - - 7722232c by Ben Gamari at 2025-05-23T03:42:46-04:00 base: Note strictness changes made in 4.16.0.0 Addresses #25886. - - - - - 3f4b823c by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker: Factor out ProddableBlocks machinery - - - - - 6e23fef2 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker: Improve efficiency of proddable blocks structure Previously the linker's "proddable blocks" check relied on a simple linked list of spans. This resulted in extremely poor complexity while linking objects with lots of small sections (e.g. objects built with split sections). Rework the mechanism to instead use a simple interval set implemented via binary search. Fixes #26009. - - - - - ea74860c by Ben Gamari at 2025-05-23T03:43:28-04:00 testsuite: Add simple functional test for ProddableBlockSet - - - - - 74c4db46 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker/PEi386: Drop check for LOAD_LIBRARY_SEARCH_*_DIRS The `LOAD_LIBRARY_SEARCH_USER_DIRS` and `LOAD_LIBRARY_SEARCH_DEFAULT_DIRS` were introduced in Windows Vista and have been available every since. As we no longer support Windows XP we can drop this check. Addresses #26009. - - - - - 972d81d6 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker/PEi386: Clean up code style - - - - - 8a1073a5 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/Hash: Factor out hashBuffer This is a useful helper which can be used for non-strings as well. - - - - - 44f509f2 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker/PEi386: Fix incorrect use of break in nested for Previously the happy path of PEi386 used `break` in a double-`for` loop resulting in redundant calls to `LoadLibraryEx`. Fixes #26052. - - - - - bfb12783 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts: Correctly mark const arguments - - - - - 08469ff8 by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker/PEi386: Don't repeatedly load DLLs Previously every DLL-imported symbol would result in a call to `LoadLibraryEx`. This ended up constituting over 40% of the runtime of `ghc --interactive -e 42` on Windows. Avoid this by maintaining a hash-set of loaded DLL names, skipping the call if we have already loaded the requested DLL. Addresses #26009. - - - - - 823d1ccf by Ben Gamari at 2025-05-23T03:43:28-04:00 rts/linker: Expand comment describing ProddableBlockSet - - - - - e9de9e0b by Sylvain Henry at 2025-05-23T15:12:34-04:00 Remove emptyModBreaks Remove emptyModBreaks and track the absence of ModBreaks with `Maybe ModBreaks`. It avoids testing for null pointers... - - - - - 17db44c5 by Ben Gamari at 2025-05-23T15:13:16-04:00 base: Expose Backtraces constructor and fields This was specified in the proposal (CLC #199) yet somehow didn't make it into the implementation. Fixes #26049. - - - - - b08c08ae by soulomoon at 2025-05-28T01:57:23+08:00 Refactor handling of imported COMPLETE pragmas from the HPT Previously, we imported COMPLETE pragmas from all modules in the Home Package Table (HPT) during type checking. However, since !13675, there may be non-below modules in the HPT from the dependency tree that we do not want to import COMPLETE pragmas from. This refactor changes the way we handle COMPLETE pragmas from the HPT to only import them from modules that are "below" the current module in the HPT. - Add hugCompleteSigsBelow to filter COMPLETE pragmas from "below" modules in the HPT, mirroring hugRulesBelow. - Move responsibility for calling hugCompleteSigsBelow to tcRnImports, storing the result in the new tcg_complete_match_env field of TcGblEnv. - Update getCompleteMatchesTcM to use tcg_complete_match_env. This refactor only affects how COMPLETE pragmas are imported from the HPT, imports from external packages are unchanged. - - - - - 16014bf8 by Hécate Kleidukos at 2025-05-28T20:09:34-04:00 Expose all of Backtraces' internals for ghc-internal Closes #26049 - - - - - a0adc30d by Ryan Hendrickson at 2025-05-30T14:12:52-04:00 haddock: Fix links to type operators - - - - - 7b64697c by Mario Blažević at 2025-05-30T14:13:41-04:00 Introduce parenBreakableList and use it in ppHsContext - - - - - 5f213bff by fendor at 2025-06-02T09:16:24+02:00 Make GHCi commands compatible with multiple home units === Design We enable all GHCi features that were previously guarded by the `inMulti` option. GHCi supported multiple home units up to a certain degree for quite a while now. The supported feature set was limited, due to a design impasse: One of the home units must be "active", e.g., there must be one `HomeUnit` whose `UnitId` is "active" which is returned when calling ```haskell do hscActiveUnitId <$> getSession ``` This makes sense in a GHC session, since you are always compiling a particular Module, but it makes less intuitive sense in an interactive session. Given an expression to evaluate, we can't easily tell in which "context" the expression should be parsed, typechecked and evaluated. That's why initially, most of GHCi features, except for `:reload`ing were disabled if the GHCi session had more than one `HomeUnitEnv`. We lift this restriction, enabling all features of GHCi for the multiple home unit case. To do this, we fundamentally change the `HomeUnitEnv` graph to be multiple home unit first. Instead of differentiating the case were we have a single home unit and multiple, we now always set up a multiple home unit session that scales seamlessly to an arbitrary amount of home units. We introduce two new `HomeUnitEnv`s that are always added to the `HomeUnitGraph`. They are: The "interactive-ghci", called the `interactiveGhciUnit`, contains the same `DynFlags` that are used by the `InteractiveContext` for interactive evaluation of expressions. This `HomeUnitEnv` is only used on the prompt of GHCi, so we may refer to it as "interactive-prompt" unit. See Note [Relation between the `InteractiveContext` and `interactiveGhciUnitId`] for discussing its role. And the "interactive-session"", called `interactiveSessionUnit` or `interactiveSessionUnitId`, which is used for loading Scripts into GHCi that are not `Target`s of any home unit, via `:load` or `:add`. Both of these "interactive" home units depend on all other `HomeUnitEnv`s that are passed as arguments on the cli. Additionally, the "interactive-ghci" unit depends on `interactive-session`. We always evaluate expressions in the context of the "interactive-ghci" session. Since "interactive-ghci" depends on all home units, we can import any `Module` from the other home units with ease. As we have a clear `HomeUnitGraph` hierarchy, we can set `interactiveGhciUnitId` as the active home unit for the full duration of the GHCi session. In GHCi, we always set `interactiveGhciUnitId` to be the currently active home unit. === Implementation Details Given this design idea, the implementation is relatively straight forward. The core insight is that a `ModuleName` is not sufficient to identify a `Module` in the `HomeUnitGraph`. Thus, large parts of the PR is simply about refactoring usages of `ModuleName` to prefer `Module`, which has a `Unit` attached and is unique over the `HomeUnitGraph`. Consequentially, most usages of `lookupHPT` are likely to be incorrect and have been replaced by `lookupHugByModule` which is keyed by a `Module`. In `GHCi/UI.hs`, we make sure there is only one location where we are actually translating `ModuleName` to a `Module`: * `lookupQualifiedModuleName` If a `ModuleName` is ambiguous, we detect this and report it to the user. To avoid repeated lookups of `ModuleName`s, we store the `Module` in the `InteractiveImport`, which additionally simplifies the interface loading. A subtle detail is that the `DynFlags` of the `InteractiveContext` are now stored both in the `HomeUnitGraph` and in the `InteractiveContext`. In UI.hs, there are multiple code paths where we are careful to update the `DynFlags` in both locations. Most importantly in `addToProgramDynFlags`. --- There is one metric increase in this commit: ------------------------- Metric Increase: T4029 ------------------------- It is an increase from 14.4 MB to 16.1 MB (+11.8%) which sounds like a pretty big regression at first. However, we argue this increase is solely caused by using more data structures for managing multiple home units in the GHCi session. In particular, due to the design decision of using three home units, the base memory usage increases... but by how much? A big contributor is the `UnitState`, of which we have three now, which on its own 260 KB per instance. That makes an additional memory usage of 520 KB, already explaining a third of the overall memory usage increase. Then we store more elements in the `HomeUnitGraph`, we have more `HomeUnitEnv` entries, etc... While we didn't chase down each byte, we looked at the memory usage over time for both `-hi` and `-hT` profiles and can say with confidence while the memory usage increased slightly, we did not introduce any space leak, as the graph looks almost identical as the memory usage graph of GHC HEAD. --- Adds testcases for GHCi multiple home units session * Test truly multiple home unit sessions, testing reload logic and code evaluation. * Test that GHCi commands such as `:all-types`, `:browse`, etc., work * Object code reloading for home modules * GHCi debugger multiple home units session - - - - - de603d01 by fendor at 2025-06-02T09:16:24+02:00 Update "loading compiled code" GHCi documentation To use object code in GHCi, the module needs to be compiled for use in GHCi. To do that, users need to compile their modules with: * `-dynamic` * `-this-unit-id interactive-session` Otherwise, the interface files will not match. - - - - - b255a8ca by Vladislav Zavialov at 2025-06-02T16:00:12-04:00 docs: Fix code example for NoListTuplePuns Without the fix, the example produces an error: Test.hs:11:3: error: [GHC-45219] • Data constructor ‘Tuple’ returns type ‘Tuple2 a b’ instead of an instance of its parent type ‘Tuple a’ • In the definition of data constructor ‘Tuple’ In the data type declaration for ‘Tuple’ Fortunately, a one line change makes it compile. - - - - - 6558467c by Ryan Hendrickson at 2025-06-06T05:46:58-04:00 haddock: Parse math even after ordinary characters Fixes a bug where math sections were not recognized if preceded by a character that isn't special (like space or a markup character). - - - - - 265d0024 by ARATA Mizuki at 2025-06-06T05:47:48-04:00 AArch64 NCG: Fix sub-word arithmetic right shift As noted in Note [Signed arithmetic on AArch64], we should zero-extend sub-word values. Fixes #26061 - - - - - 05e9be18 by Simon Hengel at 2025-06-06T05:48:35-04:00 Allow Unicode in "message" and "hints" with -fdiagnostics-as-json (fixes #26075) - - - - - bfa6b70f by ARATA Mizuki at 2025-06-06T05:49:24-04:00 x86 NCG: Fix code generation of bswap64 on i386 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> Fix #25601 - - - - - 12699cf3 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Add Wine support - - - - - 2e30e4a1 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Test build wine! - - - - - 8aec0615 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Put updated clang toolchain into bootstrap compiler's `mingw` folder - - - - - 29fbfd48 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Enable tests for cross-compiled compiler - - - - - 3ef882d7 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Update DOCKER_REV - - - - - c32b728a by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Copy mingw from boostrap compiler - - - - - 13934b9e by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Remove CROSS_EMULATOR because we are already in Wine, fix `check_msys2_deps` to support cross-target at Windows - - - - - f5cffa33 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Attempt to fix the hang to use DOCKER_REV where no whole MSYS2 system update - - - - - 34ca231f by Serge S. Gulin at 2025-06-08T19:11:37+03:00 More debug info - - - - - f47c618e by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Relax the requirements of `set_up_tarballs` Windows toolchain check - - - - - 76d7f28e by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Add `.exe` to `WindresCmd` environment var and more debugging info around it - - - - - 61d719f9 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Rewrite `fetch_cabal` in same fashion as `fetch_ghc`, introduce `cross_target_exe` suffix for cross-compile windows builds - - - - - bc750949 by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Manually pass "WindresCmd" from parent process to child to fix MSYS2 behaviour at Wine - - - - - 2aba389a by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Localize `$toolchain`, change `$PATH` only when `TOOLCHAIN_SOURCE=extracted`, make test to force recomp - - - - - 55104c9d by Serge S. Gulin at 2025-06-08T19:11:37+03:00 Extend PATH to make cross-compiler test green for Windows AArch64 - - - - - 364 changed files: - .gitignore - .gitlab-ci.yml - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - boot - compiler/GHC.hs - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/ByteCode/Asm.hs - compiler/GHC/ByteCode/InfoTable.hs - compiler/GHC/ByteCode/Instr.hs - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCo/Tidy.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/Env.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Breakpoints.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Unbound.hs - compiler/GHC/Runtime/Context.hs - compiler/GHC/Runtime/Debugger/Breakpoints.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Interpreter.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/StgToJS/Linker/Linker.hs - compiler/GHC/SysTools/Cpp.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Plugin.hs - compiler/GHC/Tc/Solver.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Tc/Zonk/TcType.hs - compiler/GHC/Types/Error.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Hint.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Types/Name/Ppr.hs - compiler/GHC/Unit/Env.hs - compiler/GHC/Unit/Home/Graph.hs - compiler/GHC/Unit/Types.hs - configure.ac - docs/users_guide/9.14.1-notes.rst - docs/users_guide/exts/data_kinds.rst - docs/users_guide/ghci.rst - docs/users_guide/using-warnings.rst - ghc/GHCi/UI.hs - ghc/GHCi/UI/Exception.hs - ghc/GHCi/UI/Info.hs - ghc/GHCi/UI/Monad.hs - ghc/Main.hs - hadrian/src/Builder.hs - hadrian/src/Flavour.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Rules/BinaryDist.hs - libraries/base/changelog.md - libraries/base/src/Control/Exception/Backtrace.hs - libraries/ghc-internal/src/GHC/Internal/Bignum/Integer.hs - libraries/ghc-internal/src/GHC/Internal/Data/Typeable/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows.hsc - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs - libraries/ghc-internal/src/GHC/Internal/Type/Reflection.hs - libraries/ghc-internal/src/GHC/Internal/TypeLits.hs - libraries/ghc-internal/src/GHC/Internal/TypeNats.hs - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/Run.hs - m4/find_merge_objects.m4 - m4/fp_settings.m4 - m4/fp_setup_windows_toolchain.m4 - rts/Disassembler.c - rts/Hash.c - rts/Hash.h - rts/Interpreter.c - rts/Linker.c - rts/LinkerInternals.h - rts/PathUtils.c - rts/PathUtils.h - rts/include/rts/Bytecodes.h - rts/linker/Elf.c - rts/linker/MachO.c - rts/linker/PEi386.c - rts/linker/PEi386.h - + rts/linker/ProddableBlocks.c - + rts/linker/ProddableBlocks.h - rts/rts.cabal - rts/sm/Storage.h - testsuite/driver/testlib.py - testsuite/tests/bytecode/T22376/all.T - testsuite/tests/callarity/unittest/CallArity1.hs - + testsuite/tests/cmm/should_run/T25601.hs - + testsuite/tests/cmm/should_run/T25601.stdout - + testsuite/tests/cmm/should_run/T25601a.cmm - testsuite/tests/cmm/should_run/all.T - + testsuite/tests/codeGen/should_run/T26061.hs - + testsuite/tests/codeGen/should_run/T26061.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/dependent/should_fail/T11471.stderr - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/driver/Makefile - testsuite/tests/driver/T8526/T8526.stdout - testsuite/tests/driver/all.T - testsuite/tests/driver/fat-iface/fat014.stdout - testsuite/tests/driver/json.stderr - testsuite/tests/driver/json_warn.stderr - testsuite/tests/driver/multipleHomeUnits/multiGHCi.stderr - testsuite/tests/ffi/should_run/all.T - testsuite/tests/ghc-api/T6145.hs - testsuite/tests/ghc-api/annotations-literals/literals.hs - testsuite/tests/ghc-api/annotations-literals/parsed.hs - testsuite/tests/ghc-api/apirecomp001/myghc.hs - testsuite/tests/ghc-api/fixed-nodes/T1.hs - + testsuite/tests/ghci.debugger/scripts/break031/Makefile - + testsuite/tests/ghci.debugger/scripts/break031/a/A.hs - + testsuite/tests/ghci.debugger/scripts/break031/all.T - + testsuite/tests/ghci.debugger/scripts/break031/b/B.hs - + testsuite/tests/ghci.debugger/scripts/break031/break031a.script - + testsuite/tests/ghci.debugger/scripts/break031/break031a.stdout - + testsuite/tests/ghci.debugger/scripts/break031/break031b.script - + testsuite/tests/ghci.debugger/scripts/break031/break031b.stderr - + testsuite/tests/ghci.debugger/scripts/break031/break031b.stdout - + testsuite/tests/ghci.debugger/scripts/break031/unitA - + testsuite/tests/ghci.debugger/scripts/break031/unitB - + testsuite/tests/ghci/all.T - + testsuite/tests/ghci/ghci-mem-primops.hs - + testsuite/tests/ghci/ghci-mem-primops.script - + testsuite/tests/ghci/ghci-mem-primops.stdout - testsuite/tests/ghci/linking/dyn/T3372.hs - + testsuite/tests/ghci/prog-mhu001/Makefile - + testsuite/tests/ghci/prog-mhu001/all.T - + testsuite/tests/ghci/prog-mhu001/e/E.hs - + testsuite/tests/ghci/prog-mhu001/prog-mhu001a.script - + testsuite/tests/ghci/prog-mhu001/prog-mhu001a.stdout - + testsuite/tests/ghci/prog-mhu001/prog-mhu001b.script - + testsuite/tests/ghci/prog-mhu001/prog-mhu001b.stdout - + testsuite/tests/ghci/prog-mhu001/prog-mhu001c.script - + testsuite/tests/ghci/prog-mhu001/prog-mhu001c.stdout - + testsuite/tests/ghci/prog-mhu001/prog-mhu001d.script - + testsuite/tests/ghci/prog-mhu001/prog-mhu001d.stdout - + testsuite/tests/ghci/prog-mhu001/prog-mhu001e.script - + testsuite/tests/ghci/prog-mhu001/prog-mhu001e.stdout - + testsuite/tests/ghci/prog-mhu001/prog-mhu001f.script - + testsuite/tests/ghci/prog-mhu001/prog-mhu001f.stdout - + testsuite/tests/ghci/prog-mhu001/unitE - + testsuite/tests/ghci/prog-mhu001/unitE-main-is - + testsuite/tests/ghci/prog-mhu002/Makefile - + testsuite/tests/ghci/prog-mhu002/a/A.hs - + testsuite/tests/ghci/prog-mhu002/all.T - + testsuite/tests/ghci/prog-mhu002/b/B.hs - + testsuite/tests/ghci/prog-mhu002/c/C.hs - + testsuite/tests/ghci/prog-mhu002/d/Main.hs - + testsuite/tests/ghci/prog-mhu002/prog-mhu002a.script - + testsuite/tests/ghci/prog-mhu002/prog-mhu002a.stderr - + testsuite/tests/ghci/prog-mhu002/prog-mhu002a.stdout - + testsuite/tests/ghci/prog-mhu002/prog-mhu002b.script - + testsuite/tests/ghci/prog-mhu002/prog-mhu002b.stderr - + testsuite/tests/ghci/prog-mhu002/prog-mhu002b.stdout - + testsuite/tests/ghci/prog-mhu002/prog-mhu002c.script - + testsuite/tests/ghci/prog-mhu002/prog-mhu002c.stdout - + testsuite/tests/ghci/prog-mhu002/prog-mhu002d.script - + testsuite/tests/ghci/prog-mhu002/prog-mhu002d.stdout - + testsuite/tests/ghci/prog-mhu002/prog-mhu002e.script - + testsuite/tests/ghci/prog-mhu002/prog-mhu002e.stdout - + testsuite/tests/ghci/prog-mhu002/prog-mhu002f.script - + testsuite/tests/ghci/prog-mhu002/prog-mhu002f.stdout - + testsuite/tests/ghci/prog-mhu002/unitA - + testsuite/tests/ghci/prog-mhu002/unitB - + testsuite/tests/ghci/prog-mhu002/unitC - + testsuite/tests/ghci/prog-mhu002/unitD - + testsuite/tests/ghci/prog-mhu003/Makefile - + testsuite/tests/ghci/prog-mhu003/a/A.hs - + testsuite/tests/ghci/prog-mhu003/all.T - + testsuite/tests/ghci/prog-mhu003/b/Foo.hs - + testsuite/tests/ghci/prog-mhu003/c/C.hs - + testsuite/tests/ghci/prog-mhu003/d/Foo.hs - + testsuite/tests/ghci/prog-mhu003/prog-mhu003.script - + testsuite/tests/ghci/prog-mhu003/prog-mhu003.stderr - + testsuite/tests/ghci/prog-mhu003/prog-mhu003.stdout - + testsuite/tests/ghci/prog-mhu003/unitA - + testsuite/tests/ghci/prog-mhu003/unitB - + testsuite/tests/ghci/prog-mhu003/unitC - + testsuite/tests/ghci/prog-mhu003/unitD - + testsuite/tests/ghci/prog-mhu004/Makefile - + testsuite/tests/ghci/prog-mhu004/a/Foo.hs - + testsuite/tests/ghci/prog-mhu004/all.T - + testsuite/tests/ghci/prog-mhu004/b/Foo.hs - + testsuite/tests/ghci/prog-mhu004/prog-mhu004a.script - + testsuite/tests/ghci/prog-mhu004/prog-mhu004a.stderr - + testsuite/tests/ghci/prog-mhu004/prog-mhu004a.stdout - + testsuite/tests/ghci/prog-mhu004/prog-mhu004b.script - + testsuite/tests/ghci/prog-mhu004/prog-mhu004b.stdout - + testsuite/tests/ghci/prog-mhu004/unitA - + testsuite/tests/ghci/prog-mhu004/unitB - testsuite/tests/ghci/prog010/ghci.prog010.script - testsuite/tests/ghci/prog018/prog018.stdout - + testsuite/tests/ghci/prog020/A.hs - + testsuite/tests/ghci/prog020/B.hs - + testsuite/tests/ghci/prog020/Makefile - + testsuite/tests/ghci/prog020/all.T - + testsuite/tests/ghci/prog020/ghci.prog020.script - + testsuite/tests/ghci/prog020/ghci.prog020.stderr - + testsuite/tests/ghci/prog020/ghci.prog020.stdout - testsuite/tests/ghci/scripts/T13869.stdout - testsuite/tests/ghci/scripts/T13997.stdout - testsuite/tests/ghci/scripts/T17669.stdout - testsuite/tests/ghci/scripts/T18330.stdout - testsuite/tests/ghci/scripts/T1914.stdout - testsuite/tests/ghci/scripts/T20217.stdout - testsuite/tests/ghci/scripts/T20587.stdout - testsuite/tests/ghci/scripts/T21110.stderr - testsuite/tests/ghci/scripts/T6105.stdout - testsuite/tests/ghci/scripts/T8042.stdout - testsuite/tests/ghci/scripts/T8042recomp.stdout - testsuite/tests/ghci/scripts/ghci024.stdout - testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 - testsuite/tests/ghci/scripts/ghci058.script - testsuite/tests/ghci/should_run/TopEnvIface.stdout - testsuite/tests/indexed-types/should_fail/T8227.stderr - testsuite/tests/indexed-types/should_fail/T9662.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/interface-stability/base-exports.stdout-ws-32 - + testsuite/tests/lib/integer/T26017.hs - + testsuite/tests/lib/integer/T26017.stdout - testsuite/tests/lib/integer/all.T - testsuite/tests/lib/integer/integerRecipMod.hs - testsuite/tests/lib/integer/integerRecipMod.stdout - testsuite/tests/numeric/should_run/all.T - testsuite/tests/numeric/should_run/foundation.hs - testsuite/tests/numeric/should_run/foundation.stdout - + testsuite/tests/parser/should_compile/T25900.hs - + testsuite/tests/parser/should_compile/T25900.stderr - + testsuite/tests/parser/should_compile/T25900_noext.hs - + testsuite/tests/parser/should_compile/T25900_noext.stderr - testsuite/tests/parser/should_compile/all.T - testsuite/tests/partial-sigs/should_fail/T14040a.stderr - testsuite/tests/partial-sigs/should_fail/T14584.stderr - testsuite/tests/patsyn/should_compile/ImpExp_Exp.hs - testsuite/tests/patsyn/should_compile/T11959.hs - testsuite/tests/patsyn/should_compile/T11959.stderr - testsuite/tests/patsyn/should_compile/T11959Lib.hs - testsuite/tests/patsyn/should_compile/T13350/boolean/Boolean.hs - testsuite/tests/patsyn/should_compile/T22521.hs - testsuite/tests/patsyn/should_compile/T9857.hs - testsuite/tests/patsyn/should_compile/export.hs - testsuite/tests/perf/should_run/ByteCodeAsm.hs - testsuite/tests/pmcheck/complete_sigs/T25115a.hs - testsuite/tests/pmcheck/should_compile/T11822.hs - testsuite/tests/polykinds/T14172.stderr - testsuite/tests/polykinds/T14270.hs - testsuite/tests/polykinds/T14846.stderr - testsuite/tests/quasiquotation/T7918.hs - testsuite/tests/rename/should_compile/T12548.hs - testsuite/tests/rename/should_fail/T25056.stderr - testsuite/tests/rename/should_fail/T25056a.hs - testsuite/tests/rep-poly/RepPolyArgument.stderr - testsuite/tests/rep-poly/RepPolyBackpack1.stderr - testsuite/tests/rep-poly/RepPolyBinder.stderr - testsuite/tests/rep-poly/RepPolyDoBind.stderr - testsuite/tests/rep-poly/RepPolyDoBody1.stderr - testsuite/tests/rep-poly/RepPolyDoBody2.stderr - testsuite/tests/rep-poly/RepPolyLeftSection2.stderr - testsuite/tests/rep-poly/RepPolyMagic.stderr - testsuite/tests/rep-poly/RepPolyMcBind.stderr - testsuite/tests/rep-poly/RepPolyMcBody.stderr - testsuite/tests/rep-poly/RepPolyMcGuard.stderr - testsuite/tests/rep-poly/RepPolyNPlusK.stderr - testsuite/tests/rep-poly/RepPolyPatBind.stderr - testsuite/tests/rep-poly/RepPolyRecordUpdate.stderr - testsuite/tests/rep-poly/RepPolyRightSection.stderr - testsuite/tests/rep-poly/RepPolyRule1.stderr - testsuite/tests/rep-poly/RepPolyTuple.stderr - testsuite/tests/rep-poly/RepPolyTuple4.stderr - testsuite/tests/rep-poly/RepPolyTupleSection.stderr - testsuite/tests/rep-poly/RepPolyWrappedVar.stderr - testsuite/tests/rep-poly/T11473.stderr - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/rep-poly/T12973.stderr - testsuite/tests/rep-poly/T13233.stderr - testsuite/tests/rep-poly/T13929.stderr - testsuite/tests/rep-poly/T14561.stderr - testsuite/tests/rep-poly/T14561b.stderr - testsuite/tests/rep-poly/T17817.stderr - testsuite/tests/rep-poly/T19615.stderr - testsuite/tests/rep-poly/T19709b.stderr - testsuite/tests/rep-poly/T21906.stderr - testsuite/tests/rep-poly/T23903.stderr - testsuite/tests/rep-poly/UnliftedNewtypesCoerceFail.stderr - + testsuite/tests/rts/TestProddableBlockSet.c - testsuite/tests/rts/all.T - testsuite/tests/simplCore/should_compile/T15186.hs - testsuite/tests/simplCore/should_compile/T15186A.hs - testsuite/tests/simplCore/should_compile/simpl017.stderr - testsuite/tests/typecheck/no_skolem_info/T14040.stderr - testsuite/tests/typecheck/should_compile/T25266a.stderr - + testsuite/tests/typecheck/should_compile/T26030.hs - testsuite/tests/typecheck/should_compile/TypeRepCon.hs - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/T16204c.stderr - + testsuite/tests/typecheck/should_fail/T25950.hs - + testsuite/tests/typecheck/should_fail/T25950.stderr - testsuite/tests/typecheck/should_fail/T7696.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/warnings/should_compile/DataToTagWarnings.hs - testsuite/tests/warnings/should_compile/T14794a.hs - testsuite/tests/warnings/should_compile/T14794a.stderr - testsuite/tests/warnings/should_compile/T14794b.hs - testsuite/tests/warnings/should_compile/T14794b.stderr - testsuite/tests/warnings/should_compile/T14794c.hs - testsuite/tests/warnings/should_compile/T14794c.stderr - testsuite/tests/warnings/should_compile/T14794d.hs - testsuite/tests/warnings/should_compile/T14794d.stderr - testsuite/tests/warnings/should_compile/T14794e.hs - testsuite/tests/warnings/should_compile/T14794e.stderr - testsuite/tests/warnings/should_compile/T14794f.hs - testsuite/tests/warnings/should_compile/T14794f.stderr - testsuite/tests/wcompat-warnings/Template.hs - + testsuite/tests/wcompat-warnings/WCompatWarningsOn.stderr - utils/genprimopcode/Main.hs - utils/genprimopcode/Syntax.hs - utils/haddock/haddock-api/resources/html/Linuwial.std-theme/linuwial.css - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Utils.hs - utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs - utils/haddock/haddock-library/src/Documentation/Haddock/Parser.hs - utils/haddock/haddock-library/test/Documentation/Haddock/ParserSpec.hs - utils/haddock/html-test/ref/Bug1004.html - utils/haddock/html-test/ref/Bug548.html - utils/haddock/html-test/ref/Bug973.html - utils/haddock/html-test/ref/Hash.html - utils/haddock/html-test/ref/ImplicitParams.html - utils/haddock/html-test/ref/Instances.html - utils/haddock/html-test/ref/PatternSyns.html - utils/haddock/html-test/ref/TypeOperators.html - utils/haddock/html-test/src/TypeOperators.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a555aae827f87d125079ec458087ae… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a555aae827f87d125079ec458087ae… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/az/ghc-cpp] More GHC_CPP diagnostic results
by Alan Zimmerman (＠alanz) 08 Jun '25

08 Jun '25

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC Commits: e4bb059f by Alan Zimmerman at 2025-06-08T17:25:24+02:00 More GHC_CPP diagnostic results - - - - - 5 changed files: - compiler/GHC/Parser/PreProcess.hs - compiler/GHC/Parser/PreProcess/Macro.hs - compiler/GHC/Parser/PreProcess/State.hs - testsuite/tests/ghc-cpp/GhcCpp02.hs - testsuite/tests/ghc-cpp/GhcCpp02.stderr Changes: ===================================== compiler/GHC/Parser/PreProcess.hs ===================================== @@ -270,7 +270,7 @@ processCpp loc s = do Right (CppUndef name) -> do ppUndef name Right (CppIf cond) -> do - val <- cppCond cond + val <- cppCond loc cond ar <- pushAccepting val acceptStateChange ar Right (CppIfdef name) -> do @@ -286,7 +286,7 @@ processCpp loc s = do ar <- setAccepting loc (text "#else") (not accepting) acceptStateChange ar Right (CppElIf cond) -> do - val <- cppCond cond + val <- cppCond loc cond ar <- setAccepting loc (text "#elif") val acceptStateChange ar Right CppEndif -> do ===================================== compiler/GHC/Parser/PreProcess/Macro.hs ===================================== @@ -32,29 +32,35 @@ details -- TODO: Parse tokens with original locations in them. -import qualified Data.Map as Map +import Data.Map qualified as Map import Data.Maybe +import Data.Semigroup qualified as S import GHC.Parser.PreProcess.Eval import GHC.Parser.PreProcess.ParsePP import GHC.Parser.PreProcess.Parser qualified as Parser import GHC.Parser.PreProcess.ParserM import GHC.Parser.PreProcess.State -import qualified Data.Semigroup as S import GHC.Prelude +import GHC.Types.SrcLoc +import GHC.Utils.Outputable -- --------------------------------------------------------------------- -- We evaluate to an Int, which we convert to a bool -cppCond :: String -> PP Bool -cppCond str = do - s <- getPpState - let - expanded = expand (pp_defines s) str - v = case Parser.parseExpr expanded of - Left err -> error $ "parseExpr:" ++ show (err, expanded) - Right tree -> eval tree - return (toBool v) +cppCond :: SrcSpan -> String -> PP Bool +cppCond loc str = do + s <- getPpState + let + expanded = expand (pp_defines s) str + v <- case Parser.parseExpr expanded of + Left err -> do + addGhcCPPError loc + (hang (text "Error evaluating CPP condition:") 2 + (text err <+> text "of" $+$ text expanded)) + return 0 + Right tree -> return (eval tree) + return (toBool v) -- --------------------------------------------------------------------- @@ -75,31 +81,32 @@ expandToks 0 _ ts = error $ "macro_expansion limit (" ++ show maxExpansions ++ " expandToks cnt s ts = let (!expansionDone, !r) = doExpandToks False s ts - in + in if expansionDone - then expandToks (cnt -1) s r + then expandToks (cnt - 1) s r else r doExpandToks :: Bool -> MacroDefines -> [Token] -> (Bool, [Token]) doExpandToks ed _ [] = (ed, []) -doExpandToks ed s (TIdentifierLParen n: ts) = - -- TIdentifierLParen has no meaning here (only in a #define), so - -- restore it to its constituent tokens - doExpandToks ed s (TIdentifier (init n):TOpenParen "(":ts) -doExpandToks _ s (TIdentifier "defined" : ts) = (True, rest) - -- See Note: [defined unary operator] below +doExpandToks ed s (TIdentifierLParen n : ts) = + -- TIdentifierLParen has no meaning here (only in a #define), so + -- restore it to its constituent tokens + doExpandToks ed s (TIdentifier (init n) : TOpenParen "(" : ts) +doExpandToks _ s (TIdentifier "defined" : ts) = (True, rest) where + -- See Note: [defined unary operator] below + rest = case getExpandArgs ts of - (Just [[TIdentifier macro_name]], rest0) -> - case Map.lookup macro_name s of - Nothing -> TInteger "0" : rest0 - Just _ ->TInteger "1" : rest0 - (Nothing, TIdentifier macro_name:ts0) -> - case Map.lookup macro_name s of - Nothing -> TInteger "0" : ts0 - Just _ ->TInteger "1" : ts0 - (Nothing,_) -> error $ "defined: expected an identifier, got:" ++ show ts - (Just args,_) -> error $ "defined: expected a single arg, got:" ++ show args + (Just [[TIdentifier macro_name]], rest0) -> + case Map.lookup macro_name s of + Nothing -> TInteger "0" : rest0 + Just _ -> TInteger "1" : rest0 + (Nothing, TIdentifier macro_name : ts0) -> + case Map.lookup macro_name s of + Nothing -> TInteger "0" : ts0 + Just _ -> TInteger "1" : ts0 + (Nothing, _) -> error $ "defined: expected an identifier, got:" ++ show ts + (Just args, _) -> error $ "defined: expected a single arg, got:" ++ show args doExpandToks ed s (TIdentifier n : ts) = (ed'', expanded ++ rest) where (ed', expanded, ts') = case Map.lookup n s of ===================================== compiler/GHC/Parser/PreProcess/State.hs ===================================== @@ -238,18 +238,6 @@ acceptingStateChange old new = -- Exit a scope group popAccepting :: SrcSpan -> PP AcceptingResult --- popAccepting = --- P $ \s -> --- let --- current = scopeValue $ pp_scope (pp s) --- new_scope = case pp_scope (pp s) of --- c :| [] -> c :| [] --- -- c :| [] -> (trace ("popAccepting:keeping old:" ++ show c) c) :| [] --- _ :| (h : t) -> h :| t --- in --- POk --- s{pp = (pp s){pp_scope = new_scope}} --- (acceptingStateChange current (scopeValue new_scope)) popAccepting loc = do scopes <- getScopes new_scope <- case scopes of ===================================== testsuite/tests/ghc-cpp/GhcCpp02.hs ===================================== @@ -5,3 +5,10 @@ foo = #else 13 #endif + +#define EXISTENT_MACRO(X) 2 + NONEXISTENT_MACRO(X) + +-- Note the evaluation error is reported on the *expanded* macro +#if EXISTENT_MACRO(4) +bar = 3 +#endif ===================================== testsuite/tests/ghc-cpp/GhcCpp02.stderr ===================================== @@ -2,3 +2,8 @@ GhcCpp02.hs:5:1: error: [GHC-93098] #else without #if GhcCpp02.hs:7:1: error: [GHC-93098] #endif without #if +GhcCpp02.hs:12:1: error: [GHC-93098] + Error evaluating CPP condition: + Parse error at line 1, column 23 of + 2 + NONEXISTENT_MACRO ( 4 ) + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e4bb059f18a7d11e494875fe7bbc78e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e4bb059f18a7d11e494875fe7bbc78e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/amg/castz] WIP: switch from CastZ to Cast + CastCoercion
by Adam Gundry (＠adamgundry) 08 Jun '25

08 Jun '25

Adam Gundry pushed to branch wip/amg/castz at Glasgow Haskell Compiler / GHC Commits: ab7a57fd by Adam Gundry at 2025-06-08T17:22:42+02:00 WIP: switch from CastZ to Cast + CastCoercion - - - - - 65 changed files: - compiler/GHC/Core.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/FVs.hs - compiler/GHC/Core/LateCC/OverloadedCalls.hs - compiler/GHC/Core/LateCC/TopLevelBinds.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Map/Expr.hs - compiler/GHC/Core/Map/Type.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/CSE.hs - compiler/GHC/Core/Opt/CallArity.hs - compiler/GHC/Core/Opt/CallerCC.hs - compiler/GHC/Core/Opt/ConstantFold.hs - compiler/GHC/Core/Opt/CprAnal.hs - compiler/GHC/Core/Opt/DmdAnal.hs - compiler/GHC/Core/Opt/Exitify.hs - compiler/GHC/Core/Opt/FloatIn.hs - compiler/GHC/Core/Opt/FloatOut.hs - compiler/GHC/Core/Opt/LiberateCase.hs - compiler/GHC/Core/Opt/OccurAnal.hs - compiler/GHC/Core/Opt/SetLevels.hs - compiler/GHC/Core/Opt/Simplify/Iteration.hs - compiler/GHC/Core/Opt/Simplify/Utils.hs - compiler/GHC/Core/Opt/SpecConstr.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Opt/StaticArgs.hs - compiler/GHC/Core/Opt/WorkWrap.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Seq.hs - compiler/GHC/Core/SimpleOpt.hs - compiler/GHC/Core/Stats.hs - compiler/GHC/Core/Subst.hs - compiler/GHC/Core/Tidy.hs - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Ppr.hs - compiler/GHC/Core/TyCo/Ppr.hs-boot - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCo/Rep.hs-boot - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/TyCo/Tidy.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/CoreToIface.hs - compiler/GHC/CoreToStg.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Foreign/Prim.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/HsToCore/Pmc/Solver.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Tidy.hs - compiler/GHC/Iface/Type.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Tc/Instance/Class.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/Types/EvTerm.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Id/Make.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ab7a57fd3ab3003ff3cfac12b675f05… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ab7a57fd3ab3003ff3cfac12b675f05… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/coverage] Deleted 2 commits: hadrian: Add attoparsec and dependencies
by Ben Gamari (＠bgamari) 08 Jun '25

08 Jun '25

Ben Gamari pushed to branch wip/coverage at Glasgow Haskell Compiler / GHC WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: ad06343d by Ben Gamari at 2025-06-08T10:07:40-04:00 hadrian: Add attoparsec and dependencies - - - - - c871cf34 by Ben Gamari at 2025-06-08T10:09:24-04:00 WIP submodule bumps - - - - - 5 changed files: - .gitmodules - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - libraries/hpc - utils/hpc Changes: ===================================== .gitmodules ===================================== @@ -118,3 +118,12 @@ [submodule "libraries/file-io"] path = libraries/file-io url = https://gitlab.haskell.org/ghc/packages/file-io.git +[submodule "libraries/attoparsec"] + path = libraries/attoparsec + url = https://github.com/haskell/attoparsec +[submodule "libraries/scientific"] + path = libraries/scientific + url = https://github.com/basvandijk/scientific +[submodule "libraries/integer-logarithms"] + path = libraries/integer-logarithms + url = https://github.com/haskellari/integer-logarithms ===================================== hadrian/src/Packages.hs ===================================== @@ -1,15 +1,15 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} module Packages ( -- * GHC packages - array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, + attoparsec, array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, fileio, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, - hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, + hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, - runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, + runGhc, scientific, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, @@ -33,13 +33,13 @@ import Oracles.Setting -- packages and modify build default build conditions in "UserSettings". ghcPackages :: [Package] ghcPackages = - [ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps + [ attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps , compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls , exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs - , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString - , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell + , hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, libffi, mtl, osString + , parsec, pretty, process, rts, runGhc, scientific, stm, semaphoreCompat, templateHaskell , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout , lintersCommon @@ -50,17 +50,18 @@ isGhcPackage :: Package -> Bool isGhcPackage = (`elem` ghcPackages) -- | Package definitions, see 'Package'. -array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, +attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, - hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, + hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, remoteIserv, libffi, mtl, osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace :: Package +attoparsec = lib "attoparsec" array = lib "array" base = lib "base" binary = lib "binary" @@ -109,6 +110,7 @@ hp2ps = util "hp2ps" hpc = lib "hpc" hpcBin = util "hpc-bin" `setPath` "utils/hpc" integerGmp = lib "integer-gmp" +integerLogarithms = lib "integer-logarithms" iserv = util "iserv" iservProxy = util "iserv-proxy" libffi = top "libffi" @@ -121,6 +123,7 @@ process = lib "process" remoteIserv = util "remote-iserv" rts = top "rts" runGhc = util "runghc" +scientific = lib "scientific" semaphoreCompat = lib "semaphore-compat" stm = lib "stm" templateHaskell = lib "template-haskell" ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -80,7 +80,8 @@ stageBootPackages = return stage0Packages :: Action [Package] stage0Packages = do cross <- flag CrossCompiling - return $ [ cabalSyntax + return $ [ attoparsec + , cabalSyntax , cabal , compiler , directory -- depends on filepath, fileIo @@ -102,9 +103,11 @@ stage0Packages = do , hpc , hpcBin , hsc2hs + , integerLogarithms , osString -- new library not yet present for boot compilers , process -- depends on filepath , runGhc + , scientific , semaphoreCompat -- depends on , time -- depends on win32 , unlit ===================================== libraries/hpc ===================================== @@ -1 +1 @@ -Subproject commit 9e29abb785ab4f82c37c7a4e73ec999083955b09 +Subproject commit aa19d28b10bc35a675687d3f41e8924fe2c4cdf9 ===================================== utils/hpc ===================================== @@ -1 +1 @@ -Subproject commit d1780eb21c1e5a1227fff80c8d325d5142f04255 +Subproject commit 61ee79de0d50aef35a7fe8989d6fff5607774899 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3cff01eec1bdbca4128a3d0cfa0505… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3cff01eec1bdbca4128a3d0cfa0505… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/az/ghc-cpp] Starting to report GHC_CPP errors using GHC machinery
by Alan Zimmerman (＠alanz) 08 Jun '25

08 Jun '25

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC Commits: b70fb2a2 by Alan Zimmerman at 2025-06-08T16:16:16+02:00 Starting to report GHC_CPP errors using GHC machinery - - - - - 10 changed files: - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PreProcess.hs - compiler/GHC/Parser/PreProcess/State.hs - compiler/GHC/Types/Error/Codes.hs - + testsuite/tests/ghc-cpp/GhcCpp02.stderr - testsuite/tests/ghc-cpp/all.T - utils/check-cpp/PreProcess.hs - utils/check-cpp/State.hs Changes: ===================================== compiler/GHC/Parser/Errors/Ppr.hs ===================================== @@ -573,6 +573,9 @@ instance Diagnostic PsMessage where -> mkSimpleDecorated $ text "The" <+> quotes (text "pattern") <+> "namespace specifier is deprecated." + PsErrGhcCpp content + -> mkSimpleDecorated content + diagnosticReason = \case PsUnknownMessage m -> diagnosticReason m PsHeaderMessage m -> psHeaderMessageReason m @@ -695,6 +698,7 @@ instance Diagnostic PsMessage where PsErrSpecExprMultipleTypeAscription{} -> ErrorWithoutFlag PsWarnSpecMultipleTypeAscription{} -> WarningWithFlag Opt_WarnDeprecatedPragmas PsWarnPatternNamespaceSpecifier{} -> WarningWithFlag Opt_WarnPatternNamespaceSpecifier + PsErrGhcCpp{} -> ErrorWithoutFlag -- AZ: Is this correct? diagnosticHints = \case PsUnknownMessage m -> diagnosticHints m @@ -873,6 +877,7 @@ instance Diagnostic PsMessage where let info = text "and replace" <+> quotes (text "pattern") <+> text "with" <+> quotes (text "data") <> "." in [useExtensionInOrderTo info LangExt.ExplicitNamespaces] + PsErrGhcCpp{} -> noHints diagnosticCode = constructorCode @GHC ===================================== compiler/GHC/Parser/Errors/Types.hs ===================================== @@ -515,6 +515,9 @@ data PsMessage | PsWarnPatternNamespaceSpecifier !Bool -- ^ Is ExplicitNamespaces on? + -- | An error originating from processing a GHC_CPP directive + | PsErrGhcCpp !SDoc + deriving Generic -- | Extra details about a parse error, which helps ===================================== compiler/GHC/Parser/Lexer.x ===================================== @@ -335,9 +335,9 @@ $unigraphic / { isSmartQuote } { smart_quote_error } ^\# \ * $idchar+ .*\n / { ifExtensionGhcCppNotComment } { cppSkip } -- No leading space, otherwise clashes with OverloadedLabels - ^\# pragma .* \n / { ifExtensionGhcCppNotComment } { cppSkip } -- GCC 3.3 CPP generated, apparently - ^\# \! .* \n / { ifExtensionGhcCppNotComment } { cppSkip } -- #!, for scripts -- gcc - ^\ \# \! .* \n / { ifExtensionGhcCppNotComment } { cppSkip } -- #!, for scripts -- clang; See #6132 + ^\# pragma .* \n / { ifExtensionGhcCppNotComment } { cppSkip } -- GCC 3.3 CPP generated, apparently + ^\# \! .* \n / { ifExtensionGhcCppNotComment } { cppSkip } -- #!, for scripts -- gcc + ^\ \# \! .* \n / { ifExtensionGhcCppNotComment } { cppSkip } -- #!, for scripts -- clang; See #6132 ^\# pragma .* \n ; -- GCC 3.3 CPP generated, apparently ^\# \! .* \n ; -- #!, for scripts -- gcc @@ -351,7 +351,7 @@ $unigraphic / { isSmartQuote } { smart_quote_error } <skipping> { -- Ghc CPP symbols ^\# \ * @cppkeyword .* \n { cppToken cpp_prag } - ^.*\n { cppSkip } + ^.*\n { cppSkip } } -- after a layout keyword (let, where, do, of), we begin a new layout ===================================== compiler/GHC/Parser/PreProcess.hs ===================================== @@ -14,6 +14,7 @@ module GHC.Parser.PreProcess ( ) where import Data.List (intercalate, sortBy) +import Data.Maybe (fromMaybe, listToMaybe) import Data.Map qualified as Map import Debug.Trace (trace) import GHC.Data.FastString @@ -30,8 +31,10 @@ import GHC.Parser.PreProcess.ParserM qualified as PM import GHC.Parser.PreProcess.State import GHC.Prelude import GHC.Types.SrcLoc -import GHC.Utils.Outputable (SDoc, text) +import GHC.Utils.Error +import GHC.Utils.Outputable (text) import GHC.Utils.Panic.Plain (panic) +import GHC.Parser.Errors.Types (PsMessage(PsErrGhcCpp)) -- --------------------------------------------------------------------- @@ -212,7 +215,7 @@ ppLexer queueComments cont = pushContinuation tk contIgnoreTok tk else do - mdump <- processCppToks s + mdump <- processCppToks tk case mdump of Just dump -> -- We have a dump of the state, put it into an ignored token @@ -241,25 +244,25 @@ ppLexer queueComments cont = -- --------------------------------------------------------------------- -processCppToks :: FastString -> PP (Maybe String) +processCppToks :: Located Lexer.Token -> PP (Maybe String) processCppToks fs = do let get (L _ (ITcpp False s _)) = unpackFS s get (L _ (ITcpp True s _)) = init $ unpackFS s - get _ = error "should not" + get _ = panic "Should be ITcpp" -- Combine any prior continuation tokens cs <- popContinuation - processCpp (reverse $ unpackFS fs : map get cs) + let loc = combineLocs fs (fromMaybe fs (listToMaybe cs)) + processCpp loc (concat $ reverse $ map get (fs:cs)) -processCpp :: [String] -> PP (Maybe String) -processCpp ss = do - let s = concat ss +processCpp :: SrcSpan -> String -> PP (Maybe String) +processCpp loc s = do let directive = parseDirective s if directive == Right CppDumpState then return (Just "\ndumped state\n") else do case directive of - Left err -> error $ show (err, s) + Left err -> Lexer.addError $ mkPlainErrorMsgEnvelope loc $ PsErrGhcCpp (text err) Right (CppInclude filename) -> do ppInclude filename Right (CppDefine name args def) -> do @@ -280,14 +283,14 @@ processCpp ss = do acceptStateChange ar Right CppElse -> do accepting <- getAccepting - ar <- setAccepting (not accepting) + ar <- setAccepting loc (text "#else") (not accepting) acceptStateChange ar Right (CppElIf cond) -> do val <- cppCond cond - ar <- setAccepting val + ar <- setAccepting loc (text "#elif") val acceptStateChange ar Right CppEndif -> do - ar <- popAccepting + ar <- popAccepting loc acceptStateChange ar Right CppDumpState -> do return () @@ -298,15 +301,8 @@ processCpp ss = do acceptStateChange :: AcceptingResult -> PP () acceptStateChange ArNoChange = return () acceptStateChange ArNowIgnoring = do - -- alr <- Lexer.getAlrState - -- s <- getPpState - -- let s = trace ("acceptStateChange:ArNowIgnoring") s' - -- setPpState (s { pp_alr_state = Just alr}) Lexer.startSkipping acceptStateChange ArNowAccepting = do - -- s <- getPpState - -- let s = trace ("acceptStateChange:ArNowAccepting") s' - -- mapM_ Lexer.setAlrState (pp_alr_state s) _ <- Lexer.stopSkipping return () ===================================== compiler/GHC/Parser/PreProcess/State.hs ===================================== @@ -32,6 +32,7 @@ module GHC.Parser.PreProcess.State ( ghcCppEnabled, setInLinePragma, getInLinePragma, + addGhcCPPError, ) where import Data.List.NonEmpty ((<|)) @@ -41,12 +42,15 @@ import Data.Map.Strict qualified as Map import Data.Maybe (isJust) import GHC.Base import GHC.Data.StringBuffer +import GHC.Parser.Errors.Types (PsMessage (PsErrGhcCpp)) import GHC.Parser.Lexer (P (..), PState (..), ParseResult (..)) import GHC.Parser.Lexer qualified as Lexer import GHC.Parser.PreProcess.ParserM (Token (..)) import GHC.Types.SrcLoc +import GHC.Utils.Error import GHC.Prelude +import GHC.Utils.Outputable (text, (<+>)) -- --------------------------------------------------------------------- @@ -191,20 +195,22 @@ pushAccepting on = do -- Note: this is only ever called in the context of a pp group (i.e. -- after pushAccepting) from processing #else or #elif -setAccepting :: Bool -> PP AcceptingResult -setAccepting on = do +setAccepting :: SrcSpan -> SDoc -> Bool -> PP AcceptingResult +setAccepting loc ctx on = do current <- getAccepting parent_scope <- parentScope let parent_on = pp_accepting parent_scope current_scope <- getScope let group_state = pp_group_state current_scope let possible_accepting = parent_on && on - let (new_group_state, accepting) = - case (group_state, possible_accepting) of - (PpNoGroup, _) -> error "setAccepting for state PpNoGroup" -- AZ: Tested in GhcCpp02 - (PpInGroupStillInactive, True) -> (PpInGroupHasBeenActive, True) - (PpInGroupStillInactive, False) -> (PpInGroupStillInactive, False) - (PpInGroupHasBeenActive, _) -> (PpInGroupHasBeenActive, False) + (new_group_state, accepting) <- + case (group_state, possible_accepting) of + (PpNoGroup, _) -> do + addGhcCPPError loc (ctx <+> text "without #if") + return (PpNoGroup, True) + (PpInGroupStillInactive, True) -> return (PpInGroupHasBeenActive, True) + (PpInGroupStillInactive, False) -> return (PpInGroupStillInactive, False) + (PpInGroupHasBeenActive, _) -> return (PpInGroupHasBeenActive, False) -- let (new_group_state, accepting) -- = trace ("setAccepting:" ++ show ((group_state, possible_accepting), (new_group_state', accepting'))) (new_group_state', accepting') @@ -231,19 +237,29 @@ acceptingStateChange old new = _ -> ArNoChange -- Exit a scope group -popAccepting :: PP AcceptingResult -popAccepting = - P $ \s -> - let - current = scopeValue $ pp_scope (pp s) - new_scope = case pp_scope (pp s) of - c :| [] -> c :| [] - -- c :| [] -> (trace ("popAccepting:keeping old:" ++ show c) c) :| [] - _ :| (h : t) -> h :| t - in - POk - s{pp = (pp s){pp_scope = new_scope}} - (acceptingStateChange current (scopeValue new_scope)) +popAccepting :: SrcSpan -> PP AcceptingResult +-- popAccepting = +-- P $ \s -> +-- let +-- current = scopeValue $ pp_scope (pp s) +-- new_scope = case pp_scope (pp s) of +-- c :| [] -> c :| [] +-- -- c :| [] -> (trace ("popAccepting:keeping old:" ++ show c) c) :| [] +-- _ :| (h : t) -> h :| t +-- in +-- POk +-- s{pp = (pp s){pp_scope = new_scope}} +-- (acceptingStateChange current (scopeValue new_scope)) +popAccepting loc = do + scopes <- getScopes + new_scope <- case scopes of + c :| [] -> do + addGhcCPPError loc (text "#endif without #if") + return (c :| []) + _ :| (h : t) -> return (h :| t) + setScopes new_scope + let current = scopeValue scopes + return (acceptingStateChange current (scopeValue new_scope)) scopeValue :: NonEmpty PpScope -> Bool scopeValue s = pp_accepting $ NonEmpty.head s @@ -280,6 +296,13 @@ setScope scope = in POk s{pp = (pp s){pp_scope = new_scope}} () +getScopes :: PP (NonEmpty PpScope) +getScopes = P $ \s -> POk s (pp_scope (pp s)) + +setScopes :: (NonEmpty PpScope) -> PP () +setScopes new_scope = + P $ \s -> POk s{pp = (pp s){pp_scope = new_scope}} () + {- Note [PpScope stack] ~~~~~~~~~~~~~~~~~~~~ @@ -404,3 +427,7 @@ insertMacroDef (MacroName name args) def md = Just dm -> Map.insert name (Map.insert arity (args, def) dm) md -- --------------------------------------------------------------------- + +addGhcCPPError :: SrcSpan -> SDoc -> P p () +addGhcCPPError loc err = + Lexer.addError $ mkPlainErrorMsgEnvelope loc $ PsErrGhcCpp err ===================================== compiler/GHC/Types/Error/Codes.hs ===================================== @@ -371,6 +371,7 @@ type family GhcDiagnosticCode c = n | n -> c where GhcDiagnosticCode "PsErrSpecExprMultipleTypeAscription" = 62037 GhcDiagnosticCode "PsWarnSpecMultipleTypeAscription" = 73026 GhcDiagnosticCode "PsWarnPatternNamespaceSpecifier" = 68383 + GhcDiagnosticCode "PsErrGhcCpp" = 93098 -- Driver diagnostic codes GhcDiagnosticCode "DriverMissingHomeModules" = 32850 ===================================== testsuite/tests/ghc-cpp/GhcCpp02.stderr ===================================== @@ -0,0 +1,4 @@ +GhcCpp02.hs:5:1: error: [GHC-93098] #else without #if + +GhcCpp02.hs:7:1: error: [GHC-93098] #endif without #if + ===================================== testsuite/tests/ghc-cpp/all.T ===================================== @@ -20,4 +20,4 @@ test('GhcCpp01', compile, ['-ddump-ghc-cpp -dkeep-comments']) -test('GhcCpp02', normal, compile, ['']) \ No newline at end of file +test('GhcCpp02', normal, compile_fail, ['']) \ No newline at end of file ===================================== utils/check-cpp/PreProcess.hs ===================================== @@ -1,6 +1,7 @@ module PreProcess where import Data.List +import Data.Maybe (fromMaybe, listToMaybe) import qualified Data.Map as Map import Debug.Trace import GHC hiding (addSourceToTokens) @@ -20,6 +21,7 @@ import GHC.Types.SrcLoc import GHC.Utils.Error import GHC.Utils.Outputable import GHC.Utils.Panic.Plain +import GHC.Parser.Errors.Types (PsMessage(PsErrGhcCpp)) import Macro import ParsePP @@ -241,7 +243,7 @@ ppLexer queueComments cont = pushContinuation tk contIgnoreTok tk else do - mdump <- processCppToks s + mdump <- processCppToks tk case mdump of Just dump -> -- We have a dump of the state, put it into an ignored token @@ -270,25 +272,25 @@ ppLexer queueComments cont = -- --------------------------------------------------------------------- -processCppToks :: FastString -> PP (Maybe String) +processCppToks :: Located Lexer.Token -> PP (Maybe String) processCppToks fs = do let get (L _ (ITcpp False s _)) = unpackFS s get (L _ (ITcpp True s _)) = init $ unpackFS s - get _ = error "should not" + get _ = panic "Should be ITcpp" -- Combine any prior continuation tokens cs <- popContinuation - processCpp (reverse $ unpackFS fs : map get cs) + let loc = combineLocs fs (fromMaybe fs (listToMaybe cs)) + processCpp loc (concat $ reverse $ map get (fs:cs)) -processCpp :: [String] -> PP (Maybe String) -processCpp ss = do - let s = concat ss +processCpp :: SrcSpan -> String -> PP (Maybe String) +processCpp loc s = do let directive = parseDirective s if directive == Right CppDumpState then return (Just "\ndumped state\n") else do case directive of - Left err -> error $ show (err, s) + Left err -> Lexer.addError $ mkPlainErrorMsgEnvelope loc $ PsErrGhcCpp (fsLit (show err)) Right (CppInclude filename) -> do ppInclude filename Right (CppDefine name args def) -> do @@ -309,11 +311,11 @@ processCpp ss = do acceptStateChange ar Right CppElse -> do accepting <- getAccepting - ar <- setAccepting (not accepting) + ar <- setAccepting loc (not accepting) acceptStateChange ar Right (CppElIf cond) -> do val <- cppCond cond - ar <- setAccepting val + ar <- setAccepting loc val acceptStateChange ar Right CppEndif -> do ar <- popAccepting ===================================== utils/check-cpp/State.hs ===================================== @@ -32,17 +32,22 @@ module State ( ghcCppEnabled, setInLinePragma, getInLinePragma, + addGhcCPPError, ) where import Data.List.NonEmpty ((<|)) -import qualified Data.List.NonEmpty as NonEmpty -import Data.Map (Map) -import qualified Data.Map as Map +import Data.List.NonEmpty qualified as NonEmpty +import Data.Map.Strict (Map) +import Data.Map.Strict qualified as Map import Data.Maybe (isJust) import GHC.Base +import GHC.Data.FastString import GHC.Data.StringBuffer import GHC.Parser.Lexer (P (..), PState (..), ParseResult (..)) -import qualified GHC.Parser.Lexer as Lexer +import GHC.Parser.Lexer qualified as Lexer +import GHC.Parser.Errors.Types (PsMessage(PsErrGhcCpp)) +import GHC.Utils.Error +-- import GHC.Parser.PreProcess.ParserM (Token (..)) import GHC.Types.SrcLoc import ParserM (Token (..)) @@ -192,20 +197,22 @@ pushAccepting on = do -- Note: this is only ever called in the context of a pp group (i.e. -- after pushAccepting) from processing #else or #elif -setAccepting :: Bool -> PP AcceptingResult -setAccepting on = do +setAccepting :: SrcSpan -> Bool -> PP AcceptingResult +setAccepting loc on = do current <- getAccepting parent_scope <- parentScope let parent_on = pp_accepting parent_scope current_scope <- getScope let group_state = pp_group_state current_scope let possible_accepting = parent_on && on - let (new_group_state, accepting) = + (new_group_state, accepting) <- case (group_state, possible_accepting) of - (PpNoGroup, _) -> error "setAccepting for state PpNoGroup" - (PpInGroupStillInactive, True) -> (PpInGroupHasBeenActive, True) - (PpInGroupStillInactive, False) -> (PpInGroupStillInactive, False) - (PpInGroupHasBeenActive, _) -> (PpInGroupHasBeenActive, False) + (PpNoGroup, _) -> do + addGhcCPPError loc "setAccepting for state PpNoGroup" + return (PpNoGroup, True) + (PpInGroupStillInactive, True) -> return (PpInGroupHasBeenActive, True) + (PpInGroupStillInactive, False) -> return (PpInGroupStillInactive, False) + (PpInGroupHasBeenActive, _) -> return (PpInGroupHasBeenActive, False) -- let (new_group_state, accepting) -- = trace ("setAccepting:" ++ show ((group_state, possible_accepting), (new_group_state', accepting'))) (new_group_state', accepting') @@ -405,3 +412,7 @@ insertMacroDef (MacroName name args) def md = Just dm -> Map.insert name (Map.insert arity (args, def) dm) md -- --------------------------------------------------------------------- + +addGhcCPPError :: SrcSpan -> String -> P p () +addGhcCPPError loc err + = Lexer.addError $ mkPlainErrorMsgEnvelope loc $ PsErrGhcCpp (fsLit err) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b70fb2a29cee983c058502c29572e50… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b70fb2a29cee983c058502c29572e50… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/coverage] 2 commits: hadrian: Add attoparsec and dependencies
by Ben Gamari (＠bgamari) 08 Jun '25

08 Jun '25

Ben Gamari pushed to branch wip/coverage at Glasgow Haskell Compiler / GHC Commits: ad06343d by Ben Gamari at 2025-06-08T10:07:40-04:00 hadrian: Add attoparsec and dependencies - - - - - c871cf34 by Ben Gamari at 2025-06-08T10:09:24-04:00 WIP submodule bumps - - - - - 5 changed files: - .gitmodules - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - libraries/hpc - utils/hpc Changes: ===================================== .gitmodules ===================================== @@ -118,3 +118,12 @@ [submodule "libraries/file-io"] path = libraries/file-io url = https://gitlab.haskell.org/ghc/packages/file-io.git +[submodule "libraries/attoparsec"] + path = libraries/attoparsec + url = https://github.com/haskell/attoparsec +[submodule "libraries/scientific"] + path = libraries/scientific + url = https://github.com/basvandijk/scientific +[submodule "libraries/integer-logarithms"] + path = libraries/integer-logarithms + url = https://github.com/haskellari/integer-logarithms ===================================== hadrian/src/Packages.hs ===================================== @@ -1,15 +1,15 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} module Packages ( -- * GHC packages - array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, + attoparsec, array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, fileio, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, - hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, + hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, - runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, + runGhc, scientific, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, @@ -33,13 +33,13 @@ import Oracles.Setting -- packages and modify build default build conditions in "UserSettings". ghcPackages :: [Package] ghcPackages = - [ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps + [ attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps , compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls , exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs - , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString - , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell + , hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, libffi, mtl, osString + , parsec, pretty, process, rts, runGhc, scientific, stm, semaphoreCompat, templateHaskell , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout , lintersCommon @@ -50,17 +50,18 @@ isGhcPackage :: Package -> Bool isGhcPackage = (`elem` ghcPackages) -- | Package definitions, see 'Package'. -array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, +attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, - hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, + hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, remoteIserv, libffi, mtl, osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace :: Package +attoparsec = lib "attoparsec" array = lib "array" base = lib "base" binary = lib "binary" @@ -109,6 +110,7 @@ hp2ps = util "hp2ps" hpc = lib "hpc" hpcBin = util "hpc-bin" `setPath` "utils/hpc" integerGmp = lib "integer-gmp" +integerLogarithms = lib "integer-logarithms" iserv = util "iserv" iservProxy = util "iserv-proxy" libffi = top "libffi" @@ -121,6 +123,7 @@ process = lib "process" remoteIserv = util "remote-iserv" rts = top "rts" runGhc = util "runghc" +scientific = lib "scientific" semaphoreCompat = lib "semaphore-compat" stm = lib "stm" templateHaskell = lib "template-haskell" ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -80,7 +80,8 @@ stageBootPackages = return stage0Packages :: Action [Package] stage0Packages = do cross <- flag CrossCompiling - return $ [ cabalSyntax + return $ [ attoparsec + , cabalSyntax , cabal , compiler , directory -- depends on filepath, fileIo @@ -102,9 +103,11 @@ stage0Packages = do , hpc , hpcBin , hsc2hs + , integerLogarithms , osString -- new library not yet present for boot compilers , process -- depends on filepath , runGhc + , scientific , semaphoreCompat -- depends on , time -- depends on win32 , unlit ===================================== libraries/hpc ===================================== @@ -1 +1 @@ -Subproject commit 9e29abb785ab4f82c37c7a4e73ec999083955b09 +Subproject commit aa19d28b10bc35a675687d3f41e8924fe2c4cdf9 ===================================== utils/hpc ===================================== @@ -1 +1 @@ -Subproject commit d1780eb21c1e5a1227fff80c8d325d5142f04255 +Subproject commit 61ee79de0d50aef35a7fe8989d6fff5607774899 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e41547701472f8d1ca60e4234300cf… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e41547701472f8d1ca60e4234300cf… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/coverage] hadrian: Add attoparsec and dependencies
by Ben Gamari (＠bgamari) 08 Jun '25

08 Jun '25

Ben Gamari pushed to branch wip/coverage at Glasgow Haskell Compiler / GHC Commits: e4154770 by Ben Gamari at 2025-06-08T10:06:31-04:00 hadrian: Add attoparsec and dependencies - - - - - 3 changed files: - .gitmodules - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs Changes: ===================================== .gitmodules ===================================== @@ -118,3 +118,12 @@ [submodule "libraries/file-io"] path = libraries/file-io url = https://gitlab.haskell.org/ghc/packages/file-io.git +[submodule "libraries/attoparsec"] + path = libraries/attoparsec + url = https://github.com/haskell/attoparsec +[submodule "libraries/scientific"] + path = libraries/scientific + url = https://github.com/basvandijk/scientific +[submodule "libraries/integer-logarithms"] + path = libraries/integer-logarithms + url = https://github.com/haskellari/integer-logarithms ===================================== hadrian/src/Packages.hs ===================================== @@ -1,15 +1,15 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} module Packages ( -- * GHC packages - array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, + attoparsec, array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, fileio, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, - hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, + hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, - runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, + runGhc, scientific, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, @@ -33,13 +33,13 @@ import Oracles.Setting -- packages and modify build default build conditions in "UserSettings". ghcPackages :: [Package] ghcPackages = - [ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps + [ attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps , compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls , exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs - , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString - , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell + , hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, libffi, mtl, osString + , parsec, pretty, process, rts, runGhc, scientific, stm, semaphoreCompat, templateHaskell , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout , lintersCommon @@ -50,17 +50,18 @@ isGhcPackage :: Package -> Bool isGhcPackage = (`elem` ghcPackages) -- | Package definitions, see 'Package'. -array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, +attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, - hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, + hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, remoteIserv, libffi, mtl, osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace :: Package +attoparsec = lib "attoparsec" array = lib "array" base = lib "base" binary = lib "binary" @@ -109,6 +110,7 @@ hp2ps = util "hp2ps" hpc = lib "hpc" hpcBin = util "hpc-bin" `setPath` "utils/hpc" integerGmp = lib "integer-gmp" +integerLogarithms = lib "integer-logarithsm" iserv = util "iserv" iservProxy = util "iserv-proxy" libffi = top "libffi" @@ -121,6 +123,7 @@ process = lib "process" remoteIserv = util "remote-iserv" rts = top "rts" runGhc = util "runghc" +scientific = lib "scientific" semaphoreCompat = lib "semaphore-compat" stm = lib "stm" templateHaskell = lib "template-haskell" ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -80,7 +80,8 @@ stageBootPackages = return stage0Packages :: Action [Package] stage0Packages = do cross <- flag CrossCompiling - return $ [ cabalSyntax + return $ [ attoparsec + , cabalSyntax , cabal , compiler , directory -- depends on filepath, fileIo @@ -102,9 +103,11 @@ stage0Packages = do , hpc , hpcBin , hsc2hs + , integerLogarithms , osString -- new library not yet present for boot compilers , process -- depends on filepath , runGhc + , scientific , semaphoreCompat -- depends on , time -- depends on win32 , unlit View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e41547701472f8d1ca60e4234300cf3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e41547701472f8d1ca60e4234300cf3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/ozkutuk/sprint-fun] Accept the new test outputs
by Berk Özkütük (＠ozkutuk) 08 Jun '25

08 Jun '25

Berk Özkütük pushed to branch wip/ozkutuk/sprint-fun at Glasgow Haskell Compiler / GHC Commits: 73048fdf by Berk Özkütük at 2025-06-08T15:16:27+02:00 Accept the new test outputs - - - - - 12 changed files: - compiler/GHC/Runtime/Heap/Inspect.hs - testsuite/tests/ghci.debugger/scripts/T12449.stdout - testsuite/tests/ghci.debugger/scripts/T19157.stdout - testsuite/tests/ghci.debugger/scripts/T19355.stdout - testsuite/tests/ghci.debugger/scripts/T19394.stdout - testsuite/tests/ghci.debugger/scripts/break006.stdout - testsuite/tests/ghci.debugger/scripts/break026.stdout - testsuite/tests/ghci.debugger/scripts/hist001.stdout - testsuite/tests/ghci.debugger/scripts/hist002.stdout - testsuite/tests/ghci.debugger/scripts/print027.stdout - testsuite/tests/ghci/scripts/T23507.script - testsuite/tests/ghci/scripts/T23507.stdout Changes: ===================================== compiler/GHC/Runtime/Heap/Inspect.hs ===================================== @@ -1,6 +1,4 @@ {-# LANGUAGE MagicHash #-} -{-# LANGUAGE ViewPatterns #-} - {-# LANGUAGE CPP #-} #if __GLASGOW_HASKELL__ > 912 @@ -388,9 +386,7 @@ cPprTermBase y = ifFunSuspension pred f prec t@Suspension{ctype = ctype} | ctype `elem` fun_ctype && pred t = f prec t where - -- TODO(ozkutuk): PAP _seems to be_ indicate a function closure, - -- I have no idea what AP is though - fun_ctype = [ FUN, FUN_1_0, FUN_0_1, FUN_2_0, FUN_1_1, FUN_0_2, FUN_STATIC, AP, PAP ] + fun_ctype = [ FUN, FUN_1_0, FUN_0_1, FUN_2_0, FUN_1_1, FUN_0_2, FUN_STATIC, PAP ] ifFunSuspension _ _ _ _ = return Nothing isFunTy :: Type -> Bool @@ -513,8 +509,8 @@ cPprTermBase y = ppr_list _ _ = panic "doList" ppr_fun :: Precedence -> Term -> m (Maybe SDoc) - ppr_fun _ (ty -> fun_ty) = return $ Just $ - angleBrackets (underscore <+> dcolon <+> pprType fun_ty) + ppr_fun _ t = return $ Just $ + angleBrackets (underscore <+> dcolon <+> pprType (ty t)) repPrim :: TyCon -> [Word] -> SDoc ===================================== testsuite/tests/ghci.debugger/scripts/T12449.stdout ===================================== @@ -1,26 +1,26 @@ -fmap = (_t1::forall (f :: * -> *) a b. +fmap = <_ :: forall (f :: * -> *) a b. Functor f => - (a -> b) -> f a -> f b) + (a -> b) -> f a -> f b> fmap :: forall (f :: * -> *) a b. Functor f => (a -> b) -> f a -> f b _t1 :: forall (f :: * -> *) a b. Functor f => (a -> b) -> f a -> f b -show = (_t2::forall a. Show a => a -> String) +show = <_ :: forall a. Show a => a -> String> show :: forall a. Show a => a -> String _t2 :: forall a. Show a => a -> String "\"foo\"" ["7","42"] -_t1 = (_t3::forall (f :: * -> *) a b. +_t1 = <_ :: forall (f :: * -> *) a b. Functor f => - (a -> b) -> f a -> f b) + (a -> b) -> f a -> f b> _t3 :: forall (f :: * -> *) a b. Functor f => (a -> b) -> f a -> f b -_t2 = (_t4::forall a. Show a => a -> String) +_t2 = <_ :: forall a. Show a => a -> String> _t4 :: forall a. Show a => a -> String ["7","42"] -id = (_t5::forall a. a -> a) +id = <_ :: forall a. a -> a> id :: forall a. a -> a _t5 :: forall a. a -> a -print = (_t6::forall a. Show a => a -> IO ()) +print = <_ :: forall a. Show a => a -> IO ()> print :: forall a. Show a => a -> IO () _t6 :: forall a. Show a => a -> IO () ===================================== testsuite/tests/ghci.debugger/scripts/T19157.stdout ===================================== @@ -3,19 +3,19 @@ Breakpoint 1 activated at T19157.hs:8:23-37 ---------------------- Test 1 Stopped in T19157.mySum.go, T19157.hs:8:23-37 _result :: Int = _ -go :: Int -> [Int] -> Int = _ +go :: Int -> [Int] -> Int = <_ :: Int -> [Int] -> Int> s :: Int = 1 ss :: [Int] = [2,3,4,5,6] sum :: Int = 0 Stopped in T19157.mySum.go, T19157.hs:8:23-37 _result :: Int = _ -go :: Int -> [Int] -> Int = _ +go :: Int -> [Int] -> Int = <_ :: Int -> [Int] -> Int> s :: Int = 4 ss :: [Int] = [5,6] sum :: Int = _ Stopped in T19157.mySum.go, T19157.hs:8:23-37 _result :: Int = _ -go :: Int -> [Int] -> Int = _ +go :: Int -> [Int] -> Int = <_ :: Int -> [Int] -> Int> s :: Int = 6 ss :: [Int] = [] sum :: Int = _ @@ -26,7 +26,7 @@ sum :: Int = _ ---------------------- Test 2 Stopped in T19157.mySum.go, T19157.hs:8:23-37 _result :: Int = _ -go :: Int -> [Int] -> Int = _ +go :: Int -> [Int] -> Int = <_ :: Int -> [Int] -> Int> s :: Int = 1001 ss :: [Int] = _ sum :: Int = _ ===================================== testsuite/tests/ghci.debugger/scripts/T19355.stdout ===================================== @@ -1,8 +1,12 @@ -fmap = (_t1::Functor f => (a -> b) -> f a -> f b) -fmap = (_t2::forall (f :: * -> *) a b. +fmap = <_ :: forall (f :: * -> *) a b. Functor f => - (a -> b) -> f a -> f b) -<*> = (_t3::forall (f :: * -> *) a b. + (a -> b) -> f a -> f b> +fmap = <_ :: forall (f :: * -> *) a b. + Functor f => + (a -> b) -> f a -> f b> +<*> = <_ :: forall (f :: * -> *) a b. + Applicative f => + f (a -> b) -> f a -> f b> +<*> = <_ :: forall (f :: * -> *) a b. Applicative f => - f (a -> b) -> f a -> f b) -<*> = (_t4::Applicative f => f (a -> b) -> f a -> f b) + f (a -> b) -> f a -> f b> ===================================== testsuite/tests/ghci.debugger/scripts/T19394.stdout ===================================== @@ -4,8 +4,10 @@ Identifier ‘realWorld#’ is not eligible for the :print, :sprint or :force co Type constructor ‘Word8#’ is not eligible for the :print, :sprint or :force commands. Type constructor ‘Int’ is not eligible for the :print, :sprint or :force commands. Identifier ‘void#’ is not eligible for the :print, :sprint or :force commands. -error = (_t1::GHC.Internal.Stack.Types.HasCallStack => [Char] -> a) -oneShot = (_t2::(a -> b) -> a -> b) -xor# = (_t3::Word# -> Word# -> Word#) -seq# = (_t4::a -> State# s -> (# State# s, a #)) -lazy = (_t5::a -> a) +error = <_ :: forall a. + GHC.Internal.Stack.Types.HasCallStack => + [Char] -> a> +oneShot = <_ :: forall a b. (a -> b) -> a -> b> +xor# = <_ :: Word# -> Word# -> Word#> +seq# = <_ :: forall a s. a -> State# s -> (# State# s, a #)> +lazy = <_ :: forall a. a -> a> ===================================== testsuite/tests/ghci.debugger/scripts/break006.stdout ===================================== @@ -1,16 +1,16 @@ Stopped in Main.mymap, Test3.hs:2:18-31 _result :: [a] = _ -f :: Int -> a = _ +f :: Int -> a = <_ :: Int -> a> x :: Int = 1 xs :: [Int] = [2,3] xs :: [Int] = [2,3] -f :: Int -> a = _ +f :: Int -> a = <_ :: Int -> a> x :: Int = 1 _result :: [a] = _ y = (_t1::a) y = 2 xs :: [Int] = [2,3] -f :: Int -> Int = _ +f :: Int -> Int = <_ :: Int -> Int> x :: Int = 1 _result :: [Int] = _ y :: Int = 2 ===================================== testsuite/tests/ghci.debugger/scripts/break026.stdout ===================================== @@ -1,7 +1,7 @@ Stopped in Test.foldl, break026.hs:5:16-22 _result :: Int = _ c :: Int = 0 -go :: Int -> [t1] -> Int = _ +go :: Int -> [t1] -> Int = <_ :: Int -> [t1] -> Int> xs :: [t1] = _ Stopped in Test.foldl.go, break026.hs:7:23-35 _result :: Int = _ @@ -19,7 +19,7 @@ c = 1 Stopped in Test.foldl, break026.hs:5:16-22 _result :: Int = _ c :: Int = 0 -go :: Int -> [t1] -> Int = _ +go :: Int -> [t1] -> Int = <_ :: Int -> [t1] -> Int> xs :: [t1] = _ Stopped in Test.foldl.go, break026.hs:7:23-35 _result :: Int = _ ===================================== testsuite/tests/ghci.debugger/scripts/hist001.stdout ===================================== @@ -13,14 +13,14 @@ _result :: [a] f :: t -> a xs :: [t] xs :: [t] = [] -f :: t -> a = _ +f :: t -> a = <_ :: t -> a> _result :: [a] = _ Logged breakpoint at Test3.hs:2:18-20 _result :: a f :: Integer -> a x :: Integer xs :: [t] = [] -f :: Integer -> a = _ +f :: Integer -> a = <_ :: Integer -> a> x :: Integer = 2 _result :: a = _ _result = 3 ===================================== testsuite/tests/ghci.debugger/scripts/hist002.stdout ===================================== @@ -13,14 +13,14 @@ _result :: [a] f :: t -> a xs :: [t] xs :: [t] = [] -f :: t -> a = _ +f :: t -> a = <_ :: t -> a> _result :: [a] = _ Logged breakpoint at Test3.hs:2:18-20 _result :: a f :: Integer -> a x :: Integer xs :: [t] = [] -f :: Integer -> a = _ +f :: Integer -> a = <_ :: Integer -> a> x :: Integer = 2 _result :: a = _ _result = 3 ===================================== testsuite/tests/ghci.debugger/scripts/print027.stdout ===================================== @@ -1,6 +1,10 @@ -+ = (_t1::Num a => a -> a -> a) -print = (_t2::Show a => a -> IO ()) -log = (_t3::Floating a => a -> a) -head = (_t4::GHC.Internal.Stack.Types.HasCallStack => [a] -> a) -tail = (_t5::GHC.Internal.Stack.Types.HasCallStack => [a] -> [a]) -fst = (_t6::(a, b) -> a) ++ = <_ :: forall a. Num a => a -> a -> a> +print = <_ :: forall a. Show a => a -> IO ()> +log = <_ :: forall a. Floating a => a -> a> +head = <_ :: forall a. + GHC.Internal.Stack.Types.HasCallStack => + [a] -> a> +tail = <_ :: forall a. + GHC.Internal.Stack.Types.HasCallStack => + [a] -> [a]> +fst = <_ :: forall a b. (a, b) -> a> ===================================== testsuite/tests/ghci/scripts/T23507.script ===================================== @@ -1,4 +1,9 @@ let f () = () :sprint f +f () +:sprint f + let x = 3 :sprint x +x +:sprint x ===================================== testsuite/tests/ghci/scripts/T23507.stdout ===================================== @@ -1,2 +1,6 @@ +f = _ +() f = <_ :: () -> ()> +x = _ +3 x = <_ :: forall {a}. Num a => a> View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/73048fdfa048019a538eba811394e0c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/73048fdfa048019a538eba811394e0c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/wasm-bytearray-marshall
by Matthew Pickering (＠mpickering) 08 Jun '25

08 Jun '25

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

1 0