- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/sol/reexported-error-message-refactor] Apply 1 suggestion(s) to 1 file(s)
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message-refactor at Glasgow Haskell Compiler / GHC Commits: f687bae2 by Simon Hengel at 2026-06-22T11:58:22+00:00 Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Jaro Reinders <i5c9aasq(a)anonaddy.me> - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -193,7 +193,7 @@ data ModuleOrigin = data AvailableFromOriginalUnit = -- | the canonical module name is different from the requested name Renamed - -- | the module is in someone's @exported-modules@ list, but that package is hidden + -- | the module is in someone's @exposed-modules@ list, but that package is hidden | AvailableFromHiddenPackage -- | the module is available from the original unit under the requested name | AvailableFromExposedPackage View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f687bae2b2091ddbbe8eaceed64be31… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f687bae2b2091ddbbe8eaceed64be31… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] 51 commits: Hadrian: convert env variable ACLOCAL_PATH to unix paths.
by recursion-ninja (＠recursion-ninja) 22 Jun '26

22 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 1a733f45 by David Eichmann at 2026-06-22T07:53:12-04:00 Hadrian: convert env variable ACLOCAL_PATH to unix paths. Convert ACLOCAL_PATH to a unix style path when invoking autoreconf. Autoreconf doesn't handle windows paths. See Note [Autoreconf unix paths from ACLOCAL_PATH]. Fixes #27311 - - - - - 21230348 by Simon Jakobi at 2026-06-22T07:53:12-04:00 testsuite: Deduplicate --only test names config.only is assumed to be a set, but supplying --only overwrote it with the (list) argparse result, which can contain duplicates. When a test ran, config.only.remove(name) dropped only the first occurrence, so a duplicated name lingered and was later misreported as a "test not found" framework failure. Store it as a set instead. Fixes #27322 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - e60fb8af by Simon Jakobi at 2026-06-22T07:53:12-04:00 testsuite: detect fast bignum via ghc-internal, not removed ghc-bignum The ghc-bignum package was merged into ghc-internal, so the BIGNUM_GMP probe in test.mk ran `ghc-pkg field ghc-bignum exposed-modules`, which fails with "cannot find package ghc-bignum". That error went to stderr and leaked into the captured stderr of every makefile_test, causing spurious [bad stderr] failures across the suite. The probe also silently returned empty, so config.have_fast_bignum was wrongly False even on GMP builds. Probe ghc-internal's extra-libraries for the gmp library instead: the GMP backend module is an other-module (not exposed), but GMP_LIBS adds gmp to extra-libraries only on a GMP build, so this distinguishes the backends. Redirect stderr to keep any future missing-package error off the harness's stderr. This also removes a stale comment as per suggestion from hsyl20. Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - efb7680f by Alan Zimmerman at 2026-06-22T07:53:12-04:00 EPA: Rename Transform.anchorEof to addModuleCommentOrigDeltas This now matches what it actually does. - - - - - ff449299 by David Eichmann at 2026-06-22T07:53:13-04:00 Hadrian: avoid response files when command line is short enough This replaces the logic of always using response files on Windows. With the new condition based on command line lenght, reponse files can be avoided in many more cases (on windows). Now that response files are only used in a small number of cases, response files are always kept and the -r / --keep-response-files command line options have been removed The response file paths are nolonger randomized. They are placed in the `_build/rsp` directory. This ensures they are ignored by git and we that Hadrian reuses response file paths when rebuilding rather than leaving stale response files around. Update user guide putting response files in its own section - - - - - 37b8c57e by Simon Hengel at 2026-06-22T07:53:13-04:00 Don't use non-breaking spaces - - - - - f38b4356 by David Eichmann at 2026-06-22T07:53:13-04:00 Hadrian: remove unused wrapper scripts from windows bindist These wrapper scripts are only installed on non-relocatable builds which are not generally supported on windows. - - - - - d3e0d96a by sheaf at 2026-06-22T07:53:13-04:00 Don't drop ticks around variables of type `IO ()` GHC.Core.Utils.mkTick is responsible for placing a tick on a Core expression. It contains logic for dropping SCCs (non-counting profiling ticks) around non-function variables, as such variables cannot meaningfully contribute to profiles. However, the logic for what counts as a function was incorrect: it used `isFunTy` which returns 'False' for types such as 'IO ()' where the function arrow is hidden under a newtype. We now use 'mightBeFunTy' instead of 'isFunTy'. This ensures we don't drop ticks in cases we aren't sure. On the way, we improve the documentation of 'isFunTy', 'isPiTy' and 'mightBeFunTy', and update the latter's implementation to consistently handle unary classes. Fixes #27225 ------------------------- Metric Decrease: T5642 ------------------------- - - - - - dd613aa3 by Simon Jakobi at 2026-06-22T07:53:13-04:00 testsuite: Add regression test for #4081 Check that a strict constructor field is unboxed once outside an enclosing loop, not re-inspected each iteration (the float-out case-floating from 9cb20b488). Uses simonpj's `data T a = T !a` example from the ticket; T4081.stderr captures the expected Core. Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - aa660942 by sheaf at 2026-06-22T07:53:13-04:00 Check for cabal-install >= 3.12 upfront Starting with commit 8cb99552f607f6bc4000e45ab32532d50c8bb996, Hadrian requires cabal-install >= 3.12 in order to use the 'cabal path' command that was introduced in version 3.12, as per https://github.com/haskell/cabal/blob/a51c4ee1556d816ad86e90db7e6330dd51b0b… This was not reflected in the Hadrian build script, causing a delayed build failure instead of enforcing the version requirement upfront, which this patch does. Fixes #27317 - - - - - 559c3855 by sheaf at 2026-06-22T07:53:13-04:00 Fix crash in Data.Data instance for HsCtxt The Data.Data instance for HsCtxt contained an error for the 'toConstr' method, which could trigger for example when looking at -ddump-tc-ast traces. Replace it with the 'abstractConstr' pattern used in the rest of the codebase. - - - - - 72f12522 by Zubin Duggal at 2026-06-22T07:53:13-04:00 hadrian: Remove old package.conf files when generating new ones Old package.conf files might exists with different hashes, causing issues like #26661 Fixes #26661 - - - - - 2508f244 by sheaf at 2026-06-22T07:53:13-04:00 Fix AArch64 clobbering bug for MUL2 On AArch64, the code generator could clobber one of the input operands when computing the lower bits of a MUL2 operation. This rendered invalid the subsequent computation of the high bits. This commit fixes that by using a temporary register. The register allocator can remove the redundant move in the common case when the registers do not conflict. Fixes #27046 - - - - - 1f1f9195 by Rodrigo Mesquita at 2026-06-22T07:53:13-04:00 fix: make T27131 less flaky It seems that T27131 fails flakily in a race where we check the flag before the capability had the chance to process the mailbox which sets the flag. This seemingly should only happen if the capability ends up being the same for setting and checking the flag. - - - - - d424ab37 by Marc Scholten at 2026-06-22T07:53:13-04:00 haddock: render modules concurrently - - - - - e6610f88 by Duncan Coutts at 2026-06-22T07:53:13-04:00 Promote HAVE_PREEMPTION from Timer.c to OSThreads.h We will want to know about HAVE_PREEMPTION in more places. HAVE_PREEMPTION tells us that we do have OS threads available, irrespective of whether THREADED is defined. In particular, HAVE_PREEMPTION is defined on all proper OSs, but not on WASM (and hyopthetically may not be true on some other platforms like micro-controllers, RTOSs, VM hypervisors etc). - - - - - b132ac04 by Duncan Coutts at 2026-06-22T07:53:13-04:00 Define ACQUIRE_LOCK_ALWAYS and friends Fix issue #27335 Like the atomic _ALWAYS variants, these lock actions are always defined, rather than being dependent on whether we are in the THREADED case. All the "normal" LOCK macros are defined to be no-ops when !THREADED. The use case for the _ALWAYS variants is where we are using OS threads even in the non-threaded RTS. This includes everything to do with the timer/ticker thread, which is used in the non-threaded RTS too. In particular, we will want to use this for eventlog things, because the timer thread performs eventlogging concurrently with the main capability, even in the non-threaded RTS. - - - - - 36189f18 by Duncan Coutts at 2026-06-22T07:53:13-04:00 Use ACQUIRE/RELEASE_LOCK_ALWAYS with eventBufMutex Even in the non-threaded RTS the eventBufMutex is needed by both the main capability and the timer/ticker thread, so always use the mutex. This should fix #25165 which is about the main capability and the timer thread posting events to the eventlog buffer concurrently and thereby corrupting the buffer data. - - - - - ae31e5aa by Duncan Coutts at 2026-06-22T07:53:13-04:00 Expose eventBufMutex in the EventLog interface/header We will need it in forkProcess to ensure we don't write to the global eventlog buffer concurrently with trying to flush eventlog buffers and do the fork(). - - - - - 4d17035d by Duncan Coutts at 2026-06-22T07:53:13-04:00 Split flushAllCapsEventsBufs into safe and unlocked version Following the convention that unlocked versions have a trailing _ underscore in their name. This one requires the caller to hold the eventlog global buffer mutex. We will need this in forkProcess. - - - - - 18b51e45 by Duncan Coutts at 2026-06-22T07:53:13-04:00 Remove redundant use of stopTimer in setNumCapabilities Historically, the comment here was: We must stop the interval timer while we are changing the capabilities array lest handle_tick may try to context switch an old capability. See #17289. and We must disable the timer while we do this since the tick handler may call contextSwitchAllCapabilities, which may see the capabilities array as we free it. What this refers to is that historically, when changing the number of capabilities, the array of capabilities was reallocated to a new size, allocating new ones and freeing the old ones, thus invalidating all existing capbility pointers. Strangely, for good measure the code used to call stopTimer twice (hence the two similar comments above). However, since commit a3eccf06292dd666b24606251a52da2b466a9612, the capabilities array is no longer reallocated. Instead the array is allcoated once on RTS startup to the maximum size it could ever be allowed to be, and then capabilities get enabled/disabled at runtime. So the capability pointers never become invalid anymore. At worst, they may point to capabilities that are disabled. Thus we no longer need to stop the timer (twice) while we change the number of enabled capabilities. This also partially solves issue #27105, which notes that stopTimer is being used as if it were synchronous, when it is not. At least for this case, the solution is that stopTimer is not needed at all! - - - - - d93e086a by Duncan Coutts at 2026-06-22T07:53:13-04:00 Remove redundant use of stopTimer in forkProcess but replace it with taking the eventlog buffer lock during the fork. Fixes issue #27105 The original reason to block the timer during a fork was that historically the timer was implemented using a periodic timer signal, and the signal itself would interrupt the fork system call (returning EINTR). For large processes (where fork() takes a while) this could permanently livelock: the timer always would go off before the fork could complete, which got retried in a loop forever. The timer is no longer implemented as a unix signal, but uses threads. Thus the original problem no longer exists. The only remaining reason to block the timer tick is to prevent actions taken by the tick from interfering with the delicate process involved in fork (taking a load of locks and pausing everything). The only thing we need to do is to prevent the eventlog from being written to or flushed while the fork is taking place. To achieve this all we need to do is hold the mutex for the global eventlog buffer. This removes the last use of stopTimer that expects stopTimer to work synchronously (which it was not) and thus solves issue #27105. To be clear, we solve issue #27105 not by making stopTimer synchronous, but by eliminating the use sites that expected it to be synchronous. - - - - - 62f61ac7 by sheaf at 2026-06-22T07:53:13-04:00 Add type family performance test for #26426 Some GHC versions produced large numbers of coercions after typechecking and desugaring when compiling the program in #26426: Version | Typechecker time | Typechecker allocations | Coercions -------:|-----------------:|------------------------:|---------: 9.6 | 47 ms | 48 MB | 110k 9.8 | 1000 ms | 486 MB | 10,437k 9.10 | 922 ms | 489 MB | 10,436k 9.12 | 906 ms | 482 MB | 10,437k 9.14 | 63 ms | 55 MB | 333k 10.0 | 47 ms | 64 MB | 35k The improvement 9.12 -> 9.14 was due to commit 22d11fa818fae2c95c494fc0fac1f8cb4c6e7cb6, while the improvement 9.14 -> 10.0 was due to commit 0b7df6db9e46df40e86fbff1a66dc10440b99db5. As the behaviour of GHC seems better than it's ever been on this program, we declare victory, adding this performance test to ensure we don't regress on this program. On the way, we update Note [Combining equalities] in GHC.Tc.SolveR.Equality with the explanation of the 9.12 -> 9.14 improvement (getting rid of an exponential blowup in coercion sizes), and we update Note [Exploiting closed type families] in GHC.Tc.Solver.FunDeps with the explanation of the 9.14 -> 10.0 improvement (bringing down coercion size growth from cubic to quadratic). - - - - - 6aa166fa by Zubin Duggal at 2026-06-22T07:53:13-04:00 compiler: mark tool messages as errors/warnings depending on the exit code Fixes #27370 - - - - - f71ddecd by mangoiv at 2026-06-22T07:53:13-04:00 libraries/process: bump submodule to v1.6.30.0 - bump the submodule to the appropriate tag - suppress benign warning resulting from the change - - - - - bb64a323 by David Eichmann at 2026-06-22T07:53:14-04:00 ghc-toolchain: don't throw when candidate executables are not found Fixes #27369 - - - - - bf062123 by David Eichmann at 2026-06-22T07:53:14-04:00 CI: lint-changelog checks for no-changelog label in script instead of rules - - - - - 53f2ffad by konsumlamm at 2026-06-22T07:53:14-04:00 Implement CLC proposal #378 Add `Data.Double` and `Data.Float` modules Document that GHC uses IEEE 754 - - - - - 9b77af74 by fendor at 2026-06-22T07:53:14-04:00 Drop `preloadClosure` from `UnitState` It is always hard-coded to the same value. Backpack Unit instantiation isn't using it any more. Allows us to simplify the API and get rid of `improveUnit`. - - - - - cc2d0b60 by ARATA Mizuki at 2026-06-22T07:53:14-04:00 RISC-V NCG: Zero-extend the result of castFloatToWord32 According to the ISA manual, FMV.X.W sign-extends the result. We need to truncate the result to avoid creating an exotic Word32 value. Fixes #27300 - - - - - 6b191414 by ARATA Mizuki at 2026-06-22T07:53:14-04:00 RISC-V NCG: Treat d28-d31 (ft8-ft11) as caller-saved According to the calling convention, the registers d28-d31 (ft8-ft11) are caller-saved. Fixes #27306 - - - - - 6cccf87b by ARATA Mizuki at 2026-06-22T07:53:14-04:00 RISC-V NCG: Set rounding mode when emitting `truncate` If we omit the rounding mode for `fcvt`, `dyn` will be used. We do not want that for `truncate`, so we set `rtz`. In other places, we set `rne` because we do not use the dynamic rounding mode. Fixes #27303 - - - - - 69062b72 by Zubin Duggal at 2026-06-22T07:53:14-04:00 rts: fix validate build with gcc 16. `__attribute__((regparm(1)))` is ignored on x86_64 and now gcc warns that it is ignored: rts/sm/Evac.h:35:1: error: error: ‘regparm’ attribute ignored [-Werror=attributes] See https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ccead81bbc39668376eb5cf47066a… Fixes #27366 - - - - - ab7e309e by Andrew Lelechenko at 2026-06-22T07:53:14-04:00 base: more NonEmpty zips CLC proposal: https://github.com/haskell/core-libraries-committee/issues/409 - - - - - 444547d6 by David Eichmann at 2026-06-22T07:53:14-04:00 Hadrian: fix ghc-internal .def file name - - - - - 381ebd4b by mangoiv at 2026-06-22T07:53:14-04:00 compiler: ignore camelCase and Eta reduce hlint hints These do not cohere with the style used in GHC. After disabling them, hlint lints are much less noisy again. - - - - - 51979b4c by Alan Zimmerman at 2026-06-22T07:53:14-04:00 EPA: Use standard type family declaration for Anno - - - - - ece7e924 by Wolfgang Jeltsch at 2026-06-22T07:53:14-04:00 Fix two issues in the documentation of pipeline interruption One issue is a typo (“interreuptible”), the other one the lack of an end of a sentence, which has been reconstructed from the message of 633bbc1fd4762a2bb73ba1c5b9e0c279f1dd3c40, the commit that introduced said documentation. - - - - - 2e72e9b1 by Christian Georgii at 2026-06-22T07:53:14-04:00 Find plugins in sibling home units in multiple-home-unit sessions In a multiple-home-unit session (e.g. `cabal repl --enable-multi-repl` or HLS), enabling a plugin with -fplugin that is defined in (or reexported by) another home unit failed with a "hidden package" error. The plugin module finder only searched the current home unit and the registered external packages, never the sibling home units. findPluginModuleNoHsc now searches the home units that the current home unit depends on, following module reexports and respecting hidden modules, exactly as ordinary import resolution does in findImportedModuleNoHsc. To avoid two divergent copies of this logic, the shared home-unit search (the current home unit first, then its dependencies in priority order, with the accompanying ordering invariant) is extracted into findHomeModuleAmongDeps, which both findImportedModuleNoHsc and findPluginModuleNoHsc now call. Add testsuite/tests/driver/multipleHomeUnits/plugin01, which loads a plugin as byte-code from a sibling home unit, and plugin02, in which the consumer enables a plugin reexported by a sibling home unit without depending on the plugin's own home unit directly. Fixes #27349 - - - - - 8334d31d by Ian-Woo Kim at 2026-06-22T07:53:14-04:00 Make the order of usages deterministic It has been observed that the ordering of usages can be non-determinstic in parallel builds. Therefore, this contribution introduces sorting of usages based on a platform- and race-independent sorting criterion. Resolves #26877. Co-authored-by: Wolfgang Jeltsch <wolfgang(a)well-typed.com> - - - - - 3983ff2f by Wolfgang Jeltsch at 2026-06-22T07:53:15-04:00 Change the descriptions of two existing changelog entries The descriptions now describe the changes in a user-friendly manner, as opposed to describing the contributions that led to these changes in a developer-friendly manner. - - - - - 906381bf by Ian Duncan at 2026-06-22T07:53:15-04:00 AArch64: use SXTH, not SXTW, for W32 signExtendReg signExtendReg was using SXTH (sign-extend halfword, 16-bit) for W32-to-W64 sign extension. This should be SXTW (sign-extend word, 32-bit). SXTH only sign-extends the lower 16 bits, producing wrong results for 32-bit values whose bit 15 differs from bit 31. Other fixes: - At sub-W64, code gen for MO_S_Mul2 should use W32 registers for SMULL source operands as per the ARM spec (SMULL Xd, Wn, Wm), and not W64. - Ensure signExtendReg uses the source width for the source operand in SXTW/SXTH/SXTB instructions. GNU as requires sxtw Xd,Wn (not sxtw Xd,Xn), while LLVM's integrated assembler on macOS is lenient. - Fix overflow flag computation for `MO_S_Mul2`. The overflow bit was exactly inverted for sub-W64 operands. Fixes #26978 and #27047 - - - - - 08c376cf by Igor Ranieri at 2026-06-22T07:53:15-04:00 haddock: Update CONTRIBUTING with missing step, add missing test dependency - - - - - a6cdc1af by Luite Stegeman at 2026-06-22T07:53:15-04:00 tag inference: don't confuse functions with their return values inferTagRhs was mixing up taggedness for closures and return values for function closures. We really shouldn't assign TagTuple to a properly tagged function returning a tuple. We fix this by keeping track of functions (TagFun) separately from values (TagVal) and keeping track of their return value. TagFun is also used for join points. fixes #27005 - - - - - 68ccd5cd by Sebastian Graf at 2026-06-22T07:53:15-04:00 Seed the simplifier's in-scope set for open expressions simplifyExpr simplifies expressions typed at the GHCi prompt and the results of Template Haskell splices. Such an expression may be open: at a GHCi debugger breakpoint its free variables include RuntimeUnk skolems standing for as-yet-unknown types. The simplifier began with an in-scope set holding only the wildcard binder, so when it instantiated the unsafeCoerce# wrapper that GHCi builds around a result, it formed a substitution whose range mentioned a free skolem that was not in scope. That breaks the substitution invariant and, in a compiler built with assertions, trips substTy's sanity check. Seed the initial in-scope set with the free variables of the expression. For a closed expression this adds nothing. See Note [Seed the in-scope set for open expressions]. Fixes #17833 and its duplicate #21118. - - - - - 85d31828 by Sebastian Graf at 2026-06-22T07:53:15-04:00 Desugar a `case` scrutinee only once (#27383, #20251) In `dsExpr` for `HsCase` we desugared the scrutinee /twice/: once to build the Core `case` itself, and again inside `matchWrapper`, which re-desugared the source scrutinee (via `addHsScrutTmCs`) purely to record long-distance information for the pattern-match checker. For a single `case` that is merely wasteful. But for nested cases it is catastrophic. Consider case (case (case e of ... ) of ... ) of ... Desugaring the outer scrutinee desugars the middle `case` twice, each of which desugars the inner `case` twice, and so on. The work doubles at every level, so desugaring takes O(2^n) time in the nesting depth. That is the blowup reported in #27383; it is also what makes the machine-generated program in #20251 take an age to compile. The fix is simple. `matchWrapper` is handed the scrutinee anyway, so we give it the Core expression we have /already/ desugared, and record the long-distance term constraint with `addCoreScrutTmCs` instead of re-desugaring from source. This is just what `matchSinglePatVar` already does for single-pattern matches. So: * `matchWrapper` now takes `Maybe [CoreExpr]` rather than `Maybe [LHsExpr GhcTc]`. * The `HsCase` equation of `dsExpr` passes the already-desugared `core_discrim`; the arrow desugarer passes its match variables. * `addHsScrutTmCs` had no other use, so it is gone. Desugaring is now linear in the nesting depth. (The coverage checker still runs `simpleOptExpr` over each scrutinee, which leaves the total at O(n^2); that is ample.) The long-distance information itself is unchanged: the checker sees precisely the Core that backs the generated code. Test: deSugar/should_compile/T27383 - - - - - 87c74cfc by Rodrigo Mesquita at 2026-06-22T07:53:15-04:00 fix: Save FastStrings in the PMC There is no point in adding the unique to the occurrence FastString we create, since it is part of the Id anyway. Adding it to the FastString, meant each FastString was unique unnecessarily! In a separate branch, running the compiler on test `InstanceMatching` observed 30000 `FastString`s created by this code path. Plus, `fsLit "pm"` follows the existing pattern in `mkPmId`. - - - - - 6b812131 by Alan Zimmerman at 2026-06-22T07:53:15-04:00 TTG: Add extension points to HsConDetails Extend HsConDetails as data HsConDetails p arg rec = PrefixCon !(XPrefixCon p) [arg] -- C @t1 @t2 p1 p2 p3 | RecCon !(XRecCon p) rec -- C { x = p1, y = p2 } | InfixCon !(XInfixCon p) arg arg -- p1 `C` p2 | XHsConDetails !(XXHsConDetails p) type family XPrefixCon p type family XRecCon p type family XInfixCon p type family XXHsConDetails p - - - - - 84360534 by Simon Jakobi at 2026-06-22T07:53:15-04:00 CI: quiet submodule clean output in after_script and setup The clean and cleanup_submodules functions ran 'git submodule foreach git clean -xdf', flooding the job log with 'Entering ...' and 'Removing ...' lines. Pass --quiet to 'git submodule' and -q to 'git clean' to drop the success output; errors are still reported. Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 97fa6647 by Recursion Ninja at 2026-06-22T07:53:15-04:00 Decoupling 'L.H.S' from 'GHC.Types.SourceText' * Migrated 'IntegralLit' to 'L.H.S.Lit'. * Migrated 'FractionalLit' to 'L.H.S.Lit'. * Migrated 'StringLiteral' to 'L.H.S.Lit'. * Added TTG extension points to the types above. * Added nice export list to 'GHC.Hs.Lit'. * Added 'rnOverLitVal' and 'tcOverLitVal' functions to 'GHC.Hs.Lit'. * Added instance 'Anno (StringLiteral (GhcPass p)) = SrcSpanAnnN' * Moved [Notes] about 'SourceText' from 'L.H.S.*' to 'GHC.*'. * Removed all references to 'SourceText' from 'L.H.S'. * Removed the trailing comma record field from 'StringLiteral' * Renamed exported functions for nomenclature consistency. * Deprecated the renamed functions Resolves issue #26953 - - - - - 4a518224 by Recursion Ninja at 2026-06-22T07:53:15-04:00 The fix for test cases: - Ppr035 - Ppr036 - Ppr048 Correcting WARNING/DEPRECATED/SCC pragma round-tripping - - - - - 226 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - boot - + changelog.d/T17833 - + changelog.d/T26978 - + changelog.d/T27046 - + changelog.d/T27047 - + changelog.d/T27225 - + changelog.d/T27308 - + changelog.d/T27317 - + changelog.d/T27359 - + changelog.d/deterministic-usage-order - + changelog.d/fix-exponential-case-desugar-27383 - + changelog.d/fix-plugin-finder-multi-home-unit.md - changelog.d/hadrian-response-files.md - + changelog.d/hadrian-stale-package-confs-26661 - changelog.d/module-graph-reuse-in-downsweep - changelog.d/more-efficient-home-unit-imports-finding - + changelog.d/tag-inference-27005 - + changelog.d/tool-messages-27370 - compiler/.hlint.yaml - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - compiler/GHC/CmmToAsm/AArch64/Instr.hs - compiler/GHC/CmmToAsm/AArch64/Ppr.hs - compiler/GHC/CmmToAsm/BlockLayout.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToAsm/RV64/Instr.hs - compiler/GHC/CmmToAsm/RV64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/Regs.hs - compiler/GHC/Core/Opt/Simplify.hs - compiler/GHC/Core/Type.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Data/List/NonEmpty.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Session/Units.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Arrows.hs - compiler/GHC/HsToCore/Docs.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match.hs-boot - compiler/GHC/HsToCore/Match/Constructor.hs - compiler/GHC/HsToCore/Pmc.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Linker/Unit.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Runtime/Debugger/Breakpoints.hs - compiler/GHC/Runtime/Eval/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/EnforceEpt/Rewrite.hs - compiler/GHC/Stg/EnforceEpt/TagSig.hs - compiler/GHC/Stg/EnforceEpt/Types.hs - compiler/GHC/SysTools/Process.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/FunDeps.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/RepType.hs - compiler/GHC/Unit.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Info.hs - compiler/GHC/Unit/Module/Deps.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Unit/Types.hs - compiler/GHC/Utils/Logger.hs - compiler/GHC/Utils/Misc.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Pat.hs - compiler/Language/Haskell/Syntax/Type.hs - docs/users_guide/bugs.rst - docs/users_guide/using.rst - hadrian/build-cabal - hadrian/src/Builder.hs - hadrian/src/CommandLine.hs - hadrian/src/Hadrian/Builder/Ar.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Oracles/Path.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/Rts.hs - libraries/base/base.cabal.in - libraries/base/changelog.md - + libraries/base/src/Data/Double.hs - + libraries/base/src/Data/Float.hs - libraries/base/src/Data/List/NonEmpty.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Lexeme.hs - rts/Capability.c - rts/Schedule.c - rts/Timer.c - rts/eventlog/EventLog.c - rts/eventlog/EventLog.h - rts/include/rts/OSThreads.h - rts/sm/Evac.h - testsuite/driver/runtests.py - testsuite/driver/testlib.py - testsuite/mk/test.mk - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxth-mul2.asm - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxth-mul2.cmm - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxtw.asm - + testsuite/tests/codeGen/should_gen_asm/aarch64-sxtw.cmm - testsuite/tests/codeGen/should_gen_asm/all.T - testsuite/tests/codeGen/should_run/T16617.hs - testsuite/tests/codeGen/should_run/T16617.stdout - + testsuite/tests/codeGen/should_run/T27046.hs - + testsuite/tests/codeGen/should_run/T27046_cmm.cmm - + testsuite/tests/codeGen/should_run/aarch64-sxtw-cmm.cmm - + testsuite/tests/codeGen/should_run/aarch64-sxtw-run.hs - + testsuite/tests/codeGen/should_run/aarch64-sxtw-run.stdout - testsuite/tests/codeGen/should_run/all.T - testsuite/tests/core-to-stg/T14895.stderr - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/deSugar/should_compile/T27383.hs - testsuite/tests/deSugar/should_compile/all.T - + testsuite/tests/driver/T27370/Makefile - + testsuite/tests/driver/T27370/T27370.hs - + testsuite/tests/driver/T27370/T27370.pp - + testsuite/tests/driver/T27370/T27370.stderr - + testsuite/tests/driver/T27370/all.T - + testsuite/tests/driver/multipleHomeUnits/plugin01/all.T - + testsuite/tests/driver/multipleHomeUnits/plugin01/appunit - + testsuite/tests/driver/multipleHomeUnits/plugin01/p/MyPlugin.hs - + testsuite/tests/driver/multipleHomeUnits/plugin01/pluginunit - + testsuite/tests/driver/multipleHomeUnits/plugin01/q/App.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/all.T - + testsuite/tests/driver/multipleHomeUnits/plugin02/appunit - + testsuite/tests/driver/multipleHomeUnits/plugin02/p/MyPlugin.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/pluginunit - + testsuite/tests/driver/multipleHomeUnits/plugin02/q/App.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/r/RexLib.hs - + testsuite/tests/driver/multipleHomeUnits/plugin02/reexportunit - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghci.debugger/scripts/all.T - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T20452.stderr - + testsuite/tests/perf/compiler/T26426.hs - testsuite/tests/perf/compiler/all.T - testsuite/tests/printer/Test24533.stdout - + testsuite/tests/profiling/should_run/T27225.hs - + testsuite/tests/profiling/should_run/T27225.stdout - + testsuite/tests/profiling/should_run/T27225b.hs - + testsuite/tests/profiling/should_run/T27225b.stdout - testsuite/tests/profiling/should_run/all.T - testsuite/tests/profiling/should_run/caller-cc/CallerCc1.prof.sample - testsuite/tests/profiling/should_run/callstack001.stdout - testsuite/tests/profiling/should_run/scc001.prof.sample - testsuite/tests/rts/T27131.hs - testsuite/tests/rts/T27131.stdout - + testsuite/tests/simplCore/should_compile/T4081.hs - + testsuite/tests/simplCore/should_compile/T4081.stderr - testsuite/tests/simplCore/should_compile/T4201.stdout - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/simplCore/should_run/T27005.hs - + testsuite/tests/simplCore/should_run/T27005.stdout - + testsuite/tests/simplCore/should_run/T27005_aux.hs - testsuite/tests/simplCore/should_run/all.T - testsuite/tests/simplStg/should_compile/T24806.hs - testsuite/tests/simplStg/should_compile/T24806.stderr - + testsuite/tests/simplStg/should_compile/T27005b.hs - + testsuite/tests/simplStg/should_compile/T27005b.stderr - testsuite/tests/simplStg/should_compile/all.T - testsuite/tests/simplStg/should_compile/inferTags004.hs - testsuite/tests/simplStg/should_compile/inferTags004.stderr - + testsuite/tests/simplStg/should_run/T27005a.hs - + testsuite/tests/simplStg/should_run/T27005a.stdout - testsuite/tests/simplStg/should_run/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Transform.hs - utils/ghc-toolchain/src/GHC/Toolchain/Program.hs - utils/ghc-toolchain/src/GHC/Toolchain/Utils.hs - utils/haddock/CONTRIBUTING.md - utils/haddock/haddock-api/haddock-api.cabal - utils/haddock/haddock-api/src/Haddock.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hoogle.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/GhcUtils.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Options.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/haddock/haddock-api/src/Haddock/Utils.hs - utils/haddock/haddock-test/haddock-test.cabal - utils/haddock/html-test/ref/Hash.html - utils/haddock/html-test/ref/Test.html - utils/haddock/html-test/ref/TypeFamilies3.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0a0f4ccca3e106384c3a78db8204eb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0a0f4ccca3e106384c3a78db8204eb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message-refactor] Apply 1 suggestion(s) to 1 file(s)
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message-refactor at Glasgow Haskell Compiler / GHC Commits: 67a454b8 by Simon Hengel at 2026-06-22T11:50:24+00:00 Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Jaro Reinders <i5c9aasq(a)anonaddy.me> - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1989,10 +1989,10 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn | otherwise -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) where - origUnit :: Maybe UnitInfo - origUnit = case fromOrigUnit of - Renamed -> Nothing - _ -> lookupUnit pkgs (moduleUnit m) + hiddenOrigUnit :: Maybe UnitInfo + hiddenOrigUnit = case fromOrigUnit of + AvailableFromHiddenPackage -> lookupUnit pkgs (moduleUnit m) + _ -> Nothing unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/67a454b824a4c22a299cc311e9acb7d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/67a454b824a4c22a299cc311e9acb7d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fendor/no-code-output-constr] Add failing test for `-finfo-table-map` and bytecode backend
by Hannes Siebenhandl (＠fendor) 22 Jun '26

22 Jun '26

Hannes Siebenhandl pushed to branch wip/fendor/no-code-output-constr at Glasgow Haskell Compiler / GHC Commits: a376a1c9 by Matthew Pickering at 2026-06-22T13:46:47+02:00 Add failing test for `-finfo-table-map` and bytecode backend If you compile a module using the bytecode backend, with -finfo-table-map, then the info table map doesn't get populated for the module. This is because the -finfo-table-map code path is implemented mostly in the StgToCmm phase which isn't run when creating bytecode. Ticket #27039 - - - - - 4 changed files: - testsuite/tests/ghci/scripts/all.T - + testsuite/tests/ghci/scripts/bytecodeIPE.hs - + testsuite/tests/ghci/scripts/bytecodeIPE.script - + testsuite/tests/ghci/scripts/bytecodeIPE.stdout Changes: ===================================== testsuite/tests/ghci/scripts/all.T ===================================== @@ -385,6 +385,14 @@ test('ListTuplePunsPpr', normal, ghci_script, ['ListTuplePunsPpr.script']) test('ListTuplePunsPprNoAbbrevTuple', [limit_stdout_lines(14)], ghci_script, ['ListTuplePunsPprNoAbbrevTuple.script']) test('T24459', normal, ghci_script, ['T24459.script']) test('T24632', normal, ghci_script, ['T24632.script']) +test('bytecodeIPE', + [ expect_broken(27039) + , extra_hc_opts('-finfo-table-map') + , extra_files(['bytecodeIPE.hs']) + , req_rts_linker + , when(arch('wasm32') or arch('javascript'), skip) + ], + ghci_script, ['bytecodeIPE.script']) # Test package renaming in GHCi session test('GhciPackageRename', ===================================== testsuite/tests/ghci/scripts/bytecodeIPE.hs ===================================== @@ -0,0 +1,12 @@ +module BytecodeIPE where + +import Data.Maybe (isJust) +import GHC.InfoProv (whereFrom) + +marker :: String +marker = id "bytecode-stub-init" +{-# NOINLINE marker #-} + +-- `whereFrom` only succeeds if the module's IPE initializer ran. +probe :: IO Bool +probe = isJust <$> whereFrom marker ===================================== testsuite/tests/ghci/scripts/bytecodeIPE.script ===================================== @@ -0,0 +1,2 @@ +:load bytecodeIPE.hs +probe ===================================== testsuite/tests/ghci/scripts/bytecodeIPE.stdout ===================================== @@ -0,0 +1 @@ +True View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a376a1c9849964b5f420cc039b09410… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a376a1c9849964b5f420cc039b09410… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fendor/no-code-output-constr
by Hannes Siebenhandl (＠fendor) 22 Jun '26

22 Jun '26

Hannes Siebenhandl pushed new branch wip/fendor/no-code-output-constr at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fendor/no-code-output-constr You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sol/reexported-error-message-refactor
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed new branch wip/sol/reexported-error-message-refactor at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/sol/reexported-error-message-… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] Reference correct package in error messages for reexported modules
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: dc72e5b4 by Simon Hengel at 2026-06-22T15:36:02+07:00 Reference correct package in error messages for reexported modules (fixes #27417) - - - - - 11 changed files: - + changelog.d/reexported-module-errors - compiler/GHC/Iface/Errors.hs - compiler/GHC/Iface/Errors/Ppr.hs - compiler/GHC/Iface/Errors/Types.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Unit/Finder/Types.hs - compiler/GHC/Unit/State.hs - ghc/GHCi/UI/Exception.hs - + testsuite/tests/package/ImportReexport.hs - + testsuite/tests/package/ImportReexport.stderr - testsuite/tests/package/all.T Changes: ===================================== changelog.d/reexported-module-errors ===================================== @@ -0,0 +1,4 @@ +section: compiler +synopsis: Reference the correct package in error messages when trying to import a reexported module from a hidden package. +issues: #27417 +mrs: !16229 ===================================== compiler/GHC/Iface/Errors.hs ===================================== @@ -128,7 +128,7 @@ cantFindErr unit_env profile mod_name find_result | otherwise -> GenericMissing - (map ((\uid -> (uid, lookupUnit (ue_homeUnitState unit_env) uid))) pkg_hiddens) + pkg_hiddens mod_hiddens unusables files _ -> panic "cantFindErr" ===================================== compiler/GHC/Iface/Errors/Ppr.hs ===================================== @@ -261,13 +261,13 @@ cantFindErrorX pkg_hidden_hint may_show_locations mod_or_interface (CantFindInst .ppr.mkUnit) res ++ if f then [text "a package flag"] else [] ) - pkg_hidden :: (Unit, Maybe UnitInfo) -> SDoc - pkg_hidden (uid, uif) = + pkg_hidden :: UnitInfo -> SDoc + pkg_hidden unit = text "It is a member of the hidden package" - <+> quotes (ppr uid) + <+> quotes (ppr $ unitId unit) --FIXME: we don't really want to show the unit id here we should -- show the source package id or installed package id if it's ambiguous - <> dot $$ maybe empty pkg_hidden_hint uif + <> dot $$ pkg_hidden_hint unit mod_hidden pkg = ===================================== compiler/GHC/Iface/Errors/Types.hs ===================================== @@ -73,7 +73,7 @@ data CantFindInstalledReason | NotAModule | CouldntFindInFiles [FilePath] | GenericMissing - [(Unit, Maybe UnitInfo)] [Unit] + [UnitInfo] [Unit] [UnusableUnit] [FilePath] | MultiplePackages [(Module, ModuleOrigin)] deriving Generic ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -510,9 +510,9 @@ findLookupResult fc fopts r = case r of , fr_suggestions = []}) LookupMultiple rs -> return (FoundMultiple rs) - LookupHidden pkg_hiddens mod_hiddens -> + LookupHidden fr_pkgs_hidden mod_hiddens -> return (NotFound{ fr_paths = [], fr_pkg = Nothing - , fr_pkgs_hidden = map (moduleUnit.fst) pkg_hiddens + , fr_pkgs_hidden , fr_mods_hidden = map (moduleUnit.fst) mod_hiddens , fr_unusables = [] , fr_suggestions = [] }) ===================================== compiler/GHC/Unit/Finder/Types.hs ===================================== @@ -70,7 +70,7 @@ data FindResult , fr_mods_hidden :: [Unit] -- ^ Module is in these units, -- but the *module* is hidden - , fr_pkgs_hidden :: [Unit] -- ^ Module is in these units, + , fr_pkgs_hidden :: [UnitInfo] -- ^ Module is in these units, -- but the *unit* is hidden -- | Module is in these units, but it is unusable ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1905,7 +1905,7 @@ data LookupResult = -- | No modules found, but there were some hidden ones with -- an exact name match. First is due to package hidden, second -- is due to module being hidden - | LookupHidden [(Module, ModuleOrigin)] [(Module, ModuleOrigin)] + | LookupHidden [UnitInfo] [(Module, ModuleOrigin)] -- | No modules found, but there were some unusable ones with -- an exact name match | LookupUnusable [(Module, ModuleOrigin)] @@ -1954,8 +1954,8 @@ lookupModuleWithSuggestions' :: UnitState -> ModuleName -> PkgQual -> LookupResult -lookupModuleWithSuggestions' pkgs mod_map m mb_pn - = case lookupUniqMap mod_map m of +lookupModuleWithSuggestions' pkgs mod_map name mb_pn + = case lookupUniqMap mod_map name of Nothing -> LookupNotFound suggestions Just xs -> case foldl' classify ([],[],[], []) (sortOn fst $ nonDetUniqMapToList xs) of @@ -1974,14 +1974,18 @@ lookupModuleWithSuggestions' pkgs mod_map m mb_pn -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - _ | originEmpty origin + ModOrigin { fromOrigUnit = origAvailableUnderSameName, fromHiddenReexport } + | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin -> (hidden_pkg, hidden_mod, unusable, x:exposed) | otherwise - -> (x:hidden_pkg, hidden_mod, unusable, exposed) + -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) + where + origUnit :: Maybe UnitInfo + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m) - unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr m) + unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit -- Filters out origins which are not associated with the given package @@ -2011,7 +2015,7 @@ lookupModuleWithSuggestions' pkgs mod_map m mb_pn , fromPackageFlag = False -- always excluded } - suggestions = fuzzyLookup (moduleNameString m) all_mods + suggestions = fuzzyLookup (moduleNameString name) all_mods all_mods :: [(String, ModuleSuggestion)] -- All modules all_mods = sortBy (comparing fst) $ ===================================== ghc/GHCi/UI/Exception.hs ===================================== @@ -222,11 +222,13 @@ ghciDiagnosticMessage ghc_opts msg = Just (pprWithUnitState us $ cantFindErrorX pkg_hidden_hint may_show_locations module_or_interface cfi) _ -> Nothing where - + may_show_locations :: [String] -> SDoc may_show_locations = mayShowLocations ":set -v" (ifaceShowTriedFiles opts) + pkg_hidden_hint :: UnitInfo -> SDoc pkg_hidden_hint = pkgHiddenHint hidden_msg (ifaceBuildingCabalPackage opts) where + hidden_msg :: UnitInfo -> SDoc hidden_msg pkg = text "You can run" <+> quotes (text ":set -package " <> ppr (unitPackageName pkg)) <+> ===================================== testsuite/tests/package/ImportReexport.hs ===================================== @@ -0,0 +1,3 @@ +module ImportReexport where +import GHC.Types -- reexported and renamed by ghc-prim from ghc-internal +import GHC.Platform.ArchOS -- reexported by by ghc and ghc-boot + provided by ghc-platform ===================================== testsuite/tests/package/ImportReexport.stderr ===================================== @@ -0,0 +1,12 @@ +ImportReexport.hs:2:1: error: [GHC-87110] + Could not load module ‘GHC.Types’. + It is a member of the hidden package ‘ghc-prim-0.14.0’. + Use -v to see a list of the files searched for. + +ImportReexport.hs:3:1: error: [GHC-87110] + Could not load module ‘GHC.Platform.ArchOS’. + It is a member of the hidden package ‘ghc-10.1’. + It is a member of the hidden package ‘ghc-boot-10.1’. + It is a member of the hidden package ‘ghc-platform-0.1.0.0’. + Use -v to see a list of the files searched for. + ===================================== testsuite/tests/package/all.T ===================================== @@ -13,6 +13,7 @@ test('package04', normal, compile, [incr_containers]) test('package05', normal, compile, [incr_ghc + inc_ghc]) test('package06', normal, compile, [incr_ghc]) test('package06e', normalise_version('ghc'), compile_fail, [incr_ghc]) +test('ImportReexport', normalise_version('ghc'), compile_fail, ['-hide-all-packages -XNoImplicitPrelude']) test('package07e', normalise_version('ghc'), compile_fail, [incr_ghc + inc_ghc + hide_ghc]) test('package08e', normalise_version('ghc'), compile_fail, [incr_ghc + hide_ghc]) test('package09e', normal, compile_fail, ['-package "containers (Data.Map as M, Data.Set as M)"']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dc72e5b481ca10008c7b8be7df7ded9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dc72e5b481ca10008c7b8be7df7ded9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] More refactoring
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: f1e9b87f by Simon Hengel at 2026-06-22T13:52:42+07:00 More refactoring - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1974,7 +1974,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - ModOrigin { fromOrigUnit, fromHiddenReexport } + ModOrigin { fromOrigUnit = origAvailableUnderSameName, fromHiddenReexport } | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin @@ -1983,14 +1983,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) where origUnit :: Maybe UnitInfo - origUnit - | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m) - | otherwise = Nothing - - origAvailableUnderSameName :: Bool - origAvailableUnderSameName = case fromOrigUnit of - Nothing -> False - Just _ -> True + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m) unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f1e9b87f029e662323335406801cb57… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f1e9b87f029e662323335406801cb57… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] More refactoring
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: 7e0c68bf by Simon Hengel at 2026-06-22T13:51:04+07:00 More refactoring - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1974,7 +1974,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - ModOrigin { fromOrigUnit, fromHiddenReexport } + ModOrigin { fromOrigUnit = origAvailableUnderSameName , fromHiddenReexport } | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin @@ -1983,14 +1983,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) where origUnit :: Maybe UnitInfo - origUnit - | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m) - | otherwise = Nothing - - origAvailableUnderSameName :: Bool - origAvailableUnderSameName = case fromOrigUnit of - Nothing -> False - Just _ -> True + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m) unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e0c68bf1f58aad03510f5a35821845… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e0c68bf1f58aad03510f5a35821845… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/reexported-error-message] Refactoring
by Simon Hengel (＠sol) 22 Jun '26

22 Jun '26

Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC Commits: fcfa795a by Simon Hengel at 2026-06-22T13:35:29+07:00 Refactoring - - - - - 3 changed files: - compiler/GHC/Unit/State.hs - testsuite/tests/package/ImportReexport.hs - testsuite/tests/package/ImportReexport.stderr Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1969,24 +1969,28 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn classify (hidden_pkg, hidden_mod, unusable, exposed) (m, origin0) = let origin = filterOrigin mb_pn (mod_unit m) origin0 x = (m, origin) - - originUnit :: [UnitInfo] -> [UnitInfo] - originUnit - | moduleName m == name, Just pkg <- lookupUnit pkgs (moduleUnit m) = (pkg :) - | otherwise = id - in case origin of ModHidden -> (hidden_pkg, x:hidden_mod, unusable, exposed) ModUnusable _ -> (hidden_pkg, hidden_mod, x:unusable, exposed) - ModOrigin _ _ reexports _ + ModOrigin { fromOrigUnit, fromHiddenReexport } | originEmpty origin -> (hidden_pkg, hidden_mod, unusable, exposed) | originVisible origin -> (hidden_pkg, hidden_mod, unusable, x:exposed) | otherwise - -> (reexports ++ originUnit hidden_pkg, hidden_mod, unusable, exposed) + -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed) + where + origUnit :: Maybe UnitInfo + origUnit + | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m) + | otherwise = Nothing + + origAvailableUnderSameName :: Bool + origAvailableUnderSameName = case fromOrigUnit of + Nothing -> False + Just _ -> True unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name) mod_unit = unit_lookup . moduleUnit ===================================== testsuite/tests/package/ImportReexport.hs ===================================== @@ -1,2 +1,3 @@ module ImportReexport where -import GHC.Types -- reexported by ghc-prim from ghc-internal +import GHC.Types -- reexported and renamed by ghc-prim from ghc-internal +import GHC.Platform.ArchOS -- reexported by by ghc and ghc-boot + provided by ghc-platform ===================================== testsuite/tests/package/ImportReexport.stderr ===================================== @@ -3,3 +3,10 @@ ImportReexport.hs:2:1: error: [GHC-87110] It is a member of the hidden package ‘ghc-prim-0.14.0’. Use -v to see a list of the files searched for. +ImportReexport.hs:3:1: error: [GHC-87110] + Could not load module ‘GHC.Platform.ArchOS’. + It is a member of the hidden package ‘ghc-10.1’. + It is a member of the hidden package ‘ghc-boot-10.1’. + It is a member of the hidden package ‘ghc-platform-0.1.0.0’. + Use -v to see a list of the files searched for. + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fcfa795ad8256084624302865141297… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fcfa795ad8256084624302865141297… You're receiving this email because of your account on gitlab.haskell.org.

1 0