June 2026 - ghc-commits

[Git][ghc/ghc][wip/sol/remove-ddump-json] 152 commits: Refactor ForAllCo
by Simon Hengel (＠sol) 24 Jun '26

24 Jun '26

Simon Hengel pushed to branch wip/sol/remove-ddump-json at Glasgow Haskell Compiler / GHC Commits: 94b62aa7 by Simon Peyton Jones at 2025-09-08T03:37:14-04:00 Refactor ForAllCo This is a pure refactor, addressing #26389. It arranges that the kind coercion in a ForAllCo is a MCoercion, rather than a plain Coercion, thus removing redundancy in the common case. See (FC8) in Note [ForAllCo] It's a nice cleanup. - - - - - 624afa4a by sheaf at 2025-09-08T03:38:05-04:00 Use tcMkScaledFunTys in matchExpectedFunTys We should use tcMkScaledFunTys rather than mkScaledFunTys in GHC.Tc.Utils.Unify.matchExpectedFunTys, as the latter crashes when the kind of the result type is a bare metavariable. We know the result is always Type-like, so we don't need scaledFunTys to try to rediscover that from the kind. Fixes #26277 - - - - - 0975d2b6 by sheaf at 2025-09-08T03:38:54-04:00 Revert "Remove hptAllFamInstances usage during upsweep" This reverts commit 3bf6720eff5e86e673568e756161e6d6150eb440. - - - - - 0cf34176 by soulomoon at 2025-09-08T03:38:54-04:00 Family consistency checks: add test for #26154 This commit adds the test T26154, to make sure that GHC doesn't crash when performing type family consistency checks. This test case was extracted from Agda. Fixes #26154 - - - - - ba210d98 by Simon Peyton Jones at 2025-09-08T16:26:36+01:00 Report solid equality errors before custom errors This MR fixes #26255 by * Reporting solid equality errors like Int ~ Bool before "custom type errors". See comments in `report1` in `reportWanteds` * Suppressing errors that arise from superclasses of Wanteds. See (SCE1) in Note [Suppressing confusing errors] More details in #26255. - - - - - b6249140 by Simon Peyton Jones at 2025-09-10T10:42:38-04:00 Fix a scoping error in Specialise This small patch fixes #26329, which triggered a scoping error. Test is in T21391, with -fpolymorphic-specialisation enabled - - - - - 45305ab8 by sheaf at 2025-09-10T10:43:29-04:00 Make rationalTo{Float,Double} inline in phase 0 We hold off on inlining these until phase 0 to allow constant-folding rules to fire. However, once we get to phase 0, we should inline them, e.g. to expose unboxing opportunities. See CLC proposal #356. - - - - - 0959d4bc by Andreas Klebinger at 2025-09-10T10:44:12-04:00 Add regression test for #26056 - - - - - dc79593d by sheaf at 2025-09-10T10:45:01-04:00 Deep subsumption: unify mults without tcEqMult As seen in #26332, we may well end up with a non-reflexive multiplicity coercion when doing deep subsumption. We should do the same thing that we do without deep subsumption: unify the multiplicities normally, without requiring that the coercion is reflexive (which is what 'tcEqMult' was doing). Fixes #26332 - - - - - 4bfe2269 by sheaf at 2025-09-10T10:45:50-04:00 lint-codes: fixup MSYS drive letter on Windows This change ensures that System.Directory.listDirectory doesn't trip up on an MSYS-style path like '/c/Foo' when trying to list all testsuite stdout/stderr files as required for testing coverage of GHC diagnostic codes in the testsuite. Fixes #25178 - - - - - 56540775 by Ben Gamari at 2025-09-10T10:46:32-04:00 gitlab-ci: Disable split sections on FreeBSD Due to #26303. - - - - - 1537784b by Moritz Angermann at 2025-09-10T10:47:13-04:00 Improve mach-o relocation information This change adds more information about the symbol and addresses we try to relocate in the linker. This significantly helps when deubbging relocation issues reported by users. - - - - - 4e67855b by Moritz Angermann at 2025-09-10T10:47:54-04:00 test.mk expect GhcLeadingUnderscore, not LeadingUnderscore (in line with the other Ghc prefixed variables. - - - - - c1cdd265 by Moritz Angermann at 2025-09-10T10:48:35-04:00 testsuite: Fix broken exec_signals_child.c There is no signal 0. The signal mask is 1-32. - - - - - 99ac335c by Moritz Angermann at 2025-09-10T10:49:15-04:00 testsuite: clarify Windows/Darwin locale rationale for skipping T6037 T2507 T8959a - - - - - 0e8fa77a by Moritz Angermann at 2025-09-10T10:49:56-04:00 Skip broken tests on macOS (due to leading underscore not handled properly in the expected output.) - - - - - 28570c59 by Zubin Duggal at 2025-09-10T10:50:37-04:00 docs(sphinx): fix links to reverse flags when using the :ghc-flag:`-fno-<flag>` syntax This solution is rather hacky and I suspect there is a better way to do this but I don't know enough about Sphinx to do better. Fixes #26352 - - - - - d17257ed by Cheng Shao at 2025-09-10T17:01:27+02:00 rel-eng: update alpine images to 3.22 This patch is a part of #25876 and updates alpine images to 3.22, while still retaining 3.12 for x86_64 fully_static bindists. ------------------------- Metric Decrease: MultiComponentModulesRecomp ------------------------- - - - - - db3276bb by Sylvain Henry at 2025-09-11T11:27:28-04:00 T16180: indicate that the stack isn't executable - - - - - 11eeeba7 by Sylvain Henry at 2025-09-11T11:27:28-04:00 Fix some tests (statically linked GHC vs libc) When GHC is linked statically, the stdout C global variable that GHC uses isn't shared with the stdout C global variable used by loaded code. As a consequence, the latter must be explicitly flushed because GHC won't flush it before exiting. - - - - - 80a07571 by Sylvain Henry at 2025-09-11T11:28:18-04:00 Testsuite: fix debug_rts detection Running the testsuite without Hadrian should set config.debug_rts correctly too. - - - - - 62ae97de by Duncan Coutts at 2025-09-12T13:23:33-04:00 Handle heap allocation failure in I/O primops The current I/O managers do not use allocateMightFail, but future ones will. To support this properly we need to be able to return to the primop with a failure. We simply use a bool return value. Currently however, we will just throw an exception rather than calling the GC because that's what all the other primops do too. For the general issue of primops invoking GC and retrying, see https://gitlab.haskell.org/ghc/ghc/-/issues/24105 - - - - - cb9093f5 by Duncan Coutts at 2025-09-12T13:23:33-04:00 Move (and rename) scheduleStartSignalHandlers into RtsSignals.h Previously it was a local helper (static) function in Schedule.c. Rename it to startPendingSignalHandlers and deifine it as an inline header function in RtsSignals.h. So it should still be fast. Each (new style) I/O manager is going to need to do the same, so eliminating the duplication now makes sense. - - - - - 9736d44a by Duncan Coutts at 2025-09-12T13:23:33-04:00 Reduce detail in printThreadBlockage I/O blocking cases The printThreadBlockage is used in debug tracing output. For the cases BlockedOn{Read,Write,Delay} the output previously included the fd that was being waited on, and the delay target wake time. Superficially this sounds useful, but it's clearly not that useful because it was already wrong for the Win32 non-threaded I/O manager. In that situation it will print garbage (the async_result pointer, cast to a fd or a time). So given that it apparently never mattered that the information was accurate, then it's hardly a big jump to say it doesn't matter if it is present at all. A good reason to remove it is that otherwise we have to make a new API and a per-I/O manager implementation to fetch the information. And for some I/O manager implementations, this information is not available. It is not available in the win32 non-threaded I/O manager. And for some future Linux ones, there is no need for the fd to be stored, so storing it would be just extra space used for very little gain. So the simplest thing is to just remove the detail. - - - - - bc0f2d5d by Duncan Coutts at 2025-09-12T13:23:33-04:00 Add TimeoutQueue.{c,h} and corresponding tests A data structure used to efficiently manage a collection of timeouts. It is a priority queue based on absolute expiry time. It uses 64bit high-precision Time for the keys. The values are normal closures which allows for example using MVars for unblocking. It is common in many applications for timeouts to be created and then deleted or altered before they expire. Thus the choice of data structure for timeouts should support this efficiently. The implementation choice here is a leftist heap with the extra feature that it supports deleting arbitrary elements, provided the caller retain a pointer to the element. While the deleteMin operation takes O(log n) time, as in all heap structures, the delete operation for arbitrary elements /typically/ takes O(1), and only O(log n) in the worst case. In practice, when managing thousands of timeouts it can be a factor of 10 faster to delete a random timeout queue element than to remove the minimum element. This supports the common use case. The plan is to use it in some of the RTS-side I/O managers to support their timer functionality. In this use case the heap value will be an MVar used for each timeout to unblock waiting threads. - - - - - d1679c9d by Duncan Coutts at 2025-09-12T13:23:33-04:00 Add ClosureTable.{c,h} and corresponding tests A table of pointers to closures on the GC heap with stable indexes. It provides O(1) alloc, free and lookup. The table can be expanded using a simple doubling strategy: in which case allocation is typically O(1) and occasionally O(n) for overall amortised O(1). No shrinking is used. The table itself is heap allocated, and points to other heap objects. As such it's necessary to use markClosureTable to ensure the table is used as a GC root to keep the table entries alive, and maintain proper pointers to them as the GC moves heap objects about. It is designed to be allocated and accesses exclusively from a single capability, enabling it to work without any locking. It is thus similar to the StablePtr table, but per-capability which removes the need for locking. It _should_ also provide lower GC pause times with the non-moving GC by spending only O(1) time in markClosureTable, vs O(n) for markStablePtrTable. The plan is to use it in some of the I/O managers to keep track of in-flight I/O operations (but not timers). This allows the tracking info to be kept on the (unpinned) GC heap, and shared with Haskell code, and by putting a pointer to the tracking information in a table, the index remains stable and can be passed via foreign code (like the kernel). - - - - - 78cb8dd5 by Duncan Coutts at 2025-09-12T13:23:33-04:00 Add the StgAsyncIOOp closure type This is intended to be used by multiple I/O managers to help with tracking in-flight I/O operations. It is called asynchronous because from the point of view of the RTS we have many such operations in progress at once. From the point of view of a Haskell thread of course it can look synchronous. - - - - - a2839896 by Duncan Coutts at 2025-09-12T13:23:33-04:00 Add StgAsyncIOOp and StgTimeoutQueue to tso->block_info These will be used by new I/O managers, for threads blocked on I/O or timeouts. - - - - - fdc2451c by Duncan Coutts at 2025-09-12T13:23:33-04:00 Add a new I/O manager based on poll() This is a proof of concept I/O manager, to show how to add new ones neatly, using the ClosureTable and TimeoutQueue infrastructure. It uses the old unix poll() API, so it is of course limited in performance by that, but it should have the benefit of wide compatibility. Also we neatly avoid a name clash with the existing select() I/O manager. Compared to the select() I/O manager: 1. beause it uses poll() it is not limited to 1024 file descriptors (but it's still O(n) so don't expect great performance); 2. it should have much faster threadDelay (when using it in lots of threads at once) because it's based on the new TimeoutQueue which is O(log n) rather than O(n). Some of the code related to timers/timouts is put into a shared module rts/posix/Timeout.{h,c} since it is intended to be shared with other similar I/O managers. - - - - - 6c273b76 by Duncan Coutts at 2025-09-12T13:23:34-04:00 Document the I/O managers in the user guide and note the new poll I/O manager in the release notes. - - - - - 824fab74 by Duncan Coutts at 2025-09-12T13:23:34-04:00 Use the poll() I/O manager by default That is, for the non-threaded RTS, prefer the poll I/O manager over the legacy select() one, if both can be enabled. This patch is primarily for CI testing, so we should probably remove this patch before merging. We can change defaults later after wider testing and feedback. - - - - - 39392532 by Luite Stegeman at 2025-09-12T13:24:16-04:00 Support larger unboxed sums Change known constructor encoding for sums in interfaces to use 11 bits for both the arity and the alternative (up from 8 and 6, respectively) - - - - - 2af12e21 by Luite Stegeman at 2025-09-12T13:24:16-04:00 Decompose padding smallest-first in Cmm toplevel data constructors This makes each individual padding value aligned - - - - - 418fa78f by Luite Stegeman at 2025-09-12T13:24:16-04:00 Use slots smaller than word as tag for smaller unboxed sums This packs unboxed sums more efficiently by allowing Word8, Word16 and Word32 for the tag field if the number of constructors is small enough - - - - - 8d7e912f by Rodrigo Mesquita at 2025-09-12T17:57:24-04:00 ghc-toolchain: Use ByteOrder rather than new Endianness Don't introduce a duplicate datatype when the previous one is equivalent and already used elsewhere. This avoids unnecessary translation between the two. - - - - - 7d378476 by Rodrigo Mesquita at 2025-09-12T17:57:24-04:00 Read Toolchain.Target files rather than 'settings' This commit makes GHC read `lib/targets/default.target`, a file with a serialized value of `ghc-toolchain`'s `GHC.Toolchain.Target`. Moreover, it removes all the now-redundant entries from `lib/settings` that are configured as part of a `Target` but were being written into `settings`. This makes it easier to support multiple targets from the same compiler (aka runtime retargetability). `ghc-toolchain` can be re-run many times standalone to produce a `Target` description for different targets, and, in the future, GHC will be able to pick at runtime amongst different `Target` files. This commit only makes it read the default `Target` configured in-tree or configured when installing the bindist. The remaining bits of `settings` need to be moved to `Target` in follow up commits, but ultimately they all should be moved since they are per-target relevant. Fixes #24212 On Windows, the constant overhead of parsing a slightly more complex data structure causes some small-allocation tests to wiggle around 1 to 2 extra MB (1-2% in these cases). ------------------------- Metric Increase: MultiLayerModulesTH_OneShot T10421 T10547 T12234 T12425 T13035 T18140 T18923 T9198 TcPlugin_RewritePerf ------------------------- - - - - - e0780a16 by Rodrigo Mesquita at 2025-09-12T17:57:24-04:00 ghc-toolchain: Move TgtHasLibm to per-Target file TargetHasLibm is now part of the per-target configuration Towards #26227 - - - - - 8235dd8c by Rodrigo Mesquita at 2025-09-12T17:57:24-04:00 ghc-toolchain: Move UseLibdw to per-Target file To support DWARF unwinding, the RTS must be built with the -f+libdw flag and with the -DUSE_LIBDW macro definition. These flags are passed on build by Hadrian when --enable-dwarf-unwinding is specified at configure time. Whether the RTS was built with support for DWARF is a per-target property, and as such, it was moved to the per-target GHC.Toolchain.Target.Target file. Additionally, we keep in the target file the include and library paths for finding libdw, since libdw should be checked at configure time (be it by configure, or ghc-toolchain, that libdw is properly available). Preserving the user-given include paths for libdw facilitates in the future building the RTS on demand for a given target (if we didn't keep that user input, we couldn't) Towards #26227 - - - - - d5ecf2e8 by Rodrigo Mesquita at 2025-09-12T17:57:25-04:00 ghc-toolchain: Make "Support SMP" a query on a Toolchain.Target "Support SMP" is merely a function of target, so we can represent it as such in `ghc-toolchain`. Hadrian queries the Target using this predicate to determine how to build GHC, and GHC queries the Target similarly to report under --info whether it "Support SMP" Towards #26227 - - - - - e07b031a by Rodrigo Mesquita at 2025-09-12T17:57:25-04:00 ghc-toolchain: Make "tgt rts linker only supports shared libs" function on Target Just like with "Support SMP", "target RTS linker only supports shared libraries" is a predicate on a `Target` so we can just compute it when necessary from the given `Target`. Towards #26227 - - - - - 14123ee6 by Simon Peyton Jones at 2025-09-12T17:58:07-04:00 Solve forall-constraints via an implication, again In this earlier commit: commit 953fd8f1dc080f1c56e3a60b4b7157456949be29 Author: Simon Peyton Jones <simon.peytonjones(a)gmail.com> Date: Mon Jul 21 10:06:43 2025 +0100 Solve forall-constraints immediately, or not at all I used a all-or-nothing strategy for quantified constraints (aka forall-constraints). But alas that fell foul of #26315, and #26376. So this MR goes back to solving a quantified constraint by turning it into an implication; UNLESS we are simplifying constraints from a SPECIALISE pragma, in which case the all-or-nothing strategy is great. See: Note [Solving a Wanted forall-constraint] Other stuff in this MR: * TcSMode becomes a record of flags, rather than an enumeration type; much nicer. * Some fancy footwork to avoid error messages worsening again (The above MR made them better; we want to retain that.) See `GHC.Tc.Errors.Ppr.pprQCOriginExtra`. ------------------------- Metric Decrease: T24471 ------------------------- - - - - - e6c192e2 by Simon Peyton Jones at 2025-09-12T17:58:07-04:00 Add a test case for #26396 ...same bug ast #26315 - - - - - 8f3d80ff by Luite Stegeman at 2025-09-13T08:43:09+02:00 Use mkVirtHeapOffsets for reconstructing terms in RTTI This makes mkVirtHeapOffsets the single source of truth for finding field offsets in closures. - - - - - eb389338 by Luite Stegeman at 2025-09-13T08:43:09+02:00 Sort non-pointer fields by size for more efficient packing This sorts non-pointer fields in mkVirtHeapOffsets, always storing the largest field first. The relative order of equally sized fields remains unchanged. This reduces wasted padding/alignment space in closures with differently sized fields. - - - - - 99b233f4 by Alison at 2025-09-13T16:51:04-04:00 ghc-heap: Fix race condition with profiling builds Apply the same fix from Closures.hs (64fd0fac83) to Heap.hs by adding empty imports to make way-dependent dependencies visible to `ghc -M`. Fixes #15197, #26407 - - - - - 77deaa7a by Cheng Shao at 2025-09-14T21:29:45-04:00 hadrian: build in-tree gmp with -fvisibility=hidden When hadrian builds in-tree gmp, it should build the shared objects with -fvisibility=hidden. The gmp symbols are only used by bignum logic in ghc-internal and shouldn't be exported by the ghc-internal shared library. We should always strive to keep shared library symbol table lean, which benefits platforms with slow dynamic linker or even hard limits about how many symbols can be exported (e.g. macos dyld, win32 dll and wasm dyld). - - - - - 42a18960 by Cheng Shao at 2025-09-14T21:30:26-04:00 Revert "wasm: add brotli compression for ghci browser mode" This reverts commit 731217ce68a1093b5f9e26a07d5bd2cdade2b352. Benchmarks show non-negligible overhead when browser runs on the same host, which is the majority of actual use cases. - - - - - e6755b9f by Cheng Shao at 2025-09-14T21:30:26-04:00 wasm: remove etag logic in ghci browser mode web server This commit removes the etag logic in dyld script's ghci browser mode web server. It was meant to support caching logic of wasm shared libraries, but even if the port is manually specified to make caching even relevant, for localhost the extra overhead around etag logic is simply not worth it according to benchmarks. - - - - - ac5859b9 by sheaf at 2025-09-16T14:58:38-04:00 Add 'Outputable Natural' instance This commit adds an Outputable instance for the Natural natural-number type, as well as a "natural :: Natural -> SDoc" function that mirrors the existing "integer" function. - - - - - d48ebc23 by Cheng Shao at 2025-09-16T14:59:18-04:00 autoconf: emit warning instead of error for FIND_PYTHON logic This patch makes FIND_PYTHON logic emit warning instead of error, so when the user doesn't expect to run the testsuite driver (especially when installing a bindist), python would not be mandatory. Fixes #26347. - - - - - 54b5950e by Sylvain Henry at 2025-09-17T04:45:18-04:00 Print fully qualified unit names in name mismatch It's more user-friendly to directly print the right thing instead of requiring the user to retry with the additional `-dppr-debug` flag. - - - - - 403cb665 by Ben Gamari at 2025-09-17T04:46:00-04:00 configure: Fix consistency between distrib and source CC check Previously distrib/configure.ac did not include `cc`. Closes #26394. - - - - - 2dcd4cb9 by Oleg Grenrus at 2025-09-17T04:46:41-04:00 Use isPrint in showUnique The comment say ``` -- Avoid emitting non-printable characters in pretty uniques. See #25989. ``` so let the code do exactly that. There are tags (at least : and 0 .. 9) which weren't in A .. z range. - - - - - e5dd754b by Oleg Grenrus at 2025-09-17T04:46:42-04:00 Shorten in-module links in hyperlinked source Instead of href="This.Module#ident" to just "#ident" - - - - - 63189b2c by Oleg Grenrus at 2025-09-17T04:46:42-04:00 Use showUnique in internalAnchorIdent Showing the key of Unique as a number is generally not a great idea. GHC Unique has a tag in high bits, so the raw number is unnecessarily big. So now we have ```html <a href="#l-rvgK">bar</a> ``` instead of ```html <a href="#local-6989586621679015689">bar</a> ``` Together with previous changes of shorter intra-module links the effect on compressed files is not huge, that is expected as we simply remove repetitive contents which pack well. ``` 12_694_206 Agda-2.9.0-docs-orig.tar.gz 12_566_065 Agda-2.9.0-docs.tar.gz ``` However when unpacked, the difference can be significant, e.g. Agda's largest module source got 5% reduction: ``` 14_230_117 Agda.Syntax.Parser.Parser.html 13_422_109 Agda.Syntax.Parser.Parser.html ``` The whole hyperlinked source code directory got similar reduction ``` 121M Agda-2.9.0-docs-orig/src 114M Agda-2.9.0-docs/src ``` For the reference, sources are about 2/3 of the generated haddocks ``` 178M Agda-2.9.0-docs-old 172M Agda-2.9.0-docs ``` so we get around 3.5% size reduction overall. Not bad for a small local changes. - - - - - 6f63f57b by Stefan Schulze Frielinghaus at 2025-09-17T04:47:22-04:00 rts: Fix alignment for gen_workspace #26334 After a0fa4941903272c48b050d24e93eec819eff51bd bootstrap is broken on s390x and errors out with rts/sm/GCThread.h:207:5: error: error: alignment of array elements is greater than element size 207 | gen_workspace gens[]; | ^~~~~~~~~~~~~ The alignment constraint is applied via the attribute to the type gen_workspace and leaves the underlying type struct gen_workspace_ untouched. On Aarch64, x86, and s390x the struct has a size of 128 bytes. On Aarch64 and x86 the alignments of 128 and 64 are divisors of the size, respectively, which is why the type is a viable member type for an array. However, on s390x, the alignment is 256 and therefore is not a divisor of the size and hence cannot be used for arrays. Basically I see two fixes here. Either decrease the alignment requirement on s390x, or by applying the alignment constraint on the struct itself. The former might affect performance as noted in a0fa4941903272c48b050d24e93eec819eff51bd. The latter introduces padding bits whenever necessary in order to ensure that sizeof(gen_workspace[N])==N*sizeof(gen_workspace) holds which is done by this patch. - - - - - 06d25623 by Cheng Shao at 2025-09-17T19:32:27-04:00 ghci: add :shell command This patch adds a new :shell command to ghci which works similarly to :!, except it guarantees to run the command via sh -c. On POSIX hosts the behavior is identical to :!, but on Windows it uses the msys2 shell instead of system cmd.exe shell. This is convenient when writing simple ghci scripts that run simple POSIX commands, and the behavior can be expected to be coherent on both Windows and POSIX. Co-authored-by: Codex <codex(a)openai.com> - - - - - 186054f7 by Cheng Shao at 2025-09-17T19:32:27-04:00 testsuite: remove legacy :shell trick This commit makes use of the built-in :shell functionality in ghci in the test cases, and remove the legacy :shell trick. - - - - - 0a3a4aa3 by Cheng Shao at 2025-09-17T19:32:27-04:00 docs: document :shell in ghci This commit documents the :shell command in ghci. Co-authored-by: Codex <codex(a)openai.com> - - - - - a4ff12bb by Cheng Shao at 2025-09-17T19:33:09-04:00 ghc-internal: fix codepages program codepages was not properly updated during the base -> ghc-internal migration, this commit fixes it. - - - - - 7e094def by Cheng Shao at 2025-09-17T19:33:09-04:00 ghc-internal: relax ucd2haskell cabal upper bounds This commit relaxes ucd2haskell cabal upper bounds to make it runnable via ghc 9.12/9.14. - - - - - 7077c9f7 by Cheng Shao at 2025-09-17T19:33:09-04:00 ghc-internal: update to unicode 17.0.0 This commit updates the generated code in ghc-internal to match unicode 17.0.0. - - - - - cef8938f by sheaf at 2025-09-17T19:34:09-04:00 Bad record update msg: allow out-of-scope datacons This commit ensures that, when we encounter an invalid record update (because no constructor exists which contains all of the record fields mentioned in the record update), we graciously handle the situation in which the constructors themselves are not in scope. In that case, instead of looking up the constructors in the GlobalRdrEnv, directly look up their GREInfo using the lookupGREInfo function. Fixes #26391 - - - - - a2d9d7c2 by sheaf at 2025-09-17T19:34:09-04:00 Improve Notes about disambiguating record updates This commit updates the notes [Disambiguating record updates] and [Type-directed record disambiguation], in particular adding more information about the deprecation status of type-directed disambiguation of record updates. - - - - - de44e69e by sheaf at 2025-09-19T05:16:51-04:00 Enable TcM plugins in initTc This commit ensures that we run typechecker plugins and defaulting plugins whenever we call initTc. In particular, this ensures that the pattern-match checker, which calls 'initTcDsForSolver' which calls 'initTc', runs with typechecker plugins enabled. This matters for situations like: merge :: Vec n a -> Vec n a -> Vec (2 * n) a merge Nil Nil = Nil merge (a <: as) (b <: bs) = a :< (b <: merge as bs) in which we need the typechecker plugin to run in order to tell us that the Givens would be inconsistent in the additional equation merge (_ <: _) Nil and thus that the equation is not needed. Fixes #26395 - - - - - 2c378ad2 by Cheng Shao at 2025-09-19T05:17:33-04:00 rel-eng: update fedora image to 42 This patch is a part of #25876 and updates fedora image to 42. - - - - - 0a9d9ffc by Sylvain Henry at 2025-09-19T13:12:14-04:00 Fix output of T14999 (#23685) Fix output of T14999 to: - take into account the +1 offset to DW_AT_low_pc (see Note [Info Offset]) - always use Intel's syntax to force consistency: it was reported that sometimes GDB prints `jmpq` instead of `jmp` with the AT&T syntax - - - - - 1480872a by Vladislav Zavialov at 2025-09-19T13:12:54-04:00 Fix PREP_MAYBE_LIBRARY in prep_target_file.m4 This change fixes a configure error introduced in: commit 8235dd8c4945db9cb03e3be3c388d729d576ed1e ghc-toolchain: Move UseLibdw to per-Target file Now the build no longer fails with: acghc-toolchain: Failed to read a valid Target value from hadrian/cfg/default.target - - - - - d1d9e39e by Ben Gamari at 2025-09-19T18:24:52-04:00 StgToByteCode: Don't assume that data con workers are nullary Previously StgToByteCode assumed that all data-con workers were of a nullary representation. This is not a valid assumption, as seen in #23210, where an unsaturated application of a unary data constructor's worker resulted in invalid bytecode. Sadly, I have not yet been able to reduce a minimal testcase for this. Fixes #23210. - - - - - 3eeecd50 by Ben Gamari at 2025-09-19T18:24:53-04:00 testsuite: Mark T23146* as unbroken - - - - - 2e73f342 by sheaf at 2025-09-19T18:24:53-04:00 Add test for #26216 - - - - - c2efb912 by Sven Tennie at 2025-09-19T18:25:36-04:00 Generate correct test header This increases convenience when copying & pasting... - - - - - d2fb811e by Sven Tennie at 2025-09-19T18:25:36-04:00 foundation test: Fix shift amount (#26248) Shift primops' results are only defined for shift amounts of 0 to word size - 1. The approach is similar to testing div-like operations (which have a constraint regarding zero operands.) This was partly vibe coded (https://github.com/supersven/ghc/pull/1) but then heavily refactored. - - - - - a62ce115 by Andreas Klebinger at 2025-09-19T18:26:18-04:00 Tweak jspace test I've given it a longer timeout, and tweaked the test file generation to speed it up a bit. Hopefully that is enough to make it constentily pass. Last but not least it now also always uses three threads. - - - - - 0f034942 by Cheng Shao at 2025-09-19T18:26:59-04:00 rts: remove obsolete CC_SUPPORTS_TLS logic This patch removes obsolete CC_SUPPORTS_TLS logic throughout the rts, given __thread is now uniformly supported by C toolchains of all platforms we currently support. - - - - - ef705655 by Cheng Shao at 2025-09-19T18:27:41-04:00 rts: remove obsolete HAS_VISIBILITY_HIDDEN logic This patch removes obsolete HAS_VISIBILITY_HIDDEN logic throughout the rts, given __attribute__((visibility("hidden"))) is uniformly supported by C toolchains of all platforms we currently support. - - - - - 9fdc1f7d by Cheng Shao at 2025-09-19T18:28:21-04:00 rts: remove -O3 pragma hack in Hash.c This patch removes an obsolete gcc pragma to specify -O3 in Hash.c. Hadrian already passes the right flag. - - - - - b8cfa8f7 by Cheng Shao at 2025-09-19T18:29:01-04:00 rts: remove obsolete COMPILING_WINDOWS_DLL logic This patch removes obsolete COMPILING_WINDOWS_DLL logic throughout the rts. They were once used for compiling to win32 DLLs, but we haven't been able to compile Haskell units to win32 DLLs for many years now, due to PE format's restriction of no more than 65536 exported symbols in a single DLL. - - - - - bb760611 by Cheng Shao at 2025-09-19T18:29:42-04:00 wasm: bump browser_wasi_shim to 0.4.2 This patch bumps the browser_wasi_shim dependency of wasm dyld script to 0.4.2. - - - - - 8b0940db by Cheng Shao at 2025-09-20T06:48:05-04:00 compiler: move Binary instance of Map to GHC.Utils.Binary This patch moves `Binary` instance of `Map` from `haddock-api` to `GHC.Utils.Binary`. This also allows us to remove a redundant instance defined for `NameEntityInfo`, which is a type synonym for `Map`. - - - - - 4a8fed75 by Vladislav Zavialov at 2025-09-20T06:48:47-04:00 Fix keyword in ExplicitNamespaces error message (#26418) Consider this module header and the resulting error: {-# LANGUAGE NoExplicitNamespaces #-} module T26418 (data HeadC) where -- error: [GHC-47007] -- Illegal keyword 'type' Previously, the error message would mention 'type' (as shown above), even though the user wrote 'data'. This has now been fixed. The error location has also been corrected: it is now reported at the keyword position rather than at the position of the associated import/export item. - - - - - 867c2675 by Cheng Shao at 2025-09-20T06:49:28-04:00 wasm: fix dyld handling for forward declared GOT.func items This patch fixes wasm shared linker's handling of forward declared GOT.func items, see linked issue for details. Also adds T26430 test to witness the fix. Fixes #26430. Co-authored-by: Codex <codex(a)openai.com> - - - - - e7df6cc0 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Improve pretty printer for HsExpr Given a very deeply-nested application, it just kept printing deeper and deeper. This small change makes it cut off. Test is in #26330, but we also get a dramatic decrease in compile time for perf/compiler/InstanceMatching: InstanceMatching 4,086,884,584 1,181,767,232 -71.1% GOOD Why? Because before we got a GIGANTIC error message that took ages to pretty-print; now we get this much more civilised message (I have removed some whitespace.) Match.hs:1007:1: error: • No instance for ‘Show (F001 a)’ arising from a use of ‘showsPrec’ • In the second argument of ‘showString’, namely ‘(showsPrec 11 b1 (GHC.Internal.Show.showSpace (showsPrec 11 b2 (GHC.Internal.Show.showSpace (showsPrec 11 b3 (GHC.Internal.Show.showSpace (showsPrec 11 b4 (GHC.Internal.Show.showSpace (showsPrec 11 b5 (GHC.Internal.Show.showSpace (showsPrec 11 b6 (GHC.Internal.Show.showSpace (showsPrec ...)))))))))))))’ ----------------------- The main payload is * At the start of `pprExpr` * In the defn of `pprApp` A little bit of refactoring: * It turned out that we were setting the default cut-off depth to a fixed value in two places, so changing one didn't change the other. See defaultSDocDepth and defaultSDocCols * I refactored `pprDeeperList` a bit so I could understand it better. Because the depth calculation has changed, there are lots of small error message wibbles. Metric Decrease: InstanceMatching - - - - - 209f0158 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Use Outputable.ellipsis rather than text "..." - - - - - 64bb0e37 by Sylvain Henry at 2025-09-23T14:35:56-04:00 deriveConstants: automatically pass -fcommon CC flag (#26393) By mistake we tried to use deriveConstants without passing `--gcc-flag -fcommon` (which Hadrian does) and it failed. This patch: 1. adds parsing support for constants stored in the .bss section (i.e. when -fcommon isn't passed) 2. enables passing `-fcommon` automatically to the C compiler because Windows requires this for subtle reasons 3. Documents the subtle reasons (1) isn't strictly necessary because we always do (2) but it does no harm and it is still useful if the CC flags ever contain -fno-common - - - - - afcdf92f by Oleg Grenrus at 2025-09-23T14:36:41-04:00 Don't wrap spaces in s Doing similar comparison as in 63189b2ceca07edf4e179f4180ca60d470c62cb3 With this change the gzipped documentation is now 2% smaller (previously 1%) 12_694_206 Agda-2.9.0-docs-orig.tar.gz 12_436_829 Agda-2.9.0-docs.tar.gz Unzipped docs are 5% smaller (previously 3%) 178M Agda-2.9.0-docs-orig 169M Agda-2.9.0-docs Individual hyperlinked sources are around 7-10% smaller (previously 5%) (`Parser` module is generated by happy and has relatively little whitespace) 14_230_117 Agda.Syntax.Parser.Parser.html 13_220_758 Agda.Syntax.Parser.Parser.html Agda's hyperlinked sources are 9% smaller now: 121M Agda-2.9.0-docs-orig/src 110M Agda-2.9.0-docs/src - - - - - 67de53a6 by Cheng Shao at 2025-09-23T14:37:31-04:00 rts: remove obsolete __GNUC__ related logic This patch removes obsolete `__GNUC__` related logic, given on any currently supported platform and toolchain, `__GNUC__ >= 4` is universally true. Also pulls some other weeds and most notably, use `__builtin___clear_cache` for clang as well, since clang has supported this gcc intrinsic since 2014, see https://github.com/llvm/llvm-project/commit/c491a8d4577052bc6b3b4c72a7db6a7…. - - - - - c4d32493 by Sven Tennie at 2025-09-23T20:40:57-04:00 RV64: Fix: Add missing truncation to MO_S_Shr (#26248) Sub-double word (<W64) registers need to be truncated after the operation. - - - - - 41dce477 by Sven Tennie at 2025-09-23T20:40:57-04:00 RV64: Cleanup shift emitting cases/code Remove overlapping cases to make the shift logic easier to understand. - - - - - 0a601c30 by Alex Washburn at 2025-09-23T20:41:41-04:00 Correcting LLVM linking of Intel BMI intrinsics pdep{8,16} and pext{8,16}. This patch fixes #26065. The LLVM interface does not expose bindings to: - llvm.x86.bmi.pdep.8 - llvm.x86.bmi.pdep.16 - llvm.x86.bmi.pext.8 - llvm.x86.bmi.pext.16 So calls are instead made to llvm.x86.bmi.{pdep,pext}.32 in these cases, with pre/post-operation truncation to constrain the logical value range. - - - - - 89e8ff3d by Peng Fan at 2025-09-23T20:42:37-04:00 NCG/LA64: Implement MO_BSwap and MO_BRev with bit-manipulation Instructions - - - - - 50f6be09 by Sylvain Henry at 2025-09-23T20:43:29-04:00 Allow Core plugins to access unoptimized Core (#23337) Make the first simple optimization pass after desugaring a real CoreToDo pass. This allows CorePlugins to decide whether they want to be executed before or after this pass. - - - - - 30ef0aac by Simon Hengel at 2025-09-23T20:44:12-04:00 docs: Fix typo in scoped_type_variables.rst - - - - - f8919262 by Cheng Shao at 2025-09-23T20:44:54-04:00 ghci: fix bootstrapping with 9.12.3-rc1 and above This patch fixes bootstrapping GHC with 9.12.3-rc1 and above. ghci defines `Binary` instance for `HalfWord` in `ghc-heap`, which is a proper `newtype` in 9.14 and starting from 9.12.3. Given we don't build `ghc-heap` in stage0, we need to fix this predicate so that it corresponds to the boot ghc versions that contain the right version of `ghc-heap`. - - - - - a7f15858 by sheaf at 2025-09-24T09:49:53-04:00 User's guide: clarify optimisation of INLINABLE unfoldings This updates the user's guide section on INLINABLE pragmas to explain how the unfoldings of inlineable functions are optimised. The user's guide incorrectly stated that the RHS was not optimised at all, but this is not true. Instead, GHC is careful about phase control to optmise the RHS while retaining the guarantee that GHC behaves as if the original RHS had been written. - - - - - 495886d9 by Rodrigo Mesquita at 2025-09-24T09:50:35-04:00 cleanup: Delete historical artifact of COMPILING_WINDOWS_DLL Namely, drop the obsolete - DLL_IMPORT_RTS - DLL_IMPORT_DATA_VAR - DLL_IMPORT_DATA_VARNAME - DLL_IMPORT_DATA_REF These macros were not doing anything and placed inconsistently Looking at the git logs reveal these macros were used to support dynamic libraries on Win32, a feature that was dropped in b8cfa8f741729ef123569fb321c4b2ab4a1a941c This allows us to get rid of the rts/DLL.h file too. - - - - - 5ae89054 by Sylvain Henry at 2025-09-24T17:07:00-04:00 Allow disabling builtin rules (#20298) Add a way to disable built-in rules programmatically and with a debug flag. I also took the opportunity to add a debug flag to disable bignum rules, which was only possible programmatically (e.g. in a plugin). - - - - - 135242ca by Rodrigo Mesquita at 2025-09-24T17:07:44-04:00 Don't use build CFLAGS and friends as target settings In the GHC in tree configure, `CFLAGS`, `CXXFLAGS`, and similar tool configuration flags apply to the BUILD phase of the compiler, i.e. to the tools run to compile GHC itself. Notably, they should /not/ be carried over to the Target settings, i.e. these flags should /not/ apply to the tool which GHC invokes at runtime. Fixes #25637 - - - - - b418408b by Irene Knapp at 2025-09-25T09:47:54-04:00 Document etymology of "bind" as the name for `>>=` It took me twenty years of contemplation to realize why it's called that. I therefore feel that it may not be obvious to beginners. - - - - - e9c5e46f by Brandon Chinn at 2025-09-25T09:48:36-04:00 Fix tabs in string gaps (#26415) Tabs in string gaps were broken in bb030d0d because previously, string gaps were manually parsed, but now it's lexed by the usual Alex grammar and post-processed after successful lexing. It broke because of a discrepancy between GHC's lexer grammar and the Haskell Report. The Haskell Report includes tabs in whitechar: whitechar → newline | vertab | space | tab | uniWhite $whitechar used to include tabs until 18 years ago, when it was removed in order to exclude tabs from $white_no_nl in order to warn on tabs: 6e202120. In this MR, I'm adding \t back into $whitechar, and explicitly excluding \t from the $white_no_nl+ rule ignoring all whitespace in source code, which more accurately colocates the "ignore all whitespace except tabs, which is handled in the next line" logic. As a side effect of this MR, tabs are now allowed in pragmas; currently, a pragma written as {-# \t LANGUAGE ... #-} is interpreted as the tab character being the pragma name, and GHC warns "Unrecognized pragma". With this change, tabs are ignored as whitespace, which more closely matches the Report anyway. - - - - - 8bf5b309 by Cheng Shao at 2025-09-25T09:49:18-04:00 wasm: remove the --no-turbo-fast-api-calls hack from dynamic linker shebang This patch removes the `--no-turbo-fast-api-calls` hack from the dyld script shebang; it was used to workaround v8 fast call coredumps in nodejs and no longer needed, and comes with a performance penalty, hence the removal. - - - - - c1cab0c3 by Sylvain Henry at 2025-09-26T10:36:30-04:00 Revert "Add necessary flag for js linking" This reverts commit 84f68e2231b2eddb2e1dc4e90af394ef0f2e803f. This commit didn't have the expected effect. See discussion in #26290. Instead we export HEAP8 and HEAPU8 from rts/js/mem.js - - - - - 0a434a80 by Sylvain Henry at 2025-09-26T10:36:30-04:00 JS: export HEAPU8 (#26290) This is now required by newer Emscripten versions. - - - - - b10296a9 by Andreas Klebinger at 2025-09-26T10:37:11-04:00 sizeExpr: Improve Tick handling. When determining if we scrutinize a function argument we now properly look through ticks. Fixes #26444. - - - - - d9e2a9a7 by mniip at 2025-09-26T16:00:50-04:00 rts: Refactor parsing of -h flags We have a nontrivial amount of heap profiling flags available in the non-profiled runtime, so it makes sense to reuse the parsing code between the profiled and the non-profiled runtime, only restricting which flags are allowed. - - - - - 089e45aa by mniip at 2025-09-26T16:00:50-04:00 rts: Fix parsing of -h options with braces When the "filter by" -h options were introduced in bc210f7d267e8351ccb66972f4b3a650eb9338bb, the braces were mandatory. Then in 3c22fb21fb18e27ce8d941069a6915fce584a526, the braces were made optional. Then in d1ce35d2271ac8b79cb5e37677b1a989749e611c the brace syntax stopped working, and no one seems to have noticed. - - - - - 423f1472 by mniip at 2025-09-26T16:00:50-04:00 rts: add -hT<type> and -hi<table id> heap filtering options (#26361) They are available in non-profiled builds. Along the way fixed a bug where combining -he<era> and -hr<retainer> would ignore whether the retainer matches or not. - - - - - 4cda4785 by mniip at 2025-09-26T16:00:50-04:00 docs: Document -hT<type> and -hi<addr> - - - - - 982ad30f by mniip at 2025-09-26T16:00:50-04:00 rts: Refactor dumping the heap census Always do the printing of the total size right next to where the bucket label is printed. This prevents accidentally printing a label without the corresponding amount. Fixed a bug where exactly this happened for -hi profile and the 0x0 (uncategorized) info table. There is now also much more symmetry between fprintf(hp_file,...) and the corresponding traceHeapProfSampleString. - - - - - 8cbe006a by Cheng Shao at 2025-09-26T16:01:34-04:00 hadrian: fix GHC.Platform.Host generation for cross stage1 This patch fixes incorrectly GHC.Platform.Host generation logic for cross stage1 in hadrian (#26449). Also adds T26449 test case to witness the fix. Co-authored-by: Codex <codex(a)openai.com> - - - - - 0ddd0fdc by soulomoon at 2025-09-28T19:24:10-04:00 Remove hptAllInstances usage during upsweep Previously, during the upsweep phase when checking safe imports, we were loading the module interface with runTcInteractive, which in turn calls hptAllInstances. This accesses non-below modules from the home package table. Change the implementation of checkSafeImports to use initTcWithGbl and loadSysInterface to load the module interface, since we already have TcGblEnv at hand. This eliminates the unnecessary use of runTcInteractive and hptAllInstances during the upsweep phase. - - - - - e05c496c by Ben Gamari at 2025-09-28T19:24:59-04:00 base: Update changelog to reflect timing of IOPort# removal This change will make 9.14 afterall. - - - - - bdc9d130 by Cheng Shao at 2025-09-28T19:25:45-04:00 rts: fix wasm JSFFI initialization constructor code This commit fixes wasm JSFFI initialization constructor code so that the constructor is self-contained and avoids invoking a fake __main_argc_argv function. The previous approach of reusing __main_void logic in wasi-libc saves a tiny bit of code, at the expense of link-time trouble whenever GHC links a wasm module without -no-hs-main, in which case the driver-generated main function would clash with the definition here, resulting in a linker error. It's simply better to avoid messing with the main function, and it would additionally allow linking wasm32-wasi command modules that does make use of synchronous JSFFI. - - - - - 5d59fc8f by Cheng Shao at 2025-09-28T19:26:27-04:00 rts: provide stub implementations of ExecPage functions for wasm This patch provides stub implementations of ExecPage functions for wasm. They are never actually invoked at runtime for any non-TNTC platform, yet they can cause link-time errors of missing symbols when the GHCi.InfoTable module gets linked into the final wasm module (e.g. a GHC API program). - - - - - a4d664c7 by Cheng Shao at 2025-09-29T17:29:22+02:00 compiler/ghci: replace the LoadDLL message with LoadDLLs As a part of #25407, this commit changes the LoadDLL message to LoadDLLs, which takes a list of DLL paths to load and returns the list of remote pointer handles. The wasm dyld is refactored to take advantage of LoadDLLs and harvest background parallelism. On other platforms, LoadDLLs is based on a fallback codepath that does sequential loading. The driver is not actually emitting singular LoadDLLs message with multiple DLLs yet, this is left in subsequent commits. Co-authored-by: Codex <codex(a)openai.com> - - - - - c7fc4bae by Cheng Shao at 2025-09-29T17:29:22+02:00 driver: separate downsweep/upsweep phase in loadPackages' This commit refactors GHC.Linker.Loader.loadPackages' to be separated into downsweep/upsweep phases: - The downsweep phase performs dependency analysis and generates a list of topologically sorted packages to load - The upsweep phase sequentially loads these packages by calling loadPackage This is a necessary refactoring to make it possible to make loading of DLLs concurrent. - - - - - ab180104 by Cheng Shao at 2025-09-29T17:57:19+02:00 driver: emit single LoadDLLs message to load multiple DLLs This commit refactors the driver so that it emits a single LoadDLLs message to load multiple DLLs in GHC.Linker.Loader.loadPackages'. Closes #25407. ------------------------- Metric Increase: MultiLayerModulesTH_OneShot TcPlugin_RewritePerf ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - 9c304ec0 by Sean D. Gillespie at 2025-09-29T19:57:07-04:00 Fix SIZED_BIN_OP_TY_INT casts in RTS interpreter Correct `SIZED_BIN_OP_TY_INT` cast to integer. Previously, it cast its second operand as its parameter `ty`. This does not currently cause any issues, since we are only using it for bit shifts. Fixes #26287 - - - - - a1de535f by Luite Stegeman at 2025-09-30T18:40:28-04:00 rts: Fix lost wakeups in threadPaused for threads blocked on black holes The lazy blackholing code in threadPaused could overwrite closures that were already eagerly blackholed, and as such wouldn't have a marked update frame. If the black hole was overwritten by its original owner, this would lead to an undetected collision, and the contents of any existing blocking queue being lost. This adds a check for eagerly blackholed closures and avoids overwriting their contents. Fixes #26324 - - - - - b7e21e49 by Luite Stegeman at 2025-09-30T18:40:28-04:00 rts: push the correct update frame in stg_AP_STACK The frame contains an eager black hole (__stg_EAGER_BLACKHOLE_info) so we should push an stg_bh_upd_frame_info instead of an stg_upd_frame_info. - - - - - 02a7c18a by Cheng Shao at 2025-09-30T18:41:27-04:00 ghci: fix lookupSymbolInDLL behavior on wasm This patch fixes lookupSymbolInDLL behavior on wasm to return Nothing instead of throwing. On wasm, we only have lookupSymbol, and the driver would attempt to call lookupSymbolInDLL first before falling back to lookupSymbol, so lookupSymbolInDLL needs to return Nothing gracefully for the fallback behavior to work. - - - - - aa0ca5e3 by Cheng Shao at 2025-09-30T18:41:27-04:00 hadrian/compiler: enable internal-interpreter for ghc library in wasm stage1 This commit enables the internal-interpreter flag for ghc library in wasm stage1, as well as other minor adjustments to make it actually possible to launch a ghc api session that makes use of the internal interpreter. Closes #26431 #25400. - - - - - 69503668 by Cheng Shao at 2025-09-30T18:41:27-04:00 testsuite: add T26431 test case This commit adds T26431 to testsuite/tests/ghci-wasm which goes through the complete bytecode compilation/linking/running pipeline in wasm, so to witness that the ghc shared library in wasm have full support for internal-interpreter. - - - - - e9445c01 by Matthew Pickering at 2025-09-30T18:42:23-04:00 driver: Load bytecode static pointer entries during linking Previously the entries were loaded too eagerly, during upsweep, but we should delay loading them until we know that the relevant bytecode object is demanded. Towards #25230 - - - - - b8307eab by Cheng Shao at 2025-09-30T18:43:14-04:00 autoconf/ghc-toolchain: remove obsolete C99 check This patch removes obsolete c99 check from autoconf/ghc-toolchain. For all toolchain & platform combination we support, gnu11 or above is already supported without any -std flag required, and our RTS already required C11 quite a few years ago, so the C99 check is completely pointless. - - - - - 9c293544 by Simon Peyton Jones at 2025-10-01T09:36:10+01:00 Fix buglet in GHC.Core.Unify.uVarOrFam We were failing to match two totally-equal types! This led to #26457. - - - - - 554487a7 by Rodrigo Mesquita at 2025-10-01T23:04:43-04:00 cleanup: Drop obsolete comment about HsConDetails HsConDetails used to have an argument representing the type of the tyargs in a list: data HsConDetails tyarg arg rec = PrefixCon [tyarg] [arg] This datatype was shared across 3 synonyms: HsConPatDetails, HsConDeclH98Details, HsPatSynDetails. In the latter two cases, `tyarg` was instanced to `Void` meaning the list was always empty for these cases. In 7b84c58867edca57a45945a20a9391724db6d9e4, this was refactored such that HsConDetails no longer needs a type of tyargs by construction. The first case now represents the type arguments in the args type itself, with something like: ConPat "MkE" [InvisP tp1, InvisP tp2, p1, p2] So the deleted comment really is just obsolete. Fixes #26461 - - - - - 6992ac09 by Cheng Shao at 2025-10-02T07:27:55-04:00 testsuite: remove unused expected output files This patch removes unused expected output files in the testsuites on platforms that we no longer support. - - - - - 39eaaaba by Ben Gamari at 2025-10-02T07:28:45-04:00 rts: Dynamically initialize built-in closures To resolve #26166 we need to eliminate references to undefined symbols in the runtime system. One such source of these is the runtime's static references to `I#` and `C#` due the `stg_INTLIKE` and `stg_CHARLIKE` arrays. To avoid this we make these dynamic, initializing them during RTS start-up. - - - - - c254c54b by Cheng Shao at 2025-10-02T07:29:33-04:00 compiler: only invoke keepCAFsForGHCi if internal-interpreter is enabled This patch makes the ghc library only invoke keepCAFsForGHCi if internal-interpreter is enabled. For cases when it's not (e.g. the host build of a cross ghc), this avoids unnecessarily retaining all CAFs in the heap. Also fixes the type signature of c_keepCAFsForGHCi to match the C ABI. - - - - - c9ec4d43 by Simon Hengel at 2025-10-02T18:42:20-04:00 Update copyright in documentation - - - - - da9633a9 by Matthew Pickering at 2025-10-02T18:43:04-04:00 loader: Unify loadDecls and loadModuleLinkables functions These two functions nearly did the same thing. I have refactored them so that `loadDecls` now calls `loadModuleLinkables`. Fixes #26459 - - - - - 5db98d80 by Simon Hengel at 2025-10-02T18:43:53-04:00 Fix typo - - - - - 1275d360 by Matthew Pickering at 2025-10-03T06:05:56-04:00 testsuite: Use ghci_ways to set ways in PackedDataCon/UnboxedTuples/UnliftedDataTypeInterp tests These tests reimplemented the logic from `valid_way` in order to determine what ways to run. It's easier to use this combination of `only_ways` and `extra_ways` to only run in GHCi ways and always run in GHCi ways. - - - - - c06b534b by Matthew Pickering at 2025-10-03T06:06:40-04:00 Rename interpreterBackend to bytecodeBackend This is preparation for creating bytecode files. The "interpreter" is one way in which we can run bytecode objects. It is more accurate to describe that the backend produces bytecode, rather than the means by which the code will eventually run. The "interpreterBackend" binding is left as a deprecated alias. - - - - - 41bdb16f by Andreas Klebinger at 2025-10-06T18:04:34-04:00 Add a perf test for #26425 - - - - - 1da0c700 by Andreas Klebinger at 2025-10-06T18:05:14-04:00 Testsuite: Silence warnings about Wx-partial in concprog001 - - - - - 7471eb6a by sheaf at 2025-10-07T21:39:43-04:00 Improve how we detect user type errors in types This commit cleans up all the code responsible for detecting whether a type contains "TypeError msg" applications nested inside it. All the logic is now in 'userTypeError_maybe', which is always deep. Whether it looks inside type family applications is determined by the passed-in boolean flag: - When deciding whether a constraint is definitely insoluble, don't look inside type family applications, as they may still reduce -- in which case the TypeError could disappear. - When reporting unsolved constraints, look inside type family applications: they had the chance to reduce but didn't, and the custom type error might contain valuable information. All the details are explained in Note [Custom type errors in constraints] in GHC.Tc.Types.Constraint. Another benefit of this change is that it allows us to get rid of the deeply dodgy 'getUserTypeErrorMsg' function. This commit also improves the detection of custom type errors, for example in equality constraints: TypeError blah ~# rhs It used to be the case that we didn't detect the TypeError on the LHS, because we never considered that equality constraints could be insoluble due to the presence of custom type errors. Addressing this oversight improves detection of redundant pattern match warnings, fixing #26400. - - - - - 29955267 by Rodrigo Mesquita at 2025-10-07T21:40:25-04:00 cleanup: Drop obsolete settings from config.mk.in These values used to be spliced into the bindist's `config.mk` s.t. when `make` was run, the values were read and written into the bindist installation `settings` file. However, we now carry these values to the bindist directly in the default.target toolchain file, and `make` writes almost nothing to `settings` now (see #26227) The entries deleted in this MR were already unused. Fixes #26478 - - - - - f7adfed2 by ARATA Mizuki at 2025-10-08T08:37:24-04:00 T22033 is only relevant if the word size is 64-bit Fixes #25497 - - - - - ff1650c9 by Ben Gamari at 2025-10-08T08:38:07-04:00 rts/posix: Enforce iteration limit on heap reservation logic Previously we could loop indefinitely when attempting to get an address space reservation for our heap. Limit the logic to 8 iterations to ensure we instead issue a reasonable error message. Addresses #26151. - - - - - 01844557 by Ben Gamari at 2025-10-08T08:38:07-04:00 rts/posix: Hold on to low reservations when reserving heap Previously when the OS gave us an address space reservation in low memory we would immediately release it and try again. However, on some platforms this meant that we would get the same allocation again in the next iteration (since mmap's `hint` argument is just that, a hint). Instead we now hold on to low reservations until we have found a suitable heap reservation. Fixes #26151. - - - - - b2c8d052 by Sven Tennie at 2025-10-08T08:38:47-04:00 Build terminfo only in upper stages in cross-builds (#26288) Currently, there's no way to provide library paths for [n]curses for both - build and target - in cross-builds. As stage0 is only used to build upper stages, it should be fine to build terminfo only for them. This re-enables building cross-compilers with terminfo. - - - - - c58f9a61 by Julian Ospald at 2025-10-08T08:39:36-04:00 ghc-toolchain: Drop `ld.gold` from merge object command It's deprecated. Also see #25716 - - - - - 2b8baada by sheaf at 2025-10-08T18:23:37-04:00 Improvements to 'mayLookIdentical' This commit makes significant improvements to the machinery that decides when we should pretty-print the "invisible bits" of a type, such as: - kind applications, e.g. '@k' in 'Proxy @k ty' - RuntimeReps, e.g. 'TYPE r' - multiplicities and linear arrows 'a %1 -> b' To do this, this commit refactors 'mayLookIdentical' to return **which** of the invisible bits don't match up, e.g. in (a %1 -> b) ~ (a %Many -> b) we find that the invisible bit that doesn't match up is a multiplicity, so we should set 'sdocLinearTypes = True' when pretty-printing, and with e.g. Proxy @k1 ~ Proxy @k2 we find that the invisible bit that doesn't match up is an invisible TyCon argument, so we set 'sdocPrintExplicitKinds = True'. We leverage these changes to remove the ad-hoc treatment of linearity of data constructors with 'dataConDisplayType' and 'dataConNonLinearType'. This is now handled by the machinery of 'pprWithInvisibleBits'. Fixes #26335 #26340 - - - - - 20e6b7de by Simon Hengel at 2026-06-24T01:38:39+07:00 Rename MCDiagnostic to UnsafeMCDiagnostic - - - - - 7112062b by Simon Hengel at 2026-06-24T01:38:40+07:00 Remove -ddump-json (fixes #24113) - - - - - e77d6df7 by Simon Hengel at 2026-06-24T01:38:40+07:00 Add SrcSpan to MCDiagnostic - - - - - cd4ff8a7 by Simon Hengel at 2026-06-24T01:38:40+07:00 Get rid of mkLocMessage - - - - - c7676eb4 by Simon Hengel at 2026-06-24T01:38:40+07:00 Add Message data type - - - - - eddceedc by Simon Hengel at 2026-06-24T01:38:40+07:00 Get rid of MessageClass - - - - - 8f7d5ae7 by Simon Hengel at 2026-06-24T01:38:40+07:00 Remove JSON logging - - - - - 575 changed files: - .gitlab-ci.yml - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py - .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py - compiler/GHC.hs - compiler/GHC/Builtin/Uniques.hs - compiler/GHC/Builtin/primops.txt.pp - compiler/GHC/Cmm/Parser.y - compiler/GHC/Cmm/Utils.hs - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core/Coercion.hs - compiler/GHC/Core/Coercion.hs-boot - compiler/GHC/Core/Coercion/Opt.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Multiplicity.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/ConstantFold.hs - compiler/GHC/Core/Opt/Monad.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Pipeline/Types.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/Reduction.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Rules/Config.hs - compiler/GHC/Core/TyCo/Compare.hs - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Ppr.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/TyCo/Tidy.hs - compiler/GHC/Core/Type.hs - compiler/GHC/Core/Unfold.hs - compiler/GHC/Core/Unify.hs - compiler/GHC/CoreToIface.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backend/Internal.hs - compiler/GHC/Driver/Config/Core/Rules.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Env.hs - compiler/GHC/Driver/Errors.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Monad.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/LogQueue.hs - compiler/GHC/Driver/Plugins.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/HsToCore/Errors/Ppr.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Pmc/Ppr.hs - compiler/GHC/HsToCore/Pmc/Solver.hs - compiler/GHC/HsToCore/Pmc/Types.hs - compiler/GHC/Iface/Decl.hs - compiler/GHC/Iface/Errors/Ppr.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Ext/Types.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Make.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Tidy/StaticPtrTable.hs - compiler/GHC/Iface/Type.hs - compiler/GHC/IfaceToCore.hs - compiler/GHC/Linker/Deps.hs - compiler/GHC/Linker/Loader.hs - compiler/GHC/Linker/MacOS.hs - compiler/GHC/Linker/Types.hs - compiler/GHC/Llvm/Ppr.hs - compiler/GHC/Llvm/Types.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/Lexer/String.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/Types.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Runtime/Debugger.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Interpreter.hs - compiler/GHC/Runtime/Interpreter/Types.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/Settings.hs - compiler/GHC/Settings/IO.hs - compiler/GHC/Stg/Unarise.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/StgToCmm/DataCon.hs - compiler/GHC/StgToCmm/Layout.hs - compiler/GHC/SysTools/BaseDir.hs - compiler/GHC/Tc/Deriv/Utils.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Sig.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Instance/Family.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Solver.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/Solver/Solve.hs-boot - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/CtLoc.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/TcType.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Tc/Utils/Unify.hs-boot - compiler/GHC/Tc/Validity.hs - compiler/GHC/Tc/Zonk/TcType.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Error.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Types/Id/Make.hs - compiler/GHC/Types/RepType.hs - compiler/GHC/Types/SourceError.hs - compiler/GHC/Types/TyThing/Ppr.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Unit/Home/Graph.hs - compiler/GHC/Unit/Home/PackageTable.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Error.hs - compiler/GHC/Utils/Logger.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Utils/Ppr.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/cbits/keepCAFsForGHCi.c - compiler/ghc.cabal.in - configure.ac - distrib/configure.ac.in - docs/users_guide/9.16.1-notes.rst - docs/users_guide/conf.py - docs/users_guide/debugging.rst - docs/users_guide/extending_ghc.rst - docs/users_guide/exts/pragmas.rst - docs/users_guide/exts/scoped_type_variables.rst - docs/users_guide/flags.py - docs/users_guide/ghci.rst - docs/users_guide/profiling.rst - docs/users_guide/runtime_control.rst - ghc/GHCi/UI.hs - ghc/GHCi/UI/Exception.hs - ghc/Main.hs - hadrian/bindist/Makefile - hadrian/bindist/config.mk.in - hadrian/cfg/default.host.target.in - hadrian/cfg/default.target.in - hadrian/cfg/system.config.in - hadrian/src/Base.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs - libraries/base/changelog.md - libraries/base/src/GHC/RTS/Flags.hs - libraries/base/tests/unicode002.stdout - libraries/base/tests/unicode003.stdout - libraries/ghc-boot/GHC/Settings/Utils.hs - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-heap/GHC/Exts/Heap.hs - libraries/ghc-internal/cbits/atomic.c - libraries/ghc-internal/cbits/ctz.c - libraries/ghc-internal/codepages/MakeTable.hs - libraries/ghc-internal/codepages/Makefile - libraries/ghc-internal/src/GHC/Internal/Base.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - libraries/ghc-internal/src/GHC/Internal/ResponseFile.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Char/DerivedCoreProperties.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/GeneralCategory.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/SimpleLowerCaseMapping.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/SimpleTitleCaseMapping.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Char/UnicodeData/SimpleUpperCaseMapping.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Version.hs - libraries/ghc-internal/tools/ucd2haskell/ucd.sh - libraries/ghc-internal/tools/ucd2haskell/ucd2haskell.cabal - libraries/ghc-internal/tools/ucd2haskell/unicode_version - libraries/ghci/GHCi/Message.hs - libraries/ghci/GHCi/ObjLink.hs - libraries/ghci/GHCi/Run.hs - linters/lint-codes/LintCodes/Coverage.hs - m4/find_python.m4 - m4/fp_cmm_cpp_cmd_with_args.m4 - m4/fp_find_libdw.m4 - − m4/fp_set_cflags_c99.m4 - − m4/fp_settings.m4 - m4/fp_setup_windows_toolchain.m4 - − m4/fp_visibility_hidden.m4 - m4/fptools_set_c_ld_flags.m4 - m4/ghc_toolchain.m4 - m4/prep_target_file.m4 - + m4/subst_tooldir.m4 - mk/hsc2hs.in - rts/Apply.cmm - rts/BeginPrivate.h - + rts/BuiltinClosures.c - + rts/BuiltinClosures.h - rts/CloneStack.h - + rts/ClosureTable.c - + rts/ClosureTable.h - rts/EndPrivate.h - rts/ExecPage.c - rts/Hash.c - rts/IOManager.c - rts/IOManager.h - rts/IOManagerInternals.h - rts/Interpreter.c - rts/Prelude.h - rts/PrimOps.cmm - rts/ProfHeap.c - rts/RetainerSet.c - − rts/RtsDllMain.c - − rts/RtsDllMain.h - rts/RtsFlags.c - rts/RtsSignals.h - rts/RtsStartup.c - rts/RtsSymbols.c - rts/Schedule.c - rts/StgMiscClosures.cmm - rts/Task.c - rts/Task.h - rts/ThreadPaused.c - rts/Threads.c - + rts/TimeoutQueue.c - + rts/TimeoutQueue.h - rts/configure.ac - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - rts/include/rts/Constants.h - rts/include/rts/Flags.h - rts/include/rts/NonMoving.h - rts/include/rts/OSThreads.h - rts/include/rts/StableName.h - rts/include/rts/StablePtr.h - rts/include/rts/Types.h - rts/include/rts/storage/Closures.h - rts/include/rts/storage/TSO.h - − rts/include/stg/DLL.h - rts/include/stg/MiscClosures.h - rts/js/mem.js - rts/linker/MachO.c - rts/posix/OSMem.c - rts/posix/OSThreads.c - + rts/posix/Poll.c - + rts/posix/Poll.h - + rts/posix/Timeout.c - + rts/posix/Timeout.h - rts/rts.cabal - rts/sm/BlockAlloc.c - rts/sm/Evac.c - rts/sm/Evac.h - rts/sm/GCTDecl.h - rts/sm/GCThread.h - rts/sm/Storage.c - rts/wasm/JSFFI.c - rts/win32/OSThreads.c - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/ghc-config/ghc-config.hs - testsuite/mk/test.mk - testsuite/tests/arrows/gadt/T17423.stderr - testsuite/tests/backpack/should_fail/bkpfail11.stderr - testsuite/tests/backpack/should_fail/bkpfail43.stderr - + testsuite/tests/bytecode/T26216.hs - + testsuite/tests/bytecode/T26216.script - + testsuite/tests/bytecode/T26216.stdout - + testsuite/tests/bytecode/T26216_aux.hs - testsuite/tests/bytecode/all.T - testsuite/tests/codeGen/should_compile/Makefile - testsuite/tests/codeGen/should_compile/T14999.stdout - + testsuite/tests/codeGen/should_compile/T20298a.hs - + testsuite/tests/codeGen/should_compile/T20298a.stderr - + testsuite/tests/codeGen/should_compile/T20298b.hs - + testsuite/tests/codeGen/should_compile/T20298b.stderr - + testsuite/tests/codeGen/should_compile/T20298c.hs - + testsuite/tests/codeGen/should_compile/T20298c.stderr - testsuite/tests/codeGen/should_compile/T25166.stdout → testsuite/tests/codeGen/should_compile/T25166.stdout-ws-32 - + testsuite/tests/codeGen/should_compile/T25166.stdout-ws-64 - testsuite/tests/codeGen/should_compile/all.T - testsuite/tests/codeGen/should_run/T13825-unit.hs - testsuite/tests/codeGen/should_run/T23146/all.T - testsuite/tests/concurrent/prog001/all.T - testsuite/tests/cpranal/should_compile/T18174.stderr - + testsuite/tests/cross/should_run/T26449.hs - + testsuite/tests/cross/should_run/all.T - + testsuite/tests/deriving/should_compile/T26396.hs - testsuite/tests/deriving/should_compile/all.T - testsuite/tests/deriving/should_fail/T12768.stderr - testsuite/tests/deriving/should_fail/T1496.stderr - testsuite/tests/deriving/should_fail/T21302.stderr - testsuite/tests/deriving/should_fail/T22696b.stderr - testsuite/tests/deriving/should_fail/T5498.stderr - testsuite/tests/deriving/should_fail/T7148.stderr - testsuite/tests/deriving/should_fail/T7148a.stderr - testsuite/tests/driver/T16167.stderr - − testsuite/tests/driver/T16167.stdout - testsuite/tests/driver/T5313.hs - testsuite/tests/driver/all.T - testsuite/tests/driver/j-space/Makefile - testsuite/tests/driver/j-space/all.T - testsuite/tests/driver/j-space/genJspace - testsuite/tests/driver/json2.stderr - − testsuite/tests/driver/json_dump.hs - − testsuite/tests/driver/json_dump.stderr - testsuite/tests/driver/multipleHomeUnits/all.T - testsuite/tests/ffi/should_run/T1288_c.c - testsuite/tests/ffi/should_run/T1288_ghci_c.c - testsuite/tests/ffi/should_run/T2276_c.c - testsuite/tests/ffi/should_run/T2276_ghci_c.c - testsuite/tests/ghc-api/T10052/T10052.hs - testsuite/tests/ghc-api/T20757.hs - testsuite/tests/ghc-api/T7478/T7478.hs - testsuite/tests/ghc-api/T8639_api.hs - testsuite/tests/ghc-api/apirecomp001/myghc.hs - testsuite/tests/ghc-api/settings-escape/T24265.hs - testsuite/tests/ghc-api/settings-escape/T24265.stderr - + testsuite/tests/ghc-api/settings-escape/ghc-install-folder/lib with spaces/targets/.gitkeep - + testsuite/tests/ghci-wasm/Makefile - + testsuite/tests/ghci-wasm/T26430.hs - + testsuite/tests/ghci-wasm/T26430A.c - + testsuite/tests/ghci-wasm/T26430B.c - + testsuite/tests/ghci-wasm/T26431.hs - + testsuite/tests/ghci-wasm/T26431.stdout - + testsuite/tests/ghci-wasm/all.T - testsuite/tests/ghci.debugger/scripts/break022/all.T - testsuite/tests/ghci.debugger/scripts/break022/break022.script - testsuite/tests/ghci.debugger/scripts/break023/all.T - testsuite/tests/ghci.debugger/scripts/break023/break023.script - testsuite/tests/ghci/linking/dyn/T3372.hs - testsuite/tests/ghci/prog001/prog001.T - testsuite/tests/ghci/prog001/prog001.script - testsuite/tests/ghci/prog002/prog002.T - testsuite/tests/ghci/prog002/prog002.script - testsuite/tests/ghci/prog003/prog003.T - testsuite/tests/ghci/prog003/prog003.script - testsuite/tests/ghci/prog005/prog005.T - testsuite/tests/ghci/prog005/prog005.script - testsuite/tests/ghci/prog010/all.T - testsuite/tests/ghci/prog010/ghci.prog010.script - testsuite/tests/ghci/prog012/all.T - testsuite/tests/ghci/prog012/prog012.script - testsuite/tests/ghci/recompTHghci/all.T - testsuite/tests/ghci/recompTHghci/recompTHghci.script - testsuite/tests/ghci/scripts/T18330.script - testsuite/tests/ghci/scripts/T18330.stdout - testsuite/tests/ghci/scripts/T1914.script - testsuite/tests/ghci/scripts/T20587.script - testsuite/tests/ghci/scripts/T6106.script - testsuite/tests/ghci/scripts/T7388.hs - testsuite/tests/ghci/scripts/T7388.script - testsuite/tests/ghci/scripts/T8353.script - testsuite/tests/ghci/scripts/all.T - testsuite/tests/ghci/scripts/ghci038.script - testsuite/tests/ghci/scripts/ghci058.script - testsuite/tests/ghci/scripts/ghci063.script - − testsuite/tests/ghci/shell.hs - testsuite/tests/ghci/should_run/PackedDataCon/packeddatacon.T - testsuite/tests/ghci/should_run/UnboxedTuples/unboxedtuples.T - testsuite/tests/ghci/should_run/UnliftedDataTypeInterp/unlifteddatatypeinterp.T - testsuite/tests/impredicative/T17332.stderr - testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr - testsuite/tests/indexed-types/should_fail/T14887.stderr - testsuite/tests/indexed-types/should_fail/T26176.stderr - testsuite/tests/indexed-types/should_fail/T2693.stderr - testsuite/tests/indexed-types/should_fail/T4093b.stderr - testsuite/tests/indexed-types/should_fail/T8518.stderr - testsuite/tests/indexed-types/should_fail/T9662.stderr - testsuite/tests/interface-stability/ghc-experimental-exports.stdout - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - + testsuite/tests/linear/should_compile/T26332.hs - testsuite/tests/linear/should_compile/all.T - testsuite/tests/linear/should_fail/Linear17.stderr - testsuite/tests/linear/should_fail/LinearLet7.stderr - testsuite/tests/linear/should_fail/T19361.stderr - + testsuite/tests/llvm/should_run/T26065.hs - + testsuite/tests/llvm/should_run/T26065.stdout - testsuite/tests/llvm/should_run/all.T - testsuite/tests/numeric/should_run/foundation.hs - + testsuite/tests/overloadedrecflds/should_fail/T26391.hs - + testsuite/tests/overloadedrecflds/should_fail/T26391.stderr - testsuite/tests/overloadedrecflds/should_fail/all.T - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail11.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr - testsuite/tests/parser/should_fail/T16270h.stderr - + testsuite/tests/parser/should_fail/T26418.hs - + testsuite/tests/parser/should_fail/T26418.stderr - testsuite/tests/parser/should_fail/all.T - + testsuite/tests/parser/should_run/T26415.hs - + testsuite/tests/parser/should_run/T26415.stdout - testsuite/tests/parser/should_run/all.T - testsuite/tests/partial-sigs/should_compile/T21719.stderr - testsuite/tests/perf/compiler/MultiLayerModulesDefsGhci.script - + testsuite/tests/perf/compiler/T26425.hs - testsuite/tests/perf/compiler/all.T - testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs - testsuite/tests/plugins/hooks-plugin/Hooks/LogPlugin.hs - testsuite/tests/plugins/late-plugin/LatePlugin.hs - testsuite/tests/plugins/simple-plugin/Simple/ReplacePlugin.hs - + testsuite/tests/pmcheck/should_compile/T26400.hs - + testsuite/tests/pmcheck/should_compile/T26400.stderr - + testsuite/tests/pmcheck/should_compile/T26400b.hs - testsuite/tests/pmcheck/should_compile/all.T - testsuite/tests/polykinds/T13393.stderr - − testsuite/tests/process/process010.stdout-i386-unknown-solaris2 - + testsuite/tests/profiling/should_compile/T26056.hs - testsuite/tests/profiling/should_compile/all.T - testsuite/tests/quantified-constraints/T19690.stderr - testsuite/tests/quantified-constraints/T19921.stderr - testsuite/tests/quantified-constraints/T21006.stderr - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/roles/should_compile/Roles13.stderr - testsuite/tests/roles/should_fail/RolesIArray.stderr - + testsuite/tests/rts/ClosureTable.hs - + testsuite/tests/rts/ClosureTable_c.c - + testsuite/tests/rts/TimeoutQueue.c - + testsuite/tests/rts/TimeoutQueue.stdout - testsuite/tests/rts/all.T - testsuite/tests/rts/exec_signals_child.c - − testsuite/tests/rts/linker/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32 - − testsuite/tests/rts/linker/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32 - testsuite/tests/rts/linker/T11223/all.T - testsuite/tests/rts/linker/T2615.hs - − testsuite/tests/rts/outofmem.stderr-i386-apple-darwin - − testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32 - − testsuite/tests/rts/outofmem.stderr-powerpc-apple-darwin - testsuite/tests/simplCore/should_compile/DsSpecPragmas.hs - testsuite/tests/simplCore/should_compile/DsSpecPragmas.stderr - testsuite/tests/simplCore/should_compile/OpaqueNoCastWW.stderr - testsuite/tests/simplCore/should_compile/T17673.stderr - testsuite/tests/simplCore/should_compile/T18078.stderr - testsuite/tests/simplCore/should_compile/T18995.stderr - testsuite/tests/simplCore/should_compile/T19890.stderr - testsuite/tests/simplCore/should_compile/T21948.stderr - testsuite/tests/simplCore/should_compile/T21960.stderr - testsuite/tests/simplCore/should_compile/T24808.stderr - − testsuite/tests/simplCore/should_compile/T25713.stderr - testsuite/tests/simplCore/should_compile/T4201.stdout - testsuite/tests/simplCore/should_compile/T8331.stderr - testsuite/tests/simplCore/should_compile/simpl017.stderr - + testsuite/tests/tcplugins/T26395.hs - + testsuite/tests/tcplugins/T26395.stderr - + testsuite/tests/tcplugins/T26395_Plugin.hs - testsuite/tests/tcplugins/all.T - testsuite/tests/th/T10945.stderr - testsuite/tests/th/T16180.hs - testsuite/tests/th/TH_StaticPointers02.stderr - testsuite/tests/typecheck/no_skolem_info/T20232.stderr - testsuite/tests/typecheck/should_compile/T11339.stderr - testsuite/tests/typecheck/should_compile/T14434.hs - + testsuite/tests/typecheck/should_compile/T26154.hs - + testsuite/tests/typecheck/should_compile/T26154_A.hs - + testsuite/tests/typecheck/should_compile/T26154_B.hs - + testsuite/tests/typecheck/should_compile/T26154_B.hs-boot - + testsuite/tests/typecheck/should_compile/T26154_Other.hs - + testsuite/tests/typecheck/should_compile/T26277.hs - + testsuite/tests/typecheck/should_compile/T26376.hs - + testsuite/tests/typecheck/should_compile/T26457.hs - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/DoExpansion3.stderr - testsuite/tests/typecheck/should_fail/T11672.stderr - testsuite/tests/typecheck/should_fail/T12177.stderr - testsuite/tests/typecheck/should_fail/T12373.stderr - testsuite/tests/typecheck/should_fail/T15801.stderr - testsuite/tests/typecheck/should_fail/T15807.stderr - testsuite/tests/typecheck/should_fail/T16074.stderr - testsuite/tests/typecheck/should_fail/T18357a.stderr - testsuite/tests/typecheck/should_fail/T18851.hs - testsuite/tests/typecheck/should_fail/T19627.stderr - testsuite/tests/typecheck/should_fail/T20241b.stderr - testsuite/tests/typecheck/should_fail/T20666.stderr - testsuite/tests/typecheck/should_fail/T20666a.stderr - testsuite/tests/typecheck/should_fail/T20666b.stderr - testsuite/tests/typecheck/should_fail/T21530a.stderr - testsuite/tests/typecheck/should_fail/T22707.stderr - testsuite/tests/typecheck/should_fail/T22912.stderr - testsuite/tests/typecheck/should_fail/T23427.stderr - testsuite/tests/typecheck/should_fail/T24064.stderr - + testsuite/tests/typecheck/should_fail/T26255a.hs - + testsuite/tests/typecheck/should_fail/T26255a.stderr - + testsuite/tests/typecheck/should_fail/T26255b.hs - + testsuite/tests/typecheck/should_fail/T26255b.stderr - + testsuite/tests/typecheck/should_fail/T26255c.hs - + testsuite/tests/typecheck/should_fail/T26255c.stderr - + testsuite/tests/typecheck/should_fail/T26330.hs - + testsuite/tests/typecheck/should_fail/T26330.stderr - testsuite/tests/typecheck/should_fail/T8142.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/UnliftedNewtypesFamilyKindFail2.stderr - testsuite/tests/typecheck/should_fail/VisFlag1.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_fail/tcfail128.stderr - testsuite/tests/typecheck/should_fail/tcfail153.stderr - testsuite/tests/typecheck/should_fail/tcfail168.stderr - testsuite/tests/typecheck/should_fail/tcfail177.stderr - testsuite/tests/typecheck/should_fail/tcfail185.stderr - testsuite/tests/typecheck/should_run/Typeable1.stderr - + testsuite/tests/unboxedsums/UbxSumUnpackedSize.hs - + testsuite/tests/unboxedsums/UbxSumUnpackedSize.stdout - + testsuite/tests/unboxedsums/UbxSumUnpackedSize.stdout-ws-32 - testsuite/tests/unboxedsums/all.T - testsuite/tests/unboxedsums/unboxedsums_unit_tests.hs - utils/check-exact/Main.hs - utils/check-exact/Preprocess.hs - utils/deriveConstants/Main.hs - utils/genprimopcode/Main.hs - utils/genprimopcode/Syntax.hs - utils/ghc-pkg/Main.hs - utils/ghc-pkg/ghc-pkg.cabal.in - utils/ghc-toolchain/exe/Main.hs - utils/ghc-toolchain/ghc-toolchain.cabal - + utils/ghc-toolchain/src/GHC/Toolchain/Library.hs - utils/ghc-toolchain/src/GHC/Toolchain/PlatformDetails.hs - utils/ghc-toolchain/src/GHC/Toolchain/Target.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cc.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cpp.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Cxx.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/MergeObjs.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Utils.hs - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs - utils/haddock/hypsrc-test/Main.hs - utils/haddock/hypsrc-test/ref/src/Bug1091.html - utils/haddock/hypsrc-test/ref/src/CPP.html - utils/haddock/hypsrc-test/ref/src/Classes.html - utils/haddock/hypsrc-test/ref/src/Constructors.html - utils/haddock/hypsrc-test/ref/src/Identifiers.html - utils/haddock/hypsrc-test/ref/src/LinkingIdentifiers.html - utils/haddock/hypsrc-test/ref/src/Literals.html - utils/haddock/hypsrc-test/ref/src/Operators.html - utils/haddock/hypsrc-test/ref/src/Polymorphism.html - utils/haddock/hypsrc-test/ref/src/PositionPragmas.html - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/haddock/hypsrc-test/ref/src/Records.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellSplices.html - utils/haddock/hypsrc-test/ref/src/Types.html - utils/haddock/hypsrc-test/ref/src/UsingQuasiquotes.html - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dbb155d48a1c976271e9c7ca44bf6a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dbb155d48a1c976271e9c7ca44bf6a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sol/interactive-error-hints] Add a flag to control GHCi specific error hints (close #27409)
by Simon Hengel (＠sol) 24 Jun '26

24 Jun '26

Simon Hengel pushed to branch wip/sol/interactive-error-hints at Glasgow Haskell Compiler / GHC Commits: 1986a531 by Simon Hengel at 2026-06-24T01:11:07+07:00 Add a flag to control GHCi specific error hints (close #27409) - - - - - 12 changed files: - + changelog.d/interactive-error-hints - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Utils/Outputable.hs - docs/users_guide/ghci.rst - ghc/GHCi/UI/Exception.hs - ghc/Main.hs - testsuite/tests/ghci/prog-mhu002/prog-mhu002c.stdout - testsuite/tests/ghci/scripts/ghci024.stdout - testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 Changes: ===================================== changelog.d/interactive-error-hints ===================================== @@ -0,0 +1,6 @@ +section: compiler +synopsis: + Add flags `-finteractive-error-hints` / `-fno-interactive-error-hints` that + control whether GHCi specific error hints are printed. +issues: #27409 +mrs: !16225 ===================================== compiler/GHC/Driver/DynFlags.hs ===================================== @@ -1570,6 +1570,7 @@ initSDocContext dflags style = SDC , sdocLineLength = pprCols dflags , sdocCanUseUnicode = useUnicode dflags , sdocPrintErrIndexLinks = overrideWith (canUseErrorLinks dflags) (useErrorLinks dflags) + , sdocInteractiveErrorHints = gopt Opt_InteractiveErrorHints dflags , sdocHexWordLiterals = gopt Opt_HexWordLiterals dflags , sdocPprDebug = dopt Opt_D_ppr_debug dflags , sdocPrintUnicodeSyntax = gopt Opt_PrintUnicodeSyntax dflags ===================================== compiler/GHC/Driver/Flags.hs ===================================== @@ -861,6 +861,7 @@ data GeneralFlag -- Error message suppression | Opt_ShowErrorContext + | Opt_InteractiveErrorHints -- Object code determinism | Opt_ObjectDeterminism ===================================== compiler/GHC/Driver/Session.hs ===================================== @@ -2665,6 +2665,7 @@ fFlagsDeps = [ (addWarn "-compact-unwind is only implemented by the darwin platform. Ignoring.") return dflags)), flagSpec "show-error-context" Opt_ShowErrorContext, + flagSpec "interactive-error-hints" Opt_InteractiveErrorHints, flagSpec "cmm-thread-sanitizer" Opt_CmmThreadSanitizer, flagSpec "split-sections" Opt_SplitSections, flagSpec "break-points" Opt_InsertBreakpoints, ===================================== compiler/GHC/Types/Hint/Ppr.hs ===================================== @@ -43,19 +43,44 @@ instance Outputable GhcHint where -> case extHint of SuggestSingleExtension extraUserInfo ext -> ("Perhaps you intended to use" <+> extension_with_implied ext) - $$ extraUserInfo + $$ interactiveErrorHints [ext] extraUserInfo False SuggestAnyExtension extraUserInfo exts -> (enable "any" <+> unquotedListWith "or" (map implied exts)) - $$ extraUserInfo + $$ interactiveErrorHints exts extraUserInfo True SuggestExtensions extraUserInfo exts -> (enable "all" <+> unquotedListWith "and" (map implied exts)) - $$ extraUserInfo + $$ interactiveErrorHints exts extraUserInfo False SuggestExtensionInOrderTo extraUserInfo ext -> ("Use" <+> extension_with_implied ext) - $$ extraUserInfo + $$ interactiveErrorHints [ext] extraUserInfo False where extension_with_implied ext = "the" <+> quotes (ppr ext) <+> "extension" <+> pprImpliedExtensions ext implied ext = quotes (ppr ext) <+> pprImpliedExtensions ext enable any_or_all = "Enable" <+> any_or_all <+> "of the following extensions" <> colon + + interactiveErrorHints :: [LangExt.Extension] -> SDoc -> Bool -> SDoc + interactiveErrorHints exts doc enable_any = sdocOption sdocInteractiveErrorHints $ \ case + True -> suggestSetExt exts doc enable_any + False -> doc + + -- Suggest enabling extension with :set -X<ext> + -- SuggestAnyExtension will be on multiple lines so the user can select which to enable without editing + suggestSetExt :: [LangExt.Extension] -> SDoc -> Bool -> SDoc + suggestSetExt exts doc enable_any = doc $$ hang header 2 exts_cmds + where + header = text "You may enable" <+> which <+> text "language extension" <> plural exts <+> text "in GHCi with:" + which + | [ _ext ] <- exts + = text "this" + | otherwise + = if enable_any + then text "these" + else text "all of these" + exts_cmds + | enable_any + = vcat $ map (\ext -> text ":set -X" <> ppr ext) exts + | otherwise + = text ":set" <> hcat (map (\ext -> text " -X" <> ppr ext) exts) + SuggestCorrectPragmaName suggestions -> text "Perhaps you meant" <+> quotedListWithOr (map text suggestions) SuggestMissingDo ===================================== compiler/GHC/Utils/Outputable.hs ===================================== @@ -398,6 +398,7 @@ data SDocContext = SDC -- ^ True if Unicode encoding is supported -- and not disabled by GHC_NO_UNICODE environment variable , sdocPrintErrIndexLinks :: !Bool + , sdocInteractiveErrorHints :: !Bool , sdocHexWordLiterals :: !Bool , sdocPprDebug :: !Bool , sdocPrintUnicodeSyntax :: !Bool @@ -466,6 +467,7 @@ defaultSDocContext = SDC , sdocLineLength = defaultSDocCols , sdocCanUseUnicode = False , sdocPrintErrIndexLinks = False + , sdocInteractiveErrorHints = False , sdocHexWordLiterals = False , sdocPprDebug = False , sdocPrintUnicodeSyntax = False ===================================== docs/users_guide/ghci.rst ===================================== @@ -2114,6 +2114,27 @@ mostly obvious. If disabled, only the target given last on the command line interface will be added to interactive context of the GHCi session. +.. ghc-flag:: -finteractive-error-hints + :shortdesc: Print GHCi specific error hints. + :type: dynamic + :reverse: -fno-interactive-error-hints + :category: + + :default: on + :since: 10.2.1 + + By default, GHCi extends error hints with GHCi specific instructions. + + Example: + + .. code-block:: none + + Perhaps you intended to use the ‘BlockArguments’ extension + You may enable this language extension in GHCi with: + :set -XBlockArguments + + This can be disabled with `-fno-interactive-error-hints`. + Packages ~~~~~~~~ ===================================== ghc/GHCi/UI/Exception.hs ===================================== @@ -23,8 +23,6 @@ import GHC.Driver.Errors.Types import GHC.Iface.Errors.Ppr import GHC.Iface.Errors.Types -import qualified GHC.LanguageExtensions as LangExt - import GHC.Tc.Errors.Ppr import GHC.Tc.Errors.Types @@ -137,7 +135,7 @@ instance Diagnostic GhciMessage where GhciUnknownMessage m -> diagnosticReason m diagnosticHints = \case - GhciGhcMessage m -> map GhciGhcHint (ghciDiagnosticHints m) + GhciGhcMessage m -> map GhciGhcHint (diagnosticHints m) GhciCommandMessage m -> map GhciCommandHint (diagnosticHints m) GhciUnknownMessage m -> diagnosticHints m @@ -146,40 +144,6 @@ instance Diagnostic GhciMessage where GhciCommandMessage m -> diagnosticCode m GhciUnknownMessage m -> diagnosticCode m - --- | Modifications to hint messages which we want to display in GHCi. -ghciDiagnosticHints :: GhcMessage -> [GhcHint] -ghciDiagnosticHints msg = map modifyHintForGHCi (diagnosticHints msg) - where - modifyHintForGHCi :: GhcHint -> GhcHint - modifyHintForGHCi = \case - SuggestExtension extHint -> SuggestExtension $ modifyExtHintForGHCi extHint - hint -> hint - modifyExtHintForGHCi :: LanguageExtensionHint -> LanguageExtensionHint - modifyExtHintForGHCi = \case - SuggestSingleExtension doc ext -> SuggestSingleExtension (suggestSetExt [ext] doc False) ext - SuggestExtensionInOrderTo doc ext -> SuggestExtensionInOrderTo (suggestSetExt [ext] doc False) ext - SuggestAnyExtension doc exts -> SuggestAnyExtension (suggestSetExt exts doc True ) exts - SuggestExtensions doc exts -> SuggestExtensions (suggestSetExt exts doc False) exts - -- Suggest enabling extension with :set -X<ext> - -- SuggestAnyExtension will be on multiple lines so the user can select which to enable without editing - suggestSetExt :: [LangExt.Extension] -> SDoc -> Bool -> SDoc - suggestSetExt exts doc enable_any = doc $$ hang header 2 exts_cmds - where - header = text "You may enable" <+> which <+> text "language extension" <> plural exts <+> text "in GHCi with:" - which - | [ _ext ] <- exts - = text "this" - | otherwise - = if enable_any - then text "these" - else text "all of these" - exts_cmds - | enable_any - = vcat $ map (\ext -> text ":set -X" <> ppr ext) exts - | otherwise - = text ":set" <> hcat (map (\ext -> text " -X" <> ppr ext) exts) - -- | Modifications to error messages which we want to display in GHCi ghciDiagnosticMessage :: GhcMessageOpts -> GhcMessage -> DecoratedSDoc ghciDiagnosticMessage ghc_opts msg = ===================================== ghc/Main.hs ===================================== @@ -199,6 +199,7 @@ main' postLoadMode units dflags0 args flagWarnings = do | DoRun <- postLoadMode = def_ghci_flags | otherwise = dflags1 where def_ghci_flags = dflags1 `gopt_set` Opt_ImplicitImportQualified + `gopt_set` Opt_InteractiveErrorHints `gopt_set` Opt_IgnoreOptimChanges `gopt_set` Opt_IgnoreHpcChanges -- Setting this by default has the nice effect that ===================================== testsuite/tests/ghci/prog-mhu002/prog-mhu002c.stdout ===================================== @@ -14,6 +14,7 @@ other dynamic, non-language, flag settings: -fno-unoptimized-core-for-interpreter -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier @@ -33,6 +34,7 @@ other dynamic, non-language, flag settings: -fno-unoptimized-core-for-interpreter -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier @@ -50,6 +52,7 @@ other dynamic, non-language, flag settings: -fno-unoptimized-core-for-interpreter -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier @@ -67,6 +70,7 @@ other dynamic, non-language, flag settings: -fno-unoptimized-core-for-interpreter -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier @@ -84,6 +88,7 @@ other dynamic, non-language, flag settings: -fno-unoptimized-core-for-interpreter -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier ===================================== testsuite/tests/ghci/scripts/ghci024.stdout ===================================== @@ -12,6 +12,7 @@ other dynamic, non-language, flag settings: -fimplicit-import-qualified -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier ===================================== testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 ===================================== @@ -12,6 +12,7 @@ other dynamic, non-language, flag settings: -fimplicit-import-qualified -fshow-warning-groups -fprefer-byte-code + -finteractive-error-hints -fbreak-points warning settings: -Wpattern-namespace-specifier View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1986a531df5456c95711875877233af… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1986a531df5456c95711875877233af… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sol/interactive-package-error-hints
by Simon Hengel (＠sol) 24 Jun '26

24 Jun '26

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

1 0

[Git][ghc/ghc][wip/romes/27401-2] 4 commits: join ioreferences and use SizedSeq
by Rodrigo Mesquita (＠alt-romes) 24 Jun '26

24 Jun '26

Rodrigo Mesquita pushed to branch wip/romes/27401-2 at Glasgow Haskell Compiler / GHC Commits: 4deefb6d by Rodrigo Mesquita at 2026-06-23T16:17:09+01:00 join ioreferences and use SizedSeq and don't duplicate the code in Haddock - - - - - edd56117 by Rodrigo Mesquita at 2026-06-23T16:19:31+01:00 SizedSeq requires reverse anyway - - - - - 1f2bb14b by Rodrigo Mesquita at 2026-06-23T16:49:08+01:00 accept test - - - - - 834d2101 by Rodrigo Mesquita at 2026-06-23T16:57:10+01:00 investigate ------------------------- Metric Decrease: InstanceMatching LinkableUsage01 ------------------------- - - - - - 10 changed files: - compiler/GHC/Iface/Binary.hs - testsuite/tests/overloadedrecflds/should_compile/DRFPatSynExport.stdout - testsuite/tests/rename/should_compile/T1792_imports.stdout - testsuite/tests/rename/should_compile/T18264.stdout - testsuite/tests/rename/should_compile/T4239.stdout - testsuite/tests/showIface/DocsInHiFile1.stdout - testsuite/tests/showIface/DocsInHiFileTH.stdout - testsuite/tests/showIface/NoExportList.stdout - testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs Changes: ===================================== compiler/GHC/Iface/Binary.hs ===================================== @@ -620,27 +620,24 @@ initNameReaderTable cache = do data BinSymbolTable = BinSymbolTable { bin_symtab_next :: !FastMutInt, -- ^ The next index to use - bin_symtab_map :: !(IORef (NameEnv Int)), + bin_symtab_map :: !(IORef (NameEnv Int, ModuleEnv [(Int,Name)])) -- ^ Deduplication indexed by Name - bin_symtab_tbl :: !(IORef (ModuleEnv [(Int,Name)])) - -- ^ Group table data by module for serialization + -- ; Group table data by module for serialization } initNameWriterTable :: IO (WriterTable, BinaryWriter Name) initNameWriterTable = do symtab_next <- newFastMutInt 0 - symtab_tbl <- newIORef emptyModuleEnv - symtab_map <- newIORef emptyNameEnv + symtab_map <- newIORef (emptyNameEnv, emptyModuleEnv) let bin_symtab = BinSymbolTable { bin_symtab_next = symtab_next , bin_symtab_map = symtab_map - , bin_symtab_tbl = symtab_tbl } let put_symtab bh = do name_count <- readFastMutInt symtab_next - symtab_tbl <- readIORef symtab_tbl + (_, symtab_tbl) <- readIORef symtab_map putSymbolTable bh name_count symtab_tbl pure name_count @@ -670,7 +667,7 @@ putSymbolTable bh name_count symtab = do put_ bh (sizeModuleEnv symtab) forM_ (moduleEnvToList symtab) $ \(mod,names) -> do put_ bh mod - put_ bh (length names) -- todo: don't use length? + put_ bh (length names) forM_ names $ \(table_ix, name) -> do let occ = assertPpr (isExternalName name) (ppr name) (nameOccName name) put_ bh table_ix @@ -695,7 +692,7 @@ getSymbolTable bh name_cache = do uniq <- takeUniqFromNameCache name_cache let name = mkExternalName uniq mod occ noSrcSpan cache3 = extendOrigNameCache cache2 mod occ name - writeArray mut_arr table_ix name -- todo: are these being forced? experiment and measure + writeArray mut_arr table_ix name return cache3 arr <- unsafeFreeze mut_arr return (cache, arr) @@ -722,7 +719,6 @@ getSymbolTable bh name_cache = do putName :: BinSymbolTable -> WriteBinHandle -> Name -> IO () putName BinSymbolTable{ bin_symtab_map = symtab_map_ref, - bin_symtab_tbl = symtab_tbl_ref, bin_symtab_next = symtab_next } bh name | isKnownKeyName name @@ -733,20 +729,18 @@ putName BinSymbolTable{ .|. (fromIntegral u :: Word32)) | otherwise - = do symtab_map <- readIORef symtab_map_ref + = do (symtab_map,symtab_tbl) <- readIORef symtab_map_ref case lookupNameEnv symtab_map name of Just off -> put_ bh (fromIntegral off :: Word32) Nothing -> do off <- freshIndex let mod = nameModule name - symtab_tbl <- readIORef symtab_tbl_ref let mod_nms = fromMaybe [] (lookupModuleEnv symtab_tbl mod) - writeIORef symtab_tbl_ref $! - extendModuleEnv symtab_tbl mod ((off,name):mod_nms) + let !symtab_map' = extendNameEnv symtab_map name off + let !symtab_tbl' = extendModuleEnv symtab_tbl mod ((off,name):mod_nms) + writeIORef symtab_map_ref $! ( symtab_map', symtab_tbl' ) - writeIORef symtab_map_ref - $! extendNameEnv symtab_map name off put_ bh (fromIntegral off :: Word32) where freshIndex :: IO Int ===================================== testsuite/tests/overloadedrecflds/should_compile/DRFPatSynExport.stdout ===================================== @@ -1 +1 @@ -import DRFPatSynExport_A ( MkT, m ) +import DRFPatSynExport_A ( m, MkT ) ===================================== testsuite/tests/rename/should_compile/T1792_imports.stdout ===================================== @@ -1 +1 @@ -import qualified Data.ByteString as B ( putStr, readFile ) +import qualified Data.ByteString as B ( readFile, putStr ) ===================================== testsuite/tests/rename/should_compile/T18264.stdout ===================================== @@ -1,6 +1,6 @@ import Data.Char ( isDigit, isLetter ) import Data.List ( sortOn ) -import Data.Maybe ( fromJust, isJust ) +import Data.Maybe ( isJust, fromJust ) import qualified Data.Char as C ( isLetter, isDigit ) import qualified Data.List as S ( sort ) import qualified Data.List as T ( nub ) ===================================== testsuite/tests/rename/should_compile/T4239.stdout ===================================== @@ -1 +1 @@ -import T4239A ( (·), type (:+++)((:---), (:+++), X) ) +import T4239A ( type (:+++)((:---), (:+++), X), (·) ) ===================================== testsuite/tests/showIface/DocsInHiFile1.stdout ===================================== @@ -19,49 +19,53 @@ docs: export docs: [] declaration docs: - [elem -> [text: - -- | '()', 'elem'. - identifiers: - {DocsInHiFile.hs:14:13-16} - GHC.Internal.Data.Foldable.elem - {DocsInHiFile.hs:14:13-16} - elem], - D -> [text: - -- | A datatype. + [F -> [text: + -- | A type family identifiers:], - D0 -> [text: - -- ^ A constructor for 'D'. ' - identifiers: - {DocsInHiFile.hs:20:32} - D], - D1 -> [text: - -- ^ Another constructor + D:R:FInt -> [text: + -- | A type family instance + identifiers:], + D' -> [text: + -- | Another datatype... + identifiers:, + text: + -- ^ ...with two docstrings. identifiers:], - P -> [text: - -- | A class - identifiers:], - p -> [text: - -- | A class method - identifiers:], $fShowD -> [text: -- ^ 'Show' instance identifiers: {DocsInHiFile.hs:22:25-28} GHC.Internal.Show.Show], - D' -> [text: - -- | Another datatype... - identifiers:, - text: - -- ^ ...with two docstrings. + p -> [text: + -- | A class method + identifiers:], + P -> [text: + -- | A class + identifiers:], + D1 -> [text: + -- ^ Another constructor identifiers:], - D:R:FInt -> [text: - -- | A type family instance - identifiers:], - F -> [text: - -- | A type family - identifiers:]] + D0 -> [text: + -- ^ A constructor for 'D'. ' + identifiers: + {DocsInHiFile.hs:20:32} + D], + D -> [text: + -- | A datatype. + identifiers:], + elem -> [text: + -- | '()', 'elem'. + identifiers: + {DocsInHiFile.hs:14:13-16} + GHC.Internal.Data.Foldable.elem + {DocsInHiFile.hs:14:13-16} + elem]] arg docs: - [add -> 0: + [p -> 0: + text: + -- ^ An argument + identifiers:, + add -> 0: text: -- ^ First summand for 'add' identifiers: @@ -74,11 +78,7 @@ docs: 2: text: -- ^ Sum - identifiers:, - p -> 0: - text: - -- ^ An argument - identifiers:] + identifiers:] documentation structure: avails: [elem] ===================================== testsuite/tests/showIface/DocsInHiFileTH.stdout ===================================== @@ -6,137 +6,153 @@ docs: export docs: [] declaration docs: - [Tup2 -> [text: - -- |Matches a tuple of (a, a) - identifiers:], - f -> [text: - -- |The meaning of life - identifiers:], - g -> [text: - -- |Some documentation - identifiers:], - qux -> [text: - -- |This is qux + [D:R:WD13Foo -> [text: + -- |13 + identifiers:], + D:R:WD11Int0 -> [text: + -- |This is a data instance + identifiers:], + D:R:WD11Foo0 -> [text: + -- |11 + identifiers:], + D:R:WD11Bool0 -> [text: + -- |This is a newtype instance + identifiers:], + D:R:EBool -> [text: + -- |A type family instance + identifiers:], + $fF -> [text: + -- |14 identifiers:], - sin -> [text: - -- |15 + $fDka -> [text: + -- |Another new instance + identifiers:], + $fCTYPEList -> [text: + -- |Another new instance + identifiers:], + $fCTYPEInt -> [text: + -- |A new instance + identifiers:], + $fCTYPEFoo -> [text: + -- |7 + identifiers:], + WD6 -> [text: + -- |6 identifiers:], - wd1 -> [text: - -- |1 + WD5 -> [text: + -- |5 identifiers:], - wd17 -> [text: - -- |17 + WD4 -> [text: + -- |4 + identifiers:], + WD3 -> [text: + -- |3 + identifiers:], + WD12 -> [text: + -- |12 identifiers:], - wd18 -> [text: - -- |18 + WD11Int -> [text: + -- |This is a data instance constructor + identifiers:], + WD11Bool -> [text: + -- |This is a newtype instance constructor + identifiers:], + WD10 -> [text: + -- |10 identifiers:], - wd2 -> [text: - -- |2 - identifiers:], - wd20 -> [text: - -- |20 + quuz1_a -> [text: + -- |This is the record constructor's argument + identifiers:], + Quuz -> [text: + -- |This is a record constructor identifiers:], - wd8 -> [text: - -- |8 + Quux2 -> [text: + -- |This is Quux2 + identifiers:], + Quux1 -> [text: + -- |This is Quux1 + identifiers:], + Quux -> [text: + -- |This is Quux + identifiers:], + prettyPrint -> [text: + -- |Prettily prints the object + identifiers:], + Pretty -> [text: + -- |My cool class + identifiers:], + Foo -> [text: + -- |A new constructor identifiers:], - C -> [text: - -- |A new class + Foo -> [text: + -- |A new data type + identifiers:], + E -> [text: + -- |A type family identifiers:], - Corge -> [text: - -- |This is a newtype record constructor - identifiers:], runCorge -> [text: -- |This is the newtype record constructor's argument identifiers:], - E -> [text: - -- |A type family + Corge -> [text: + -- |This is a newtype record constructor + identifiers:], + C -> [text: + -- |A new class identifiers:], - Foo -> [text: - -- |A new data type - identifiers:], - Foo -> [text: - -- |A new constructor + wd8 -> [text: + -- |8 identifiers:], - Pretty -> [text: - -- |My cool class - identifiers:], - prettyPrint -> [text: - -- |Prettily prints the object - identifiers:], - Quux -> [text: - -- |This is Quux - identifiers:], - Quux1 -> [text: - -- |This is Quux1 - identifiers:], - Quux2 -> [text: - -- |This is Quux2 - identifiers:], - Quuz -> [text: - -- |This is a record constructor + wd20 -> [text: + -- |20 identifiers:], - quuz1_a -> [text: - -- |This is the record constructor's argument - identifiers:], - WD10 -> [text: - -- |10 + wd2 -> [text: + -- |2 + identifiers:], + wd18 -> [text: + -- |18 identifiers:], - WD11Bool -> [text: - -- |This is a newtype instance constructor - identifiers:], - WD11Int -> [text: - -- |This is a data instance constructor - identifiers:], - WD12 -> [text: - -- |12 + wd17 -> [text: + -- |17 identifiers:], - WD3 -> [text: - -- |3 - identifiers:], - WD4 -> [text: - -- |4 - identifiers:], - WD5 -> [text: - -- |5 + wd1 -> [text: + -- |1 identifiers:], - WD6 -> [text: - -- |6 + sin -> [text: + -- |15 identifiers:], - $fCTYPEFoo -> [text: - -- |7 - identifiers:], - $fCTYPEInt -> [text: - -- |A new instance - identifiers:], - $fCTYPEList -> [text: - -- |Another new instance - identifiers:], - $fDka -> [text: - -- |Another new instance - identifiers:], - $fF -> [text: - -- |14 + qux -> [text: + -- |This is qux identifiers:], - D:R:EBool -> [text: - -- |A type family instance - identifiers:], - D:R:WD11Bool0 -> [text: - -- |This is a newtype instance - identifiers:], - D:R:WD11Foo0 -> [text: - -- |11 - identifiers:], - D:R:WD11Int0 -> [text: - -- |This is a data instance - identifiers:], - D:R:WD13Foo -> [text: - -- |13 - identifiers:]] + g -> [text: + -- |Some documentation + identifiers:], + f -> [text: + -- |The meaning of life + identifiers:], + Tup2 -> [text: + -- |Matches a tuple of (a, a) + identifiers:]] arg docs: - [Tup2 -> 0: - text: - -- |The thing to match twice - identifiers:, + [WD11Int -> 0: + text: + -- |This is a data instance constructor argument + identifiers:, + WD11Bool -> 0: + text: + -- |This is a newtype instance constructor argument + identifiers:, + Quux2 -> 1: + text: + -- |I am a bool + identifiers:, + Quux1 -> 0: + text: + -- |I am an integer + identifiers:, + qux -> 1: + text: + -- |Arg dos + identifiers:, h -> 0: text: -- ^Your favourite number @@ -149,26 +165,10 @@ docs: text: -- ^A return value identifiers:, - qux -> 1: - text: - -- |Arg dos - identifiers:, - Quux1 -> 0: - text: - -- |I am an integer - identifiers:, - Quux2 -> 1: - text: - -- |I am a bool - identifiers:, - WD11Bool -> 0: - text: - -- |This is a newtype instance constructor argument - identifiers:, - WD11Int -> 0: - text: - -- |This is a data instance constructor argument - identifiers:] + Tup2 -> 0: + text: + -- |The thing to match twice + identifiers:] documentation structure: avails: [f] ===================================== testsuite/tests/showIface/NoExportList.stdout ===================================== @@ -6,7 +6,10 @@ docs: export docs: [] declaration docs: - [fα -> [text: + [$fEqR -> [text: + -- | A very lazy Eq instance + identifiers:], + fα -> [text: -- ^ Documentation for 'R'\'s 'fα' field. identifiers: {NoExportList.hs:14:38} @@ -14,10 +17,7 @@ docs: {NoExportList.hs:14:38} R {NoExportList.hs:14:45-46} - fα], - $fEqR -> [text: - -- | A very lazy Eq instance - identifiers:]] + fα]] arg docs: [] documentation structure: @@ -99,3 +99,4 @@ docs: ListTuplePuns ImplicitStagePersistence extensible fields: + ===================================== testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr ===================================== @@ -5,10 +5,10 @@ subsumption_sort_hole_fits.hs:2:5: warning: [GHC-88464] [-Wtyped-holes (in -Wdef • Relevant bindings include f :: [String] (bound at subsumption_sort_hole_fits.hs:2:1) Valid hole fits include - lines :: String -> [String] + words :: String -> [String] (imported from ‘Prelude’ (and originally defined in ‘GHC.Internal.Data.OldList’)) - words :: String -> [String] + lines :: String -> [String] (imported from ‘Prelude’ (and originally defined in ‘GHC.Internal.Data.OldList’)) repeat :: forall a. a -> [a] ===================================== utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs ===================================== @@ -173,13 +173,11 @@ writeInterfaceFile filename iface = do -- Make some intial state symtab_next <- newFastMutInt 0 - symtab_tbl <- newIORef emptyModuleEnv - symtab_map <- newIORef emptyNameEnv + symtab_map <- newIORef (emptyNameEnv, emptyModuleEnv) let bin_symtab = BinSymbolTable { bin_symtab_next = symtab_next , bin_symtab_map = symtab_map - , bin_symtab_tbl = symtab_tbl } dict_next_ref <- newFastMutInt 0 dict_map_ref <- newIORef emptyUFM @@ -215,7 +213,7 @@ writeInterfaceFile filename iface = do -- write the symbol table itself symtab_next' <- readFastMutInt symtab_next - symtab_tbl' <- readIORef symtab_tbl + (_, symtab_tbl') <- readIORef symtab_map putSymbolTable bh symtab_next' symtab_tbl' -- write the dictionary pointer at the fornt of the file @@ -268,26 +266,22 @@ putName :: BinSymbolTable -> WriteBinHandle -> Name -> IO () putName BinSymbolTable { bin_symtab_map = symtab_map_ref - , bin_symtab_tbl = symtab_tbl_ref , bin_symtab_next = symtab_next } bh name = do - symtab_map <- readIORef symtab_map_ref + (symtab_map, symtab_tbl) <- readIORef symtab_map_ref case lookupNameEnv symtab_map name of Just off -> put_ bh (fromIntegral off :: Word32) Nothing -> do off <- freshIndex let mod' = nameModule name - symtab_tbl <- readIORef symtab_tbl_ref let mod_nms = fromMaybe [] (lookupModuleEnv symtab_tbl mod') - writeIORef symtab_tbl_ref $! - extendModuleEnv symtab_tbl mod' ((off, name) : mod_nms) - - writeIORef symtab_map_ref $! - extendNameEnv symtab_map name off + let !symtab_map' = extendNameEnv symtab_map name off + let !symtab_tbl' = extendModuleEnv symtab_tbl mod' ((off, name):mod_nms) + writeIORef symtab_map_ref $! (symtab_map', symtab_tbl') put_ bh (fromIntegral off :: Word32) where freshIndex :: IO Int @@ -298,10 +292,9 @@ putName data BinSymbolTable = BinSymbolTable { bin_symtab_next :: !FastMutInt -- The next index to use - , bin_symtab_map :: !(IORef (NameEnv Int)) + , bin_symtab_map :: !(IORef (NameEnv Int, ModuleEnv [(Int, Name)])) -- ^ Deduplication indexed by Name - , bin_symtab_tbl :: !(IORef (ModuleEnv [(Int, Name)])) - -- ^ Group table data by module for serialization + -- ; Group table data by module for serialization } putFastString :: BinDictionary -> WriteBinHandle -> FastString -> IO () View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/23db8741032098b26ff7d6be63add4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/23db8741032098b26ff7d6be63add4… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] 3 commits: WIP
by Rodrigo Mesquita (＠alt-romes) 24 Jun '26

24 Jun '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 4460f533 by Rodrigo Mesquita at 2026-06-18T14:52:18+01:00 WIP - - - - - 6bdd11fc by Rodrigo Mesquita at 2026-06-18T14:52:20+01:00 Revert "WIP" This reverts commit 4460f533a57f0e18f9d501919179fce2f2b9b707. - - - - - ead3bd4c by Rodrigo Mesquita at 2026-06-23T17:03:20+01:00 Empty commit, accept metrics: Metrics: compile_time/bytes allocated ------------------------------------- Baseline Test Metric value New value Change ------------------------------------------------------------------------------------------ InstanceMatching(normal) ghc/alloc 1,145,959,113 1,186,619,544 +3.5% BAD MultiComponentModulesRecomp(normal) ghc/alloc 597,207,232 618,028,168 +3.5% BAD MultiLayerModules(normal) ghc/alloc 3,758,938,427 3,599,359,024 -4.2% GOOD T10547(normal) ghc/alloc 24,791,700 26,882,568 +8.4% BAD T12234(optasm) ghc/alloc 50,179,044 51,470,552 +2.6% BAD T12425(optasm) ghc/alloc 76,129,240 77,611,840 +1.9% BAD T13035(normal) ghc/alloc 81,107,420 82,879,768 +2.2% BAD T13701(normal) ghc/alloc 3,455,572,124 3,170,909,168 -8.2% GOOD T13820(normal) ghc/alloc 27,310,260 28,962,824 +6.1% BAD T14697(normal) ghc/alloc 454,460,496 427,282,904 -6.0% GOOD T18140(normal) ghc/alloc 46,025,476 48,039,600 +4.4% BAD T18282(normal) ghc/alloc 118,979,708 121,371,368 +2.0% BAD T18698a(normal) ghc/alloc 195,729,417 198,210,960 +1.3% BAD T18698b(normal) ghc/alloc 176,091,489 178,839,680 +1.6% BAD T18730(optasm) ghc/alloc 129,923,785 131,490,416 +1.2% BAD T18923(normal) ghc/alloc 54,812,876 55,997,576 +2.2% BAD T20049(normal) ghc/alloc 65,225,572 67,339,024 +3.2% BAD T21839c(normal) ghc/alloc 339,233,494 345,159,824 +1.7% BAD T5030(normal) ghc/alloc 140,657,548 143,617,992 +2.1% BAD T9198(normal) ghc/alloc 40,466,900 41,381,736 +2.3% BAD hard_hole_fits(normal) ghc/alloc 208,002,867 202,293,816 -2.7% GOOD mhu-perf(normal) ghc/alloc 47,144,955 45,556,872 -3.4% GOOD geo. mean +1.1% minimum -8.2% maximum +8.4% Investigated in depth T10547(8.4%; 24MB): One-off cost of reading GHC.Essentials, one interface more than before (https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15899#note_680477) InstanceMatching(3.5%;1.14GB): Inconclusive investigation starting from https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15899#note_680504, where it is very hard to justify why getDictionary allocates 25MB more than before. That said, the investigation yielded a separately-merged change which reduces allocates by 10%. I've run out of time and ideas to investigate this small regression, but considering the big win yielded I'm tempted to just accept this one, as I don't know how else to investigate. The tests which allocate very little and regress for about 1MB more are most likely caused by the GHC.Essentials additional cost: T9198, T18923, T13820, T13035, T12234, T12425, T18730, T20049. Even if they aren't directly by GHC.Essentials, these are small one-shot cost regressions when we don't allocate a lot, which is acceptable for the payload of this patch Missing investigation: MultiComponentModulesRecomp, T18140, T18282, T18698a, T18698b, T21839c, T5030 ------------------------- Metric Decrease: MultiLayerModules T13701 T14697 hard_hole_fits mhu-perf size_hello_obj Metric Increase: InstanceMatching T10547 T9198 T18923 T13820 T13035 T12234 T12425 T18730 T20049 ------------------------- - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7a4d1cf1f43cb1885bfcd8a8710e42… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7a4d1cf1f43cb1885bfcd8a8710e42… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mangoiv/unused-type] compiler: rename ZonkAny to UnusedType and add pretty printing logic
by Magnus (＠MangoIV) 23 Jun '26

23 Jun '26

Magnus pushed to branch wip/mangoiv/unused-type at Glasgow Haskell Compiler / GHC Commits: 10205e33 by mangoiv at 2026-06-23T16:16:35+02:00 compiler: rename ZonkAny to UnusedType and add pretty printing logic ZonkAny is a hard to understand name for users who do not know how the compiler works internally. Additionally, it is confusing that ZonkAny, while being a concrete type *represents* a meta variable, espeically in the compiler output. This patch changes the name of ZonkAny to UnusedType which is closer to its intended semantics and adds special pretty printing logic to display this type in the same fashion the compiler displays meta variables in other places, whenever they leak from the implementation to the user. It also exports the type from ghc-internal:GHC.Internal.Types in order to expose documentation. Fixes #27390 Co-Authored-By: Sam Derbyshire <sam.derbyshire(a)gmail.com> - - - - - 24 changed files: - + changelog.d/unused-type - compiler/GHC/Builtin/Names.hs - compiler/GHC/Builtin/Types.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/Iface/Type.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcType.hs - compiler/GHC/Tc/Zonk/Type.hs - libraries/base/src/GHC/Base.hs - libraries/base/src/GHC/Exts.hs - libraries/ghc-internal/src/GHC/Internal/Types.hs - testsuite/tests/perf/compiler/T11068.stdout - testsuite/tests/pmcheck/should_compile/T12957.stderr - testsuite/tests/profiling/should_run/staticcallstack002.stdout - testsuite/tests/simplCore/should_compile/Makefile - testsuite/tests/simplCore/should_compile/T13156.stdout - testsuite/tests/simplCore/should_compile/T26615.stderr - testsuite/tests/typecheck/should_fail/T13292.stderr - + testsuite/tests/typecheck/should_fail/T27390-explicit-kinds.stderr - + testsuite/tests/typecheck/should_fail/T27390.hs - + testsuite/tests/typecheck/should_fail/T27390.stderr - + testsuite/tests/typecheck/should_fail/T27390a.hs - testsuite/tests/typecheck/should_fail/all.T Changes: ===================================== changelog.d/unused-type ===================================== @@ -0,0 +1,12 @@ +section: compiler +synopsis: Rename ZonkAny to UnusedType and add pretty printing logic for it. +issues: #27390 +mrs: !16212 + +description: { + After unification, GHC fills in unconstrained type variables such as ``alpha`` in + ``(length :: [alpha] -> Int) ([] :: List alpha) :: Int`` with a fixed type. + This type was, confusingly to the user, called ``ZonkAny``. + This type is now renamed ``UnusedType``, with special pretty-printing logic to make + it display like an ordinary metavariable. +} ===================================== compiler/GHC/Builtin/Names.hs ===================================== @@ -1904,8 +1904,8 @@ unsatisfiableClassNameKey = mkPreludeTyConUnique 170 anyTyConKey :: Unique anyTyConKey = mkPreludeTyConUnique 171 -zonkAnyTyConKey :: Unique -zonkAnyTyConKey = mkPreludeTyConUnique 172 +unusedTypeTyConKey :: Unique +unusedTypeTyConKey = mkPreludeTyConUnique 172 -- Custom user type-errors errorMessageTypeErrorFamKey :: Unique ===================================== compiler/GHC/Builtin/Types.hs ===================================== @@ -93,7 +93,7 @@ module GHC.Builtin.Types ( cTupleSelId, cTupleSelIdName, -- * Any - anyTyCon, anyTy, anyTypeOfKind, zonkAnyTyCon, + anyTyCon, anyTy, anyTypeOfKind, unusedTypeTyCon, -- * Recovery TyCon makeRecoveryTyCon, @@ -300,7 +300,7 @@ wiredInTyCons :: [TyCon] wiredInTyCons = map (dataConTyCon . snd) boxingDataCons ++ [ anyTyCon - , zonkAnyTyCon + , unusedTypeTyCon , boolTyCon , charTyCon , stringTyCon @@ -410,58 +410,89 @@ doubleDataConName = mkWiredInDataConName UserSyntax gHC_TYPES (fsLit "D#") -- Any {- -Note [Any types] -~~~~~~~~~~~~~~~~ -The type constructors `Any` and `ZonkAny` are closed type families declared thus: +Note [The types Any and UnusedType] +~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ +The type constructors `Any` and `UnusedType` are closed type families declared as: - type family Any :: forall k. k where { } - type family ZonkAny :: forall k. Nat -> k where { } + type family Any :: forall k. k where { } + type family UnusedType :: forall k. Symbol -> k where { } They are used when we want a type of a particular kind, but we don't really care -what that type is. The leading example is this: `ZonkAny` is used to instantiate -un-constrained type variables after type checking. For example, consider the -term (length [] :: Int), where +what that type is. The leading example that is relevant for GHC itself is this: - length :: forall a. [a] -> Int - [] :: forall a. [a] + `UnusedType` is used to instantiate unconstrained type variables after type + checking. For example, consider the term (length [] :: Int), where -We must type-apply `length` and `[]`, but to what type? It doesn't matter! -The typechecker will end up with + length :: forall a. [a] -> Int + [] :: forall a. [a] - length @alpha ([] @alpha) + We must type-apply `length` and `[]`, but to what type? It doesn't matter! + The typechecker will end up with -where `alpha` is an un-constrained unification variable. The "zonking" process zaps -that unconstrained `alpha` to an arbitrary type (ZonkAny @Type 3), where the `3` is -arbitrary (see wrinkle (Any5) below). This is done in `GHC.Tc.Zonk.Type.commitFlexi`. -So we end up with + length @alpha ([] @alpha) - length @(ZonkAny @Type 3) ([] @(ZonkAny @Type 3)) + where `alpha` is an unconstrained unification variable. The "zonking" process + zaps that unconstrained `alpha` to an arbitrary type (UnusedType @Type "a_3"), + where the `3` is arbitrary (see wrinkle (Any3) below) and "a" is the name string + of the meta variable. This is done in `GHC.Tc.Zonk.Type.commitFlexi`. + So we end up with -`Any` and `ZonkAny` differ only in the presence of the `Nat` argument; see -wrinkle (Any4). + length @(UnusedType @Type "a_3") ([] @(UnusedType @Type "a_3")) -Wrinkles: +`Any` and `UnusedType` differ only in the presence of the `Symbol` argument; see (Any6). -(Any1) `Any` and `ZonkAny` are kind polymorphic since in some program we may - need to use `ZonkAny` to fill in a type variable of some kind other than * - (see #959 for examples). - -(Any2) They are /closed/ type families, with no instances. For example, suppose that +(Any1) They are /closed/ type families, with no instances. For example, suppose that with alpha :: '(k1, k2) we add a given coercion g :: alpha ~ (Fst alpha, Snd alpha) - and we zonked alpha = ZonkAny @(k1,k2) n. Then, if `ZonkAny` was a /data/ type, - we'd get inconsistency because we'd have a Given equality with `ZonkAny` on one + and we zonked alpha = UnusedType @(k1,k2) n. Then, if `UnusedType` was a /data/ type, + we'd get inconsistency because we'd have a Given equality with `UnusedType` on one side and '(,) on the other. See also #9097 and #9636. - See #25244 for a suggestion that we instead use an /open/ type family for which - you cannot provide instances. Probably the difference is not very important. + They are not /data/ types, and that's important for the code generator, + because the code gen may enter a data value. + + A closed type family with no equations behaves differently than an open type + family with no equations due to Note [Insoluble fundeps] IFD0 in + GHC.Tc.Solver.FunDeps, so it was argued in #25244 that perhaps 'Any' should + rather be an open type family for which new equations cannot be written. + +(Any2) `Any` and `UnusedType` are kind polymorphic since in some programs we may + need to use `UnusedType` to fill in a type variable of some kind other than Type + e.g. TYPE r for some r, or types of the form _ -> Type. + +(Any3) `Any` and `UnusedType` are wired-in so we can easily refer to them where we + don't have a name environment. + +(Any4) User facing aspects of the types Any and UnusedType: + + `Any` is defined in ghc-internal:GHC.Internal.Types, and exported. `Any` + is available to users because it is a useful type in userspace and is thus + re-exported from base:GHC.Exts. + + `UnusedType` is exported mainly for documentation in case a user stumbles over + it in debug output of GHC. + + The key property of 'Any' is that it is safe to coerce a type to 'Any' as long + as the representation is unchanged. That is, it is OK to use 'unsafeCoerce#' to + go from 'ty :: TYPE r' to 'Any :: TYPE r' and back. + This can be useful when e.g. implementing dependent maps or similar typed + container types, storing values of type `Any`. + +(Any5) Warnings about unused bindings of type `Any` and `UnusedType` are suppressed, + following the same rationale of supressing warning about the unit type. + + For example, consider (#25895): + + do { forever (return ()); blah } -(Any3) They do not claim to be /data/ types, and that's important for - the code generator, because the code gen may /enter/ a data value - but never enters a function value. + where forever :: forall a b. IO a -> IO b + Nothing constrains `b`, so it will be instantiated with `Any` or `UnusedType`. + But we certainly don't want to complain about a discarded do-binding. -(Any4) `ZonkAny` takes a `Nat` argument so that we can readily make up /distinct/ - types (#24817). Consider +(Any6) Wrinkle - Pattern match checking. + + The first reason why `UnusedType` takes a `Symbol` argument is that + we can readily make up /distinct/ types (#24817) for the Pmc. Consider data SBool a where { STrue :: SBool True; SFalse :: SBool False } @@ -475,53 +506,33 @@ Wrinkles: Now, what are `alpha` and `beta`? If we zonk both of them to the same type `Any @Type`, the pattern-match checker will (wrongly) report that the first branch is inaccessible. So we zonk them to two /different/ types: - alpha := ZonkAny @Type 4 and beta := ZonkAny @Type k 5 + alpha := UnusedType @Type "a_4" and beta := UnusedType @Type k "b_5" (The actual numbers are arbitrary; they just need to differ.) The unique-name generation comes from field `tcg_zany_n` of `TcGblEnv`; and - `GHC.Tc.Zonk.Type.commitFlexi` calls `GHC.Tc.Utils.Monad.newZonkAnyType` to + `GHC.Tc.Zonk.Type.commitFlexi` calls `GHC.Tc.Utils.Monad.newUnusedTypeType` to make up a fresh type. If this example seems unconvincing (e.g. in this case foo must be bottom) see #24817 for larger but more compelling examples. -(Any5) `Any` and `ZonkAny` are wired-in so we can easily refer to it where we - don't have a name environment (e.g. see Rules.matchRule for one example) - -(Any6) `Any` is defined in library module ghc-prim:GHC.Types, and exported so that - it is available to users. For this reason it's treated like any other - wired-in type: - - has a fixed unique, anyTyConKey, - - lives in the global name cache - Currently `ZonkAny` is not available to users; but it could easily be. +(Any7) Wrinkle - Error reporting. -(Any7) Properties of `Any`: - * When `Any` is instantiated at a lifted type it is inhabited by at least one value, - namely bottom. + There's a second reason why `UnusedType` takes a `Symbol` argument, which is that + we use it to neatly display zonked unfilled metavariables without leaking + implementation details of code generation. - * You can safely coerce any /lifted/ type to `Any` and back with `unsafeCoerce`. + `UnusedType` is handled specially in the pretty-printer to avoid confusing + compiler output. For example, `UnusedType "foo_3" :: Type` is displayed as `foo_3`. - * You can safely coerce any /unlifted/ type to `Any` and back with `unsafeCoerceUnlifted`. + That special handling is implemented in GHC.Iface.Type.pprTyTcApp and more + specifically ppr_iface_unused_ty_tycon. - * You can coerce /any/ type to `Any` and back with `unsafeCoerce#`, but it's only safe when - the kinds of both the type and `Any` match. + See testcase T27390 for an example of the pretty-printing in action. - * For lifted/unlifted types `unsafeCoerce[Unlifted]` should be preferred over - `unsafeCoerce#` as they prevent accidentally coercing between types with kinds - that don't match. - - See examples in ghc-prim:GHC.Types - -(Any8) Warning about unused bindings of type `Any` and `ZonkAny` are suppressed, - following the same rationale of supressing warning about the unit type. - - For example, consider (#25895): - - do { forever (return ()); blah } - - where forever :: forall a b. IO a -> IO b - Nothing constrains `b`, so it will be instantiates with `Any` or `ZonkAny`. - But we certainly don't want to complain about a discarded do-binding. + Historical note: in the past, `UnusedType` was called `ZonkAny` (or `Any` before that). + We renamed it to `UnusedType` and added this special treatment in the pretty-printer to avoid + confusing mentions of zonking. The Any tycon used to be quite magic, but we have since been able to implement it merely with an empty kind polymorphic type family. See #10886 for a @@ -534,7 +545,7 @@ anyTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "Any") anyTyConKey anyTyCon anyTyCon :: TyCon --- See Note [Any types] +-- See Note [The types Any and UnusedType] anyTyCon = mkFamilyTyCon anyTyConName kind binders 0 res_kind Nothing (ClosedSynFamilyTyCon Nothing) Nothing @@ -550,22 +561,22 @@ anyTy = mkTyConTy anyTyCon anyTypeOfKind :: Kind -> Type anyTypeOfKind kind = mkTyConApp anyTyCon [kind] -zonkAnyTyConName :: Name -zonkAnyTyConName = - mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "ZonkAny") zonkAnyTyConKey zonkAnyTyCon +unusedTypeTyConName :: Name +unusedTypeTyConName = + mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "UnusedType") unusedTypeTyConKey unusedTypeTyCon -zonkAnyTyCon :: TyCon --- ZonkAnyTyCon :: forall k. Nat -> k --- See Note [Any types] -zonkAnyTyCon = mkFamilyTyCon zonkAnyTyConName kind bndrs 0 res_kind +unusedTypeTyCon :: TyCon +-- unusedTypeTyCon :: forall k. Symbol -> k +-- See Note [The types Any and UnusedType] +unusedTypeTyCon = mkFamilyTyCon unusedTypeTyConName kind bndrs 0 res_kind Nothing (ClosedSynFamilyTyCon Nothing) Nothing NotInjective where - [kv,nat_kv] = mkTemplateKindVars [liftedTypeKind, naturalTy] + [kv,sym_kv] = mkTemplateKindVars [liftedTypeKind, typeSymbolKind] bndrs = [ mkNamedTyConBinder Specified kv - , mkAnonTyConBinder nat_kv ] + , mkAnonTyConBinder sym_kv ] res_kind = mkTyVarTy kv kind = mkTyConKind bndrs res_kind ===================================== compiler/GHC/HsToCore/Expr.hs ===================================== @@ -1281,11 +1281,11 @@ warnDiscardedDoBindings rhs@(L rhs_loc _) m_ty elt_ty do { fam_inst_envs <- dsGetFamInstEnvs ; let norm_elt_ty = topNormaliseType fam_inst_envs elt_ty supressible_ty = - isUnitTy norm_elt_ty || isAnyTy norm_elt_ty || isZonkAnyTy norm_elt_ty + isUnitTy norm_elt_ty || isAnyTy norm_elt_ty || isUnusedTypeTy norm_elt_ty -- Warn about discarding things in 'monadic' binding, -- however few types are excluded: -- * Unit type `()` - -- * `ZonkAny` or `Any` type see (Any8) of Note [Any types] + -- * `UnusedType` or `Any` type see (Any5) of Note [The types Any and UnusedType] ; if warn_unused && not supressible_ty then diagnosticDs (DsUnusedDoBind rhs elt_ty) else ===================================== compiler/GHC/Iface/Type.hs ===================================== @@ -7,7 +7,7 @@ This module defines interface types and binders -} -{-# LANGUAGE MultiWayIf #-} +{-# LANGUAGE MultiWayIf, OverloadedRecordDot #-} module GHC.Iface.Type ( IfExtName, IfLclName(..), mkIfLclName, ifLclNameFS, @@ -1740,6 +1740,7 @@ pprTyTcApp ctxt_prec tc tys = sdocOption sdocPrintExplicitKinds $ \print_kinds -> sdocOption sdocPrintTypeAbbreviations $ \print_type_abbreviations -> getPprDebug $ \debug -> + getPprStyle $ \style -> if | ifaceTyConName tc `hasKey` ipClassKey , IA_Arg (IfaceLitTy (IfaceStrTyLit n)) @@ -1791,6 +1792,14 @@ pprTyTcApp ctxt_prec tc tys = | Just doc <- ppr_equality ctxt_prec tc (appArgsIfaceTypes tys) -> doc + -- See Note [The types Any and UnusedType], specifically (Any6) and (Any7) + | ifaceTyConName tc `hasKey` unusedTypeTyConKey + , ((arg_k, _) : (IfaceLitTy (IfaceStrTyLit arg_nm), _) : args_usr) + <- appArgsIfaceTypesForAllTyFlags tys + -- if arg_k is a kind with more than 0 arguments, then _ might not be [] here + , userStyle style + -> ppr_iface_unused_ty_tycon ctxt_prec arg_k arg_nm args_usr + | otherwise -> ppr_iface_tc_app ppr_app_arg ctxt_prec tc $ appArgsIfaceTypesForAllTyFlags $ stripInvisArgs (PrintExplicitKinds print_kinds) tys @@ -1802,6 +1811,23 @@ ppr_kind_type ctxt_prec = sdocOption sdocStarIsType $ \case False -> pprPrefixOcc liftedTypeKindTyConName True -> maybeParen ctxt_prec starPrec starLit +-- | user-style printer that pretty-prints an 'UnusedType @k "foo_3" to foo_3. +-- If -fprint-explicit-kinds or -fprint-explicit-runtime-reps are set, instead +-- prints them to (foo3 :: k). +-- See Note [The types Any and UnusedType], specifically (Any6) and (Any7) for why this is useful. +ppr_iface_unused_ty_tycon :: PprPrec -> IfaceType -> LexicalFastString -> [(IfaceType, ForAllTyFlag)] -> SDoc +ppr_iface_unused_ty_tycon ctxt_prec arg_k arg_nm args_usr + = sdocOption sdocPrintExplicitKinds $ \print_kinds -> + sdocOption sdocPrintExplicitRuntimeReps $ \print_reps -> + if print_kinds || print_reps + then prettyMeta $ \nm -> + maybeParen sig_prec sigPrec $ nm <+> text "::" <+> pprIfaceType arg_k + else prettyMeta id + where sig_prec = if null args_usr then ctxt_prec else appPrec + prettyMeta add_ty + = pprIfacePrefixApp ctxt_prec (add_ty $ ppr arg_nm) + $ map (ppr_app_arg appPrec) args_usr + -- | Pretty-print a type-level equality. -- Returns (Just doc) if the argument is a /saturated/ application -- of eqTyCon (~) @@ -2190,7 +2216,8 @@ instance Binary IfaceTyConSort where 0 -> return IfaceNormalTyCon 1 -> IfaceTupleTyCon <$> get bh <*> get bh 2 -> IfaceSumTyCon <$> get bh - _ -> return IfaceEqualityTyCon + 3 -> return IfaceEqualityTyCon + _ -> panic "get IfaceTyConSort" instance Binary IfaceTyConInfo where put_ bh (IfaceTyConInfo i s) = put_ bh i >> put_ bh s ===================================== compiler/GHC/Tc/Types.hs ===================================== @@ -582,8 +582,8 @@ data TcGblEnv -- ^ Allows us to choose unique DFun names. tcg_zany_n :: TcRef Integer, - -- ^ A source of unique identities for ZonkAny instances - -- See Note [Any types] in GHC.Builtin.Types, wrinkle (Any4) + -- ^ A source of unique identities for UnusedType instances + -- See Note [The types Any and UnusedType] in GHC.Builtin.Types, wrinkle (Any6) tcg_merged :: [(Module, Fingerprint)], -- ^ The requirements we merged with; we always have to recompile ===================================== compiler/GHC/Tc/Utils/Monad.hs ===================================== @@ -154,7 +154,7 @@ module GHC.Tc.Utils.Monad( getCCIndexM, getCCIndexTcM, -- * Zonking - liftZonkM, newZonkAnyType, + liftZonkM, newUnusedType, -- * Complete matches localAndImportedCompleteMatches, getCompleteMatchesTcM, @@ -168,7 +168,7 @@ import GHC.Prelude import GHC.Builtin.Names -import GHC.Builtin.Types( zonkAnyTyCon ) +import GHC.Builtin.Types( unusedTypeTyCon ) import GHC.Tc.Errors.Types import GHC.Tc.Errors.Hole.Plugin ( HoleFitPlugin, HoleFitPluginR (..) ) @@ -197,7 +197,7 @@ import GHC.Core.Coercion ( isReflCo ) import GHC.Core.Multiplicity import GHC.Core.InstEnv import GHC.Core.FamInstEnv -import GHC.Core.Type( mkNumLitTy ) +import GHC.Core.Type( mkStrLitTy ) import GHC.Core.TyCo.Rep( CoercionHole(..) ) import GHC.Core.TyCo.FVs( coVarsOfCo ) import GHC.Core.TyCon ( TyCon ) @@ -2258,17 +2258,24 @@ chooseUniqueOccTc fn = ; writeTcRef dfun_n_var (extendOccSet set occ) ; return occ } -newZonkAnyType :: Kind -> TcM Type --- Return a type (ZonkAny @k n), where n is fresh --- Recall ZonkAny :: forall k. Natural -> k --- See Note [Any types] in GHC.Builtin.Types, wrinkle (Any4) -newZonkAnyType kind +newUnusedType :: Name -> Kind -> TcM Type +-- Return a type (UnusedType @k sym_n), where sym +-- is a name and n is a fresh Integer. +-- Recall UnusedType :: forall k. Symbol -> k +-- See Note [The types Any and UnusedType] in GHC.Builtin.Types, wrinkle (Any6) +newUnusedType name kind = do { env <- getGblEnv ; let zany_n_var = tcg_zany_n env ; i <- readTcRef zany_n_var ; let !i2 = i+1 ; writeTcRef zany_n_var i2 - ; return (mkTyConApp zonkAnyTyCon [kind, mkNumLitTy i]) } + -- Mind that the "_" here is load-bearing: + -- name foo1 with zany_n_var = 1 musn't be equal to + -- name foo with zany_n_var = 11 b/c that way the Pmc + -- would consider them equal. Using "_" suffices because + -- numbers never start with _ and so (legal) identfiers like + -- foo_ would become foo__1 which is distinct from e.g. foo_1 + ; return (mkTyConApp unusedTypeTyCon [kind, mkStrLitTy $ getOccFS name `appendFS` fsLit "_" `appendFS` fsLit (show i) ]) } getConstraintVar :: TcM (TcRef WantedConstraints) getConstraintVar = do { env <- getLclEnv; return (tcl_lie env) } ===================================== compiler/GHC/Tc/Utils/TcType.hs ===================================== @@ -85,7 +85,7 @@ module GHC.Tc.Utils.TcType ( isSigmaTy, isRhoTy, isRhoExpTy, isOverloadedTy, isFloatingPrimTy, isDoubleTy, isFloatTy, isIntTy, isWordTy, isStringTy, isIntegerTy, isNaturalTy, - isBoolTy, isUnitTy, isAnyTy, isZonkAnyTy, isCharTy, + isBoolTy, isUnitTy, isAnyTy, isUnusedTypeTy, isCharTy, isTauTy, isTauTyCon, tcIsTyVarTy, isPredTy, isSimplePredTy, isTyVarClassPred, checkValidClsArgs, hasTyVarHead, @@ -2057,7 +2057,7 @@ isFloatTy, isDoubleTy, isFloatPrimTy, isDoublePrimTy, isIntegerTy, isNaturalTy, isIntTy, isWordTy, isBoolTy, - isUnitTy, isAnyTy, isZonkAnyTy, isCharTy :: Type -> Bool + isUnitTy, isAnyTy, isUnusedTypeTy, isCharTy :: Type -> Bool isFloatTy = is_tc floatTyConKey isDoubleTy = is_tc doubleTyConKey isFloatPrimTy = is_tc floatPrimTyConKey @@ -2069,7 +2069,7 @@ isWordTy = is_tc wordTyConKey isBoolTy = is_tc boolTyConKey isUnitTy = is_tc unitTyConKey isAnyTy = is_tc anyTyConKey -isZonkAnyTy = is_tc zonkAnyTyConKey +isUnusedTypeTy = is_tc unusedTypeTyConKey isCharTy = is_tc charTyConKey -- | Check whether the type is of the form @Any :: k@, ===================================== compiler/GHC/Tc/Zonk/Type.hs ===================================== @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedRecordDot #-} {- (c) The University of Glasgow 2006 (c) The AQUA Project, Glasgow University, 1996-1998 @@ -43,7 +44,7 @@ import GHC.Tc.Types.TcRef import GHC.Tc.TyCl.Build ( TcMethInfo, MethInfo ) import GHC.Tc.Utils.Env ( tcLookupGlobalOnly ) import GHC.Tc.Utils.TcType -import GHC.Tc.Utils.Monad ( newZonkAnyType, setSrcSpanA, liftZonkM, traceTc, addErr ) +import GHC.Tc.Utils.Monad ( newUnusedType, setSrcSpanA, liftZonkM, traceTc, addErr ) import GHC.Tc.Types.Evidence import GHC.Tc.Errors.Types import GHC.Tc.Zonk.Env @@ -470,11 +471,11 @@ commitFlexi DefaultFlexi tv zonked_kind ; return manyDataConTy } | Just (ConcreteFRR origin) <- isConcreteTyVar_maybe tv = do { addErr $ TcRnZonkerMessage (ZonkerCannotDefaultConcrete origin) - ; newZonkAnyType zonked_kind } + ; newUnusedType tv.varName zonked_kind } | otherwise - = do { traceTc "Defaulting flexi tyvar to ZonkAny:" (pprTyVar tv) - -- See Note [Any types] in GHC.Builtin.Types, esp wrinkle (Any4) - ; newZonkAnyType zonked_kind } + = do { traceTc "Defaulting flexi tyvar to UnusedType:" (pprTyVar tv) + -- See Note [The types Any and UnusedType] in GHC.Builtin.Types, esp wrinkle (Any6) + ; newUnusedType tv.varName zonked_kind } zonkCoVarOcc :: CoVar -> ZonkTcM Coercion zonkCoVarOcc cv ===================================== libraries/base/src/GHC/Base.hs ===================================== @@ -535,4 +535,5 @@ import GHC.Types hiding ( Sum62#, Sum63#, Sum64#, + UnusedType, ) ===================================== libraries/base/src/GHC/Exts.hs ===================================== @@ -374,6 +374,7 @@ import GHC.Types hiding ( Type, -- Exported from "Data.Kind" -- GHC's internal representation of 'TyCon's, for 'Typeable' Module, TrName, TyCon, TypeLitSort, KindRep, KindBndr, + UnusedType, Unit#, Solo#(..), Tuple0#, ===================================== libraries/ghc-internal/src/GHC/Internal/Types.hs ===================================== @@ -35,6 +35,7 @@ module GHC.Internal.Types ( SPEC(..), Symbol, Any, + UnusedType, -- * Type equality type (~), type (~~), Coercible, @@ -284,48 +285,53 @@ data Symbol * * ********************************************************************* -} --- | The type constructor @Any :: forall k. k@ is a type to which you can unsafely coerce any type, and back. +-- | The type constructor @Any :: forall k. k@ allows creating an arbitrary type +-- of the given kind. -- --- For @unsafeCoerce@ this means for all lifted types @t@ that --- @unsafeCoerce (unsafeCoerce x :: Any) :: t@ is equivalent to @x@ and safe. +-- It can be used to create a placeholder type when you only have a kind in hand. -- --- The same is true for *all* types when using --- @ --- unsafeCoerce# :: forall (r1 :: RuntimeRep) (r2 :: RuntimeRep) --- (a :: TYPE r1) (b :: TYPE r2). --- a -> b --- @ --- but /only/ if you instantiate @r1@ and @r2@ to the /same/ runtime representation. --- For example using @(unsafeCoerce# :: forall (a :: TYPE IntRep) (b :: TYPE IntRep). a -> b) x@ --- is fine, but @(unsafeCoerce# :: forall (a :: TYPE IntRep) (b :: TYPE FloatRep). a -> b)@ --- will likely cause seg-faults or worse. --- For this resason, users should always prefer unsafeCoerce over unsafeCoerce# when possible. +-- You can use 'unsafeCoerce#' to unsafely coerce a value from @ty :: k@ to @Any \@k@ +-- and back. As per the documentation of 'unsafeCoerce#', this is only sound if both +-- sides have the __exact same__runtime representation. Some examples: -- --- Here are some more examples: -- @ --- bad_a1 :: Any @(TYPE 'IntRep) --- bad_a1 = unsafeCoerce# True --- --- bad_a2 :: Any @(TYPE ('BoxedRep 'UnliftedRep)) --- bad_a2 = unsafeCoerce# True +-- unsafeCoerce# True :: (Any :: Type) -- OK +-- unsafeCoerce# (1# :: Int#) :: (Any :: TYPE IntRep) -- OK +-- unsafeCoerce# True :: (Any :: Type IntRep) -- INVALID +-- unsafeCoerce True :: (Any :: UnliftedType) -- INVALID +-- unsafeCoerce (ba :: ByteArray#) :: (Any :: Type) -- INVALID -- @ --- Here @bad_a1@ is bad because we started with @True :: (Bool :: Type)@, represented by a boxed heap pointer, --- and coerced it to @a1 :: Any @(TYPE 'IntRep)@, whose representation is a non-pointer integer. --- That's why we had to use `unsafeCoerce#`; it is really unsafe because it can change representations. --- Similarly @bad_a2@ is bad because although both @True@ and @bad_a2@ are represented by a heap pointer, --- @True@ is lifted but @bad_a2@ is not; bugs here may be rather subtle. -- --- If you must use unsafeCoerce# to cast to `Any`, type annotations are recommended --- to make sure that @Any@ has the correct kind. As casting between different runtimereps is --- unsound. For example to cast a @ByteArray#@ to @Any@ you might use: --- @ --- unsafeCoerce# b :: (Any :: TYPE ('BoxedRep 'Unlifted)) --- @ +-- To avoid accidentally unsafe-coercing between different representations, +-- it is recommended to: +-- - use explicit type annotations or type applications at every use-site +-- of 'unsafeCoerce#' +-- - use representation-monomorphic variants such as 'unsafeCoerce' or +-- 'unsafeCoerceUnlifted'. +-- +-- In particular, this also implies it is safe to round-trip unsafe-coercion via 'Any', +-- as long as the kinds line up e.g. @unsafeCoerce (unsafeCoerce (val :: a) :: 'Any') :: a@ +-- is safe in that way. type family Any :: k where { } --- See Note [Any types] in GHC.Builtin.Types. Also, for a bit of history on Any see +-- See Note [The types Any and UnusedType] in GHC.Builtin.Types. Also, for a bit of history on Any see -- #10886. Note that this must be a *closed* type family: we need to ensure -- that this can't reduce to a `data` type for the results discussed in --- Note [Any types]. +-- Note [The types Any and UnusedType]. +-- + +-- | @UnusedType \@k "foo"@ denotes an arbitrary type of kind +-- @k@ and is pretty-printed as @foo@ . +-- +-- This type is used internally by GHC to fill in otherwise +-- unconstrained type variables, such as @a@ in @length \@a []@. +-- It is exported purely for documentation purposes. +-- +-- You shouldn't ever see this type in the compiler's output if +-- you don't specifically ask for it, for instance when viewing +-- core, since the compiler will try hard to output a given +-- @'UnusedType' "m_0"@ simply as @m_0@. +type family UnusedType :: Symbol -> k where { } +-- See Note [The types Any and UnusedType] in GHC.Builtin.Types. {- ********************************************************************* * * ===================================== testsuite/tests/perf/compiler/T11068.stdout ===================================== @@ -23,137 +23,137 @@ `cast` (GHC.Internal.Generics.N:M1 `cast` (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.L1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 - ((GHC.Internal.Generics.U1 @(*) @(GHC.Internal.Types.ZonkAny 0)) + ((GHC.Internal.Generics.U1 `cast` (Sym (GHC.Internal.Generics.N:M1 = GHC.Internal.Generics.R1 = GHC.Internal.Generics.R1 ===================================== testsuite/tests/pmcheck/should_compile/T12957.stderr ===================================== @@ -1,7 +1,6 @@ T12957.hs:4:5: warning: [GHC-62161] [-Wincomplete-patterns (in -Wextra)] Pattern match(es) are non-exhaustive - In a case alternative: - Patterns of type ‘[GHC.Internal.Types.ZonkAny 0]’ not matched: [] + In a case alternative: Patterns of type ‘[a_0]’ not matched: [] T12957.hs:4:16: warning: [GHC-53633] [-Woverlapping-patterns (in -Wdefault)] Pattern match is redundant ===================================== testsuite/tests/profiling/should_run/staticcallstack002.stdout ===================================== @@ -1,4 +1,4 @@ -Just (InfoProv {ipName = "sat_s1Rh_info", ipDesc = THUNK, ipTyDesc = "ZonkAny 0", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "10:23-39"}) -Just (InfoProv {ipName = "sat_s1RB_info", ipDesc = THUNK, ipTyDesc = "ZonkAny 1", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "11:23-42"}) -Just (InfoProv {ipName = "sat_s1RV_info", ipDesc = THUNK, ipTyDesc = "ZonkAny 2", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "12:23-46"}) -Just (InfoProv {ipName = "sat_s1Sf_info", ipDesc = THUNK, ipTyDesc = "ZonkAny 3", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "13:23-44"}) +Just (InfoProv {ipName = "main_sat_t2fs_info", ipDesc = THUNK, ipTyDesc = "UnusedType \"a_0\"", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "10:23-39"}) +Just (InfoProv {ipName = "main_sat_t2fJ_info", ipDesc = THUNK, ipTyDesc = "UnusedType \"a_1\"", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "11:23-42"}) +Just (InfoProv {ipName = "main_sat_t2g0_info", ipDesc = THUNK, ipTyDesc = "UnusedType \"a_2\"", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "12:23-46"}) +Just (InfoProv {ipName = "main_sat_t2gh_info", ipDesc = THUNK, ipTyDesc = "UnusedType \"a_3\"", ipLabel = "main", ipUnitId = "main", ipMod = "Main", ipSrcFile = "staticcallstack002.hs", ipSrcSpan = "13:23-44"}) ===================================== testsuite/tests/simplCore/should_compile/Makefile ===================================== @@ -188,7 +188,7 @@ T13155: T13156: $(RM) -f T13156.hi T13156.o - '$(TEST_HC)' $(TEST_HC_OPTS) -c T13156.hs -O -ddump-prep -dsuppress-uniques | grep "case.*Any" + '$(TEST_HC)' $(TEST_HC_OPTS) -c T13156.hs -O -ddump-prep -dsuppress-uniques | grep "case.*UnusedType" # There should be a single 'case r @ GHC.Types.Any' .PHONY: T4138 ===================================== testsuite/tests/simplCore/should_compile/T13156.stdout ===================================== @@ -1,2 +1,2 @@ - case r @(GHC.Internal.Types.ZonkAny 0) of { __DEFAULT -> - case r @(GHC.Internal.Types.ZonkAny 1) of { __DEFAULT -> r @a } + case r @(GHC.Internal.Types.UnusedType "a_0") of { __DEFAULT -> + case r @(GHC.Internal.Types.UnusedType "a_1") of { __DEFAULT -> ===================================== testsuite/tests/simplCore/should_compile/T26615.stderr ===================================== @@ -2,7 +2,7 @@ ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 1,209, types: 1,139, coercions: 18, joins: 17/29} + = {terms: 1,209, types: 1,155, coercions: 18, joins: 17/29} -- RHS size: {terms: 6, types: 8, coercions: 0, joins: 0/0} unArray :: forall a. Array a -> SmallArray# a @@ -15,45 +15,29 @@ unArray :: forall a. Array a -> SmallArray# a unArray = \ (@a) (ds :: Array a) -> case ds of { Array ds1 -> ds1 } -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$trModule4 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 20 0}] -T26615a.$trModule4 = "main"# +$trModule1 :: Addr# +[GblId, Unf=OtherCon []] +$trModule1 = "main"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$trModule3 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$trModule3 = GHC.Internal.Types.TrNameS T26615a.$trModule4 +$trModule2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$trModule2 = GHC.Internal.Types.TrNameS $trModule1 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$trModule2 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$trModule2 = "T26615a"# +$trModule3 :: Addr# +[GblId, Unf=OtherCon []] +$trModule3 = "T26615a"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$trModule1 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$trModule1 = GHC.Internal.Types.TrNameS T26615a.$trModule2 +$trModule4 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$trModule4 = GHC.Internal.Types.TrNameS $trModule3 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$trModule :: GHC.Internal.Types.Module -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$trModule - = GHC.Internal.Types.Module T26615a.$trModule3 T26615a.$trModule1 +T26615a.$trModule [InlPrag=[~]] :: GHC.Internal.Types.Module +[GblId, Unf=OtherCon []] +T26615a.$trModule = GHC.Internal.Types.Module $trModule2 $trModule4 -- RHS size: {terms: 3, types: 1, coercions: 0, joins: 0/0} $krep :: GHC.Internal.Types.KindRep @@ -104,33 +88,24 @@ $krep6 GHC.Internal.Types.$tcSmallArray# $krep5 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcLeaf2 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 20 0}] -T26615a.$tcLeaf2 = "Leaf"# +$tcLeaf1 :: Addr# +[GblId, Unf=OtherCon []] +$tcLeaf1 = "Leaf"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcLeaf1 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tcLeaf1 = GHC.Internal.Types.TrNameS T26615a.$tcLeaf2 +$tcLeaf2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tcLeaf2 = GHC.Internal.Types.TrNameS $tcLeaf1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcLeaf :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tcLeaf [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tcLeaf = GHC.Internal.Types.TyCon 13798714324392902582#Word64 3237499036029031497#Word64 T26615a.$trModule - T26615a.$tcLeaf1 + $tcLeaf2 0# GHC.Internal.Types.krep$*->*->* @@ -160,372 +135,284 @@ $krep10 :: GHC.Internal.Types.KindRep $krep10 = GHC.Internal.Types.KindRepFun $krep2 $krep9 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'L1 [InlPrag=[~]] :: GHC.Internal.Types.KindRep +$krep11 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'L1 = GHC.Internal.Types.KindRepFun $krep3 $krep10 +$krep11 = GHC.Internal.Types.KindRepFun $krep3 $krep10 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'L3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 20 0}] -T26615a.$tc'L3 = "'L"# +$tc'L1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'L1 = "'L"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'L2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'L2 = GHC.Internal.Types.TrNameS T26615a.$tc'L3 +$tc'L2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'L2 = GHC.Internal.Types.TrNameS $tc'L1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'L :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'L [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'L = GHC.Internal.Types.TyCon 8570419491837374712#Word64 2090006989092642392#Word64 T26615a.$trModule - T26615a.$tc'L2 + $tc'L2 2# - T26615a.$tc'L1 + $krep11 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcArray2 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$tcArray2 = "Array"# +$tcArray1 :: Addr# +[GblId, Unf=OtherCon []] +$tcArray1 = "Array"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcArray1 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tcArray1 = GHC.Internal.Types.TrNameS T26615a.$tcArray2 +$tcArray2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tcArray2 = GHC.Internal.Types.TrNameS $tcArray1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcArray :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tcArray [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tcArray = GHC.Internal.Types.TyCon 10495761415291712389#Word64 7580086293698619153#Word64 T26615a.$trModule - T26615a.$tcArray1 + $tcArray2 0# GHC.Internal.Types.krep$*Arr* -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -$krep11 :: GHC.Internal.Types.KindRep +$krep12 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -$krep11 +$krep12 = GHC.Internal.Types.KindRepTyConApp T26615a.$tcArray $krep4 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Array1 [InlPrag=[~]] :: GHC.Internal.Types.KindRep +$krep13 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'Array1 = GHC.Internal.Types.KindRepFun $krep6 $krep11 +$krep13 = GHC.Internal.Types.KindRepFun $krep6 $krep12 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Array3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$tc'Array3 = "'Array"# +$tc'Array1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'Array1 = "'Array"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Array2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'Array2 = GHC.Internal.Types.TrNameS T26615a.$tc'Array3 +$tc'Array2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'Array2 = GHC.Internal.Types.TrNameS $tc'Array1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Array :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'Array [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'Array = GHC.Internal.Types.TyCon 12424115309881832159#Word64 15542868641947707803#Word64 T26615a.$trModule - T26615a.$tc'Array2 + $tc'Array2 1# - T26615a.$tc'Array1 + $krep13 -- RHS size: {terms: 3, types: 2, coercions: 0, joins: 0/0} -$krep12 :: [GHC.Internal.Types.KindRep] +$krep14 :: [GHC.Internal.Types.KindRep] [GblId, Unf=OtherCon []] -$krep12 +$krep14 = GHC.Internal.Types.: @GHC.Internal.Types.KindRep $krep9 (GHC.Internal.Types.[] @GHC.Internal.Types.KindRep) -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -$krep13 :: GHC.Internal.Types.KindRep +$krep15 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -$krep13 - = GHC.Internal.Types.KindRepTyConApp T26615a.$tcArray $krep12 +$krep15 + = GHC.Internal.Types.KindRepTyConApp T26615a.$tcArray $krep14 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcHashMap2 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$tcHashMap2 = "HashMap"# +$tcHashMap1 :: Addr# +[GblId, Unf=OtherCon []] +$tcHashMap1 = "HashMap"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcHashMap1 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tcHashMap1 - = GHC.Internal.Types.TrNameS T26615a.$tcHashMap2 +$tcHashMap2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tcHashMap2 = GHC.Internal.Types.TrNameS $tcHashMap1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tcHashMap :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tcHashMap [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tcHashMap = GHC.Internal.Types.TyCon 2021755758654901686#Word64 8209241086311595496#Word64 T26615a.$trModule - T26615a.$tcHashMap1 + $tcHashMap2 0# GHC.Internal.Types.krep$*->*->* -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Empty1 [InlPrag=[~]] :: GHC.Internal.Types.KindRep +$krep16 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'Empty1 +$krep16 = GHC.Internal.Types.KindRepTyConApp T26615a.$tcHashMap $krep8 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Empty3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$tc'Empty3 = "'Empty"# +$tc'Empty1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'Empty1 = "'Empty"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Empty2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'Empty2 = GHC.Internal.Types.TrNameS T26615a.$tc'Empty3 +$tc'Empty2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'Empty2 = GHC.Internal.Types.TrNameS $tc'Empty1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Empty :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'Empty [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'Empty = GHC.Internal.Types.TyCon 2520556399233147460#Word64 17224648764450205443#Word64 T26615a.$trModule - T26615a.$tc'Empty2 + $tc'Empty2 2# - T26615a.$tc'Empty1 + $krep16 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -$krep14 :: GHC.Internal.Types.KindRep +$krep17 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -$krep14 = GHC.Internal.Types.KindRepFun $krep9 T26615a.$tc'Empty1 +$krep17 = GHC.Internal.Types.KindRepFun $krep9 $krep16 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Leaf1 [InlPrag=[~]] :: GHC.Internal.Types.KindRep +$krep18 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'Leaf1 = GHC.Internal.Types.KindRepFun $krep1 $krep14 +$krep18 = GHC.Internal.Types.KindRepFun $krep1 $krep17 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Leaf3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$tc'Leaf3 = "'Leaf"# +$tc'Leaf1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'Leaf1 = "'Leaf"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Leaf2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'Leaf2 = GHC.Internal.Types.TrNameS T26615a.$tc'Leaf3 +$tc'Leaf2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'Leaf2 = GHC.Internal.Types.TrNameS $tc'Leaf1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Leaf :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'Leaf [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'Leaf = GHC.Internal.Types.TyCon 5773656560257991946#Word64 17028074687139582545#Word64 T26615a.$trModule - T26615a.$tc'Leaf2 + $tc'Leaf2 2# - T26615a.$tc'Leaf1 + $krep18 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -$krep15 :: GHC.Internal.Types.KindRep +$krep19 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -$krep15 = GHC.Internal.Types.KindRepFun $krep13 T26615a.$tc'Empty1 +$krep19 = GHC.Internal.Types.KindRepFun $krep15 $krep16 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Collision1 [InlPrag=[~]] :: GHC.Internal.Types.KindRep +$krep20 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'Collision1 - = GHC.Internal.Types.KindRepFun $krep1 $krep15 +$krep20 = GHC.Internal.Types.KindRepFun $krep1 $krep19 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Collision3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 40 0}] -T26615a.$tc'Collision3 = "'Collision"# +$tc'Collision1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'Collision1 = "'Collision"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Collision2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'Collision2 - = GHC.Internal.Types.TrNameS T26615a.$tc'Collision3 +$tc'Collision2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'Collision2 = GHC.Internal.Types.TrNameS $tc'Collision1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Collision :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'Collision [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'Collision = GHC.Internal.Types.TyCon 18175105753528304021#Word64 13986842878006680511#Word64 T26615a.$trModule - T26615a.$tc'Collision2 + $tc'Collision2 2# - T26615a.$tc'Collision1 + $krep20 -- RHS size: {terms: 3, types: 2, coercions: 0, joins: 0/0} -$krep16 :: [GHC.Internal.Types.KindRep] +$krep21 :: [GHC.Internal.Types.KindRep] [GblId, Unf=OtherCon []] -$krep16 +$krep21 = GHC.Internal.Types.: @GHC.Internal.Types.KindRep - T26615a.$tc'Empty1 + $krep16 (GHC.Internal.Types.[] @GHC.Internal.Types.KindRep) -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -$krep17 :: GHC.Internal.Types.KindRep +$krep22 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -$krep17 - = GHC.Internal.Types.KindRepTyConApp T26615a.$tcArray $krep16 +$krep22 + = GHC.Internal.Types.KindRepTyConApp T26615a.$tcArray $krep21 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Full1 [InlPrag=[~]] :: GHC.Internal.Types.KindRep +$krep23 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'Full1 - = GHC.Internal.Types.KindRepFun $krep17 T26615a.$tc'Empty1 +$krep23 = GHC.Internal.Types.KindRepFun $krep22 $krep16 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Full3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615a.$tc'Full3 = "'Full"# +$tc'Full1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'Full1 = "'Full"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Full2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'Full2 = GHC.Internal.Types.TrNameS T26615a.$tc'Full3 +$tc'Full2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'Full2 = GHC.Internal.Types.TrNameS $tc'Full1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'Full :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'Full [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'Full = GHC.Internal.Types.TyCon 12008762105994325570#Word64 13514145886440831186#Word64 T26615a.$trModule - T26615a.$tc'Full2 + $tc'Full2 2# - T26615a.$tc'Full1 + $krep23 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'BitmapIndexed1 [InlPrag=[~]] - :: GHC.Internal.Types.KindRep +$krep24 :: GHC.Internal.Types.KindRep [GblId, Unf=OtherCon []] -T26615a.$tc'BitmapIndexed1 - = GHC.Internal.Types.KindRepFun $krep1 T26615a.$tc'Full1 +$krep24 = GHC.Internal.Types.KindRepFun $krep1 $krep23 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'BitmapIndexed3 :: Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 50 0}] -T26615a.$tc'BitmapIndexed3 = "'BitmapIndexed"# +$tc'BitmapIndexed1 :: Addr# +[GblId, Unf=OtherCon []] +$tc'BitmapIndexed1 = "'BitmapIndexed"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'BitmapIndexed2 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615a.$tc'BitmapIndexed2 - = GHC.Internal.Types.TrNameS T26615a.$tc'BitmapIndexed3 +$tc'BitmapIndexed2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$tc'BitmapIndexed2 = GHC.Internal.Types.TrNameS $tc'BitmapIndexed1 -- RHS size: {terms: 7, types: 0, coercions: 0, joins: 0/0} -T26615a.$tc'BitmapIndexed :: GHC.Internal.Types.TyCon -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] +T26615a.$tc'BitmapIndexed [InlPrag=[~]] :: GHC.Internal.Types.TyCon +[GblId, Unf=OtherCon []] T26615a.$tc'BitmapIndexed = GHC.Internal.Types.TyCon 15226751910432948177#Word64 957331387129868915#Word64 T26615a.$trModule - T26615a.$tc'BitmapIndexed2 + $tc'BitmapIndexed2 2# - T26615a.$tc'BitmapIndexed1 + $krep24 -- RHS size: {terms: 98, types: 109, coercions: 0, joins: 3/4} T26615a.$wdisjointCollisions [InlPrag=INLINABLE[2]] @@ -538,7 +425,7 @@ T26615a.$wdisjointCollisions [InlPrag=INLINABLE[2]] Str=<LP(SC(S,C(1,L)),A)><L><1L><L><L>, Unf=Unf{Src=StableUser, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [30 0 20 0 0] 406 10 + Guidance=IF_ARGS [90 0 20 0 0] 406 10 Tmpl= \ (@k) (@a) (@b) @@ -586,7 +473,7 @@ T26615a.$wdisjointCollisions [InlPrag=INLINABLE[2]] Arity=5, Str=<L><L><L><L><L>, Unf=OtherCon []] - lookupInArrayCont_ _ [Occ=Dead] + lookupInArrayCont_ ($dEq1 [Occ=Dead] :: Eq k) (k1 [Occ=Once1] :: k) (ary1 [Occ=Once1!] :: Array (Leaf k b)) (i1 [Occ=Once1!] :: Int) @@ -654,24 +541,23 @@ T26615a.$wdisjointCollisions $s$wfoldr_ [InlPrag=[2], Occ=LoopBreaker, Dmd=SC(S,C(1,C(1,C(1,L))))] - :: Bool -> Int# -> Int# -> SmallArray# (Leaf k a) -> Bool + :: SmallArray# (Leaf k a) -> Int# -> Int# -> Bool -> Bool [LclId[JoinId(4)(Nothing)], Arity=4, Str=<L><L><L><L>, Unf=OtherCon []] - $s$wfoldr_ (sc :: Bool) + $s$wfoldr_ (sc :: SmallArray# (Leaf k a)) (sc1 :: Int#) (sc2 :: Int#) - (sc3 :: SmallArray# (Leaf k a)) - = case >=# sc1 sc2 of { + (sc3 :: Bool) + = case >=# sc2 sc1 of { __DEFAULT -> - case indexSmallArray# @Lifted @(Leaf k a) sc3 sc1 of - { (# ipv1 #) -> + case indexSmallArray# @Lifted @(Leaf k a) sc sc2 of { (# ipv1 #) -> case ipv1 of { L kA ds1 -> join { $j :: Bool [LclId[JoinId(0)(Nothing)]] - $j = jump $s$wfoldr_ sc (+# sc1 1#) sc2 sc3 } in + $j = jump $s$wfoldr_ sc sc1 (+# sc2 1#) sc3 } in joinrec { $wlookupInArrayCont_ [InlPrag=[2], Occ=LoopBreaker, @@ -703,13 +589,13 @@ T26615a.$wdisjointCollisions jump $wlookupInArrayCont_ kA ww2 0# lvl2 } }; - 1# -> sc + 1# -> sc3 }; } in jump $s$wfoldr_ - GHC.Internal.Types.True - 0# - (sizeofSmallArray# @Lifted @(Leaf k a) ipv) ipv + (sizeofSmallArray# @Lifted @(Leaf k a) ipv) + 0# + GHC.Internal.Types.True } } @@ -728,28 +614,28 @@ Rec { -- RHS size: {terms: 133, types: 126, coercions: 0, joins: 1/2} T26615a.disjointSubtrees_$s$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] - :: forall b a k. - Word# - -> SmallArray# (Leaf k a) -> Int# -> Eq k => HashMap k b -> Bool + :: forall k a b. + Eq k => + Int# -> Word# -> SmallArray# (Leaf k a) -> HashMap k b -> Bool [GblId[StrictWorker([~, ~, ~, ~, !])], Arity=5, - Str=<L><L><L><LP(SC(S,C(1,L)),A)><1L>, + Str=<LP(SC(S,C(1,L)),A)><L><L><L><1L>, Unf=OtherCon []] T26615a.disjointSubtrees_$s$wdisjointSubtrees - = \ (@b) + = \ (@k) (@a) - (@k) - (sc :: Word#) - (sc1 :: SmallArray# (Leaf k a)) - (sc2 :: Int#) - (sc3 :: Eq k) + (@b) + (sc :: Eq k) + (sc1 :: Int#) + (sc2 :: Word#) + (sc3 :: SmallArray# (Leaf k a)) (_b :: HashMap k b) -> case _b of { Empty -> GHC.Internal.Types.True; Leaf bx ds -> case ds of { L kB ds1 -> case kB of k0 { __DEFAULT -> - case eqWord# bx sc of { + case eqWord# bx sc2 of { __DEFAULT -> GHC.Internal.Types.True; 1# -> joinrec { @@ -770,7 +656,7 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees __DEFAULT -> case indexSmallArray# @Lifted @(Leaf k a) ww ww1 of { (# ipv #) -> case ipv of { L kx v -> - case == @k sc3 k2 kx of { + case == @k sc k2 kx of { False -> jump $wlookupInArrayCont_ k2 ww (+# ww1 1#) ww2; True -> GHC.Internal.Types.False } @@ -780,19 +666,19 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees } }; } in jump $wlookupInArrayCont_ - k0 sc1 0# (sizeofSmallArray# @Lifted @(Leaf k a) sc1) + k0 sc3 0# (sizeofSmallArray# @Lifted @(Leaf k a) sc3) } } }; Collision bx bx1 -> T26615a.$wdisjointCollisions - @k @a @b sc3 sc (T26615a.Array @(Leaf k a) sc1) bx bx1; + @k @a @b sc sc2 (T26615a.Array @(Leaf k a) sc3) bx bx1; BitmapIndexed bx bx1 -> let { m :: Word# [LclId] m = uncheckedShiftL# - 1## (word2Int# (and# (uncheckedShiftRL# sc sc2) 31##)) } in + 1## (word2Int# (and# (uncheckedShiftRL# sc2 sc1) 31##)) } in case and# m bx of { __DEFAULT -> case indexSmallArray# @@ -803,7 +689,7 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees of { (# ipv #) -> T26615a.disjointSubtrees_$s$wdisjointSubtrees - @b @a @k sc sc1 (+# sc2 5#) sc3 ipv + @k @a @b sc (+# sc1 5#) sc2 sc3 ipv }; 0## -> GHC.Internal.Types.True }; @@ -812,17 +698,17 @@ T26615a.disjointSubtrees_$s$wdisjointSubtrees @Lifted @(HashMap k b) bx - (word2Int# (and# (uncheckedShiftRL# sc sc2) 31##)) + (word2Int# (and# (uncheckedShiftRL# sc2 sc1) 31##)) of { (# ipv #) -> T26615a.disjointSubtrees_$s$wdisjointSubtrees - @b @a @k sc sc1 (+# sc2 5#) sc3 ipv + @k @a @b sc (+# sc1 5#) sc2 sc3 ipv } } end Rec } Rec { --- RHS size: {terms: 705, types: 732, coercions: 18, joins: 13/23} +-- RHS size: {terms: 705, types: 748, coercions: 18, joins: 13/23} T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] :: forall k a b. Eq k => Int# -> HashMap k a -> HashMap k b -> Bool [GblId[StrictWorker([~, ~, !])], @@ -841,7 +727,7 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] join { fail [Occ=Once3!T[1]] :: (# #) -> Bool [LclId[JoinId(1)(Nothing)], Arity=1, Str=<L>, Unf=OtherCon []] - fail _ [Occ=Dead, OS=OneShot] + fail (ds1 [Occ=Dead, OS=OneShot] :: (# #)) = case _b of wild [Occ=Once1] { __DEFAULT -> case GHC.Internal.Control.Exception.Base.patError @@ -860,7 +746,7 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] Arity=5, Str=<L><L><L><L><L>, Unf=OtherCon []] - lookupCont_ _ [Occ=Dead] + lookupCont_ ($dEq1 [Occ=Dead] :: Eq k) (ds4 [Occ=Once1!] :: Word) (ds5 [Occ=Once1] :: k) (ds6 [Occ=Once1!] :: Int) @@ -896,7 +782,7 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] Arity=5, Str=<L><L><L><L><L>, Unf=OtherCon []] - lookupInArrayCont_ _ [Occ=Dead] + lookupInArrayCont_ ($dEq2 [Occ=Dead] :: Eq k) (k1 [Occ=Once1] :: k) (ary [Occ=Once1!] :: Array (Leaf k a)) (i [Occ=Once1!] :: Int) @@ -1000,7 +886,7 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] Arity=5, Str=<L><L><L><L><L>, Unf=OtherCon []] - lookupCont_ _ [Occ=Dead] + lookupCont_ ($dEq1 [Occ=Dead] :: Eq k) (ds3 [Occ=Once1!] :: Word) (ds4 [Occ=Once1] :: k) (ds5 [Occ=Once1!] :: Int) @@ -1034,7 +920,7 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] Arity=5, Str=<L><L><L><L><L>, Unf=OtherCon []] - lookupInArrayCont_ _ [Occ=Dead] + lookupInArrayCont_ ($dEq2 [Occ=Dead] :: Eq k) (k1 [Occ=Once1] :: k) (ary [Occ=Once1!] :: Array (Leaf k b)) (i [Occ=Once1!] :: Int) @@ -1179,23 +1065,23 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] @(*) @(SmallArray# (HashMap k a) -> SmallArray# (HashMap k b) -> Int#) - @(GHC.Internal.Types.ZonkAny 0 - -> GHC.Internal.Types.ZonkAny 1 -> Int#) + @(GHC.Internal.Types.UnusedType 0 "a" + -> GHC.Internal.Types.UnusedType 1 "b" -> Int#) of { GHC.Internal.Unsafe.Coerce.UnsafeRefl v2 -> case reallyUnsafePtrEquality# @Lifted @Lifted - @(GHC.Internal.Types.ZonkAny 0) - @(GHC.Internal.Types.ZonkAny 1) + @(GHC.Internal.Types.UnusedType 0 "a") + @(GHC.Internal.Types.UnusedType 1 "b") (bx1 `cast` (SelCo:Fun(arg) (Sub (Sym v2)) :: SmallArray# (HashMap k a) - ~R# GHC.Internal.Types.ZonkAny 0)) + ~R# GHC.Internal.Types.UnusedType 0 "a")) (bx3 `cast` (SelCo:Fun(arg) (SelCo:Fun(res) (Sub (Sym v2))) :: SmallArray# (HashMap k b) - ~R# GHC.Internal.Types.ZonkAny 1)) + ~R# GHC.Internal.Types.UnusedType 1 "b")) of { __DEFAULT -> joinrec { @@ -1324,51 +1210,49 @@ T26615a.$wdisjointSubtrees [InlPrag=INLINABLE[2], Occ=LoopBreaker] }; } in jump go (GHC.Internal.Types.W# (and# 4294967295## bx1)); Full bx1 -> + joinrec { + go [Occ=LoopBreakerT[1]] :: Int -> Bool + [LclId[JoinId(1)(Nothing)], Arity=1, Str=<L>, Unf=OtherCon []] + go (i :: Int) + = case GHC.Internal.Classes.ltInt i (GHC.Internal.Types.I# 0#) of { + False -> + case i of { I# i# -> + case indexSmallArray# @Lifted @(HashMap k a) bx i# of + { (# ipv [Occ=Once1] #) -> + case indexSmallArray# @Lifted @(HashMap k b) bx1 i# of + { (# ipv1 [Occ=Once1] #) -> + case T26615a.$wdisjointSubtrees @k @a @b $dEq (+# ww 5#) ipv ipv1 + of { + False -> GHC.Internal.Types.False; + True -> jump go (GHC.Internal.Types.I# (-# i# 1#)) + } + } + } + }; + True -> GHC.Internal.Types.True + }; } in case GHC.Internal.Unsafe.Coerce.unsafeEqualityProof @(*) @(SmallArray# (HashMap k a) -> SmallArray# (HashMap k b) -> Int#) - @(GHC.Internal.Types.ZonkAny 0 - -> GHC.Internal.Types.ZonkAny 1 -> Int#) + @(GHC.Internal.Types.UnusedType 0 "a" + -> GHC.Internal.Types.UnusedType 1 "b" -> Int#) of { GHC.Internal.Unsafe.Coerce.UnsafeRefl v2 -> case reallyUnsafePtrEquality# @Lifted @Lifted - @(GHC.Internal.Types.ZonkAny 0) - @(GHC.Internal.Types.ZonkAny 1) + @(GHC.Internal.Types.UnusedType 0 "a") + @(GHC.Internal.Types.UnusedType 1 "b") (bx `cast` (SelCo:Fun(arg) (Sub (Sym v2)) :: SmallArray# (HashMap k a) - ~R# GHC.Internal.Types.ZonkAny 0)) + ~R# GHC.Internal.Types.UnusedType 0 "a")) (bx1 `cast` (SelCo:Fun(arg) (SelCo:Fun(res) (Sub (Sym v2))) :: SmallArray# (HashMap k b) - ~R# GHC.Internal.Types.ZonkAny 1)) + ~R# GHC.Internal.Types.UnusedType 1 "b")) of { - __DEFAULT -> - joinrec { - go [Occ=LoopBreakerT[1]] :: Int -> Bool - [LclId[JoinId(1)(Nothing)], Arity=1, Str=<L>, Unf=OtherCon []] - go (i :: Int) - = case GHC.Internal.Classes.ltInt i (GHC.Internal.Types.I# 0#) of { - False -> - case i of { I# i# -> - case indexSmallArray# @Lifted @(HashMap k a) bx i# of - { (# ipv [Occ=Once1] #) -> - case indexSmallArray# @Lifted @(HashMap k b) bx1 i# of - { (# ipv1 [Occ=Once1] #) -> - case T26615a.$wdisjointSubtrees - @k @a @b $dEq (+# ww 5#) ipv ipv1 - of { - False -> GHC.Internal.Types.False; - True -> jump go (GHC.Internal.Types.I# (-# i# 1#)) - } - } - } - }; - True -> GHC.Internal.Types.True - }; } in - jump go (GHC.Internal.Types.I# 31#); + __DEFAULT -> jump go (GHC.Internal.Types.I# 31#); 1# -> GHC.Internal.Types.False } } @@ -1385,7 +1269,7 @@ T26615a.$wdisjointSubtrees join { fail [Dmd=MC(1,L)] :: (# #) -> Bool [LclId[JoinId(1)(Nothing)], Arity=1, Str=<A>, Unf=OtherCon []] - fail _ [Occ=Dead, OS=OneShot] + fail (ds1 [Occ=Dead, OS=OneShot] :: (# #)) = case _b of { __DEFAULT -> case lvl1 of {}; Empty -> GHC.Internal.Types.True; @@ -1508,7 +1392,7 @@ T26615a.$wdisjointSubtrees }; Collision bx bx1 -> T26615a.disjointSubtrees_$s$wdisjointSubtrees - @a @b @k bx bx1 ww $dEq ds + @k @b @a $dEq ww bx bx1 ds } } in case ds of { Empty -> GHC.Internal.Types.True; @@ -1661,7 +1545,7 @@ T26615a.$wdisjointSubtrees of { (# ipv #) -> T26615a.disjointSubtrees_$s$wdisjointSubtrees - @b @a @k bx bx1 (+# ww 5#) $dEq ipv + @k @a @b $dEq (+# ww 5#) bx bx1 ipv }; 0## -> GHC.Internal.Types.True }; @@ -1674,7 +1558,7 @@ T26615a.$wdisjointSubtrees of { (# ipv #) -> T26615a.disjointSubtrees_$s$wdisjointSubtrees - @b @a @k bx bx1 (+# ww 5#) $dEq ipv + @k @a @b $dEq (+# ww 5#) bx bx1 ipv } }; BitmapIndexed bx bx1 -> @@ -1686,21 +1570,23 @@ T26615a.$wdisjointSubtrees case GHC.Internal.Unsafe.Coerce.unsafeEqualityProof @(*) @(SmallArray# (HashMap k a) -> SmallArray# (HashMap k b) -> Int#) - @(GHC.Internal.Types.ZonkAny 0 - -> GHC.Internal.Types.ZonkAny 1 -> Int#) + @(GHC.Internal.Types.UnusedType 0 "a" + -> GHC.Internal.Types.UnusedType 1 "b" -> Int#) of { GHC.Internal.Unsafe.Coerce.UnsafeRefl v2 -> case reallyUnsafePtrEquality# @Lifted @Lifted - @(GHC.Internal.Types.ZonkAny 0) - @(GHC.Internal.Types.ZonkAny 1) + @(GHC.Internal.Types.UnusedType 0 "a") + @(GHC.Internal.Types.UnusedType 1 "b") (bx1 `cast` (SelCo:Fun(arg) (Sub (Sym v2)) - :: SmallArray# (HashMap k a) ~R# GHC.Internal.Types.ZonkAny 0)) + :: SmallArray# (HashMap k a) + ~R# GHC.Internal.Types.UnusedType 0 "a")) (bx3 `cast` (SelCo:Fun(arg) (SelCo:Fun(res) (Sub (Sym v2))) - :: SmallArray# (HashMap k b) ~R# GHC.Internal.Types.ZonkAny 1)) + :: SmallArray# (HashMap k b) + ~R# GHC.Internal.Types.UnusedType 1 "b")) of { __DEFAULT -> let { @@ -1829,21 +1715,23 @@ T26615a.$wdisjointSubtrees case GHC.Internal.Unsafe.Coerce.unsafeEqualityProof @(*) @(SmallArray# (HashMap k a) -> SmallArray# (HashMap k b) -> Int#) - @(GHC.Internal.Types.ZonkAny 0 - -> GHC.Internal.Types.ZonkAny 1 -> Int#) + @(GHC.Internal.Types.UnusedType 0 "a" + -> GHC.Internal.Types.UnusedType 1 "b" -> Int#) of { GHC.Internal.Unsafe.Coerce.UnsafeRefl v2 -> case reallyUnsafePtrEquality# @Lifted @Lifted - @(GHC.Internal.Types.ZonkAny 0) - @(GHC.Internal.Types.ZonkAny 1) + @(GHC.Internal.Types.UnusedType 0 "a") + @(GHC.Internal.Types.UnusedType 1 "b") (bx `cast` (SelCo:Fun(arg) (Sub (Sym v2)) - :: SmallArray# (HashMap k a) ~R# GHC.Internal.Types.ZonkAny 0)) + :: SmallArray# (HashMap k a) + ~R# GHC.Internal.Types.UnusedType 0 "a")) (bx1 `cast` (SelCo:Fun(arg) (SelCo:Fun(res) (Sub (Sym v2))) - :: SmallArray# (HashMap k b) ~R# GHC.Internal.Types.ZonkAny 1)) + :: SmallArray# (HashMap k b) + ~R# GHC.Internal.Types.UnusedType 1 "b")) of { __DEFAULT -> let { @@ -1910,88 +1798,72 @@ disjointSubtrees ------ Local rules for imported ids -------- "SC:$wdisjointSubtrees1" [1] - forall (@a) + forall (@k) (@b) - (@k) - (sc :: Word#) - (sc1 :: SmallArray# (Leaf k a)) + (@a) + (sc :: Eq k) + (sc1 :: Int#) (sc2 :: Word#) (sc3 :: SmallArray# (Leaf k b)) - (sc4 :: Int#) - (sc5 :: Eq k). + (sc4 :: Word#) + (sc5 :: SmallArray# (Leaf k a)). T26615a.$wdisjointSubtrees @k @b @a - sc5 - sc4 + sc + sc1 (T26615a.Collision @k @b sc2 sc3) - (T26615a.Collision @k @a sc sc1) + (T26615a.Collision @k @a sc4 sc5) = T26615a.$wdisjointCollisions - @k @b @a sc5 sc2 (T26615a.Array @(Leaf k b) sc3) sc sc1 + @k @b @a sc sc2 (T26615a.Array @(Leaf k b) sc3) sc4 sc5 "SC:$wdisjointSubtrees0" [1] - forall (@b) + forall (@k) (@a) - (@k) - (sc :: Word#) - (sc1 :: SmallArray# (Leaf k a)) - (sc2 :: Int#) - (sc3 :: Eq k). + (@b) + (sc :: Eq k) + (sc1 :: Int#) + (sc2 :: Word#) + (sc3 :: SmallArray# (Leaf k a)). T26615a.$wdisjointSubtrees @k @a @b - sc3 - sc2 - (T26615a.Collision @k @a sc sc1) + sc + sc1 + (T26615a.Collision @k @a sc2 sc3) = T26615a.disjointSubtrees_$s$wdisjointSubtrees - @b @a @k sc sc1 sc2 sc3 + @k @a @b sc sc1 sc2 sc3 [2 of 2] Compiling T26615 ( T26615.hs, T26615.o ) ==================== Tidy Core ==================== Result size of Tidy Core - = {terms: 614, types: 666, coercions: 18, joins: 8/14} + = {terms: 614, types: 682, coercions: 18, joins: 8/14} -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615.$trModule2 :: GHC.Internal.Prim.Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 30 0}] -T26615.$trModule2 = "T26615"# +$trModule1 :: GHC.Internal.Prim.Addr# +[GblId, Unf=OtherCon []] +$trModule1 = "T26615"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615.$trModule1 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615.$trModule1 = GHC.Internal.Types.TrNameS T26615.$trModule2 +$trModule2 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$trModule2 = GHC.Internal.Types.TrNameS $trModule1 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} -T26615.$trModule4 :: GHC.Internal.Prim.Addr# -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 20 0}] -T26615.$trModule4 = "main"# +$trModule3 :: GHC.Internal.Prim.Addr# +[GblId, Unf=OtherCon []] +$trModule3 = "main"# -- RHS size: {terms: 2, types: 0, coercions: 0, joins: 0/0} -T26615.$trModule3 :: GHC.Internal.Types.TrName -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615.$trModule3 = GHC.Internal.Types.TrNameS T26615.$trModule4 +$trModule4 :: GHC.Internal.Types.TrName +[GblId, Unf=OtherCon []] +$trModule4 = GHC.Internal.Types.TrNameS $trModule3 -- RHS size: {terms: 3, types: 0, coercions: 0, joins: 0/0} -T26615.$trModule :: GHC.Internal.Types.Module -[GblId, - Unf=Unf{Src=<vanilla>, TopLvl=True, - Value=True, ConLike=True, WorkFree=True, Expandable=True, - Guidance=IF_ARGS [] 10 10}] -T26615.$trModule - = GHC.Internal.Types.Module T26615.$trModule3 T26615.$trModule1 +T26615.$trModule [InlPrag=[~]] :: GHC.Internal.Types.Module +[GblId, Unf=OtherCon []] +T26615.$trModule = GHC.Internal.Types.Module $trModule4 $trModule2 -- RHS size: {terms: 1, types: 0, coercions: 0, joins: 0/0} lvl :: GHC.Internal.Prim.Addr# @@ -2128,7 +2000,7 @@ $wpoly_lookupCont_ end Rec } Rec { --- RHS size: {terms: 448, types: 507, coercions: 18, joins: 8/13} +-- RHS size: {terms: 448, types: 523, coercions: 18, joins: 8/13} T26615.$s$wdisjointSubtrees [InlPrag=[~], Occ=LoopBreaker] :: forall a b. GHC.Internal.Prim.Int# @@ -2143,7 +2015,7 @@ T26615.$s$wdisjointSubtrees join { fail [Dmd=MC(1,L)] :: (# #) -> Bool [LclId[JoinId(1)(Nothing)], Arity=1, Str=<A>, Unf=OtherCon []] - fail _ [Occ=Dead, OS=OneShot] + fail (ds1 [Occ=Dead, OS=OneShot] :: (# #)) = case _b of wild { __DEFAULT -> case lvl1 of {}; T26615a.Empty -> GHC.Internal.Types.True; @@ -2190,30 +2062,28 @@ T26615.$s$wdisjointSubtrees $s$wfoldr_ [InlPrag=[2], Occ=LoopBreaker, Dmd=SC(S,C(1,C(1,C(1,L))))] - :: Bool - -> GHC.Internal.Prim.Int# - -> GHC.Internal.Prim.Int# - -> GHC.Internal.Prim.SmallArray# (T26615a.Leaf [Char] a) - -> Bool + :: GHC.Internal.Prim.SmallArray# (T26615a.Leaf [Char] a) + -> GHC.Internal.Prim.Int# -> GHC.Internal.Prim.Int# -> Bool -> Bool [LclId[JoinId(4)(Nothing)], Arity=4, Str=<L><L><L><L>, Unf=OtherCon []] - $s$wfoldr_ (sc :: Bool) + $s$wfoldr_ (sc + :: GHC.Internal.Prim.SmallArray# (T26615a.Leaf [Char] a)) (sc1 :: GHC.Internal.Prim.Int#) (sc2 :: GHC.Internal.Prim.Int#) - (sc3 :: GHC.Internal.Prim.SmallArray# (T26615a.Leaf [Char] a)) - = case GHC.Internal.Prim.>=# sc1 sc2 of { + (sc3 :: Bool) + = case GHC.Internal.Prim.>=# sc2 sc1 of { __DEFAULT -> case GHC.Internal.Prim.indexSmallArray# - @GHC.Internal.Types.Lifted @(T26615a.Leaf String a) sc3 sc1 + @GHC.Internal.Types.Lifted @(T26615a.Leaf String a) sc sc2 of { (# ipv1 #) -> case ipv1 of { T26615a.L kA ds2 -> join { $j :: Bool [LclId[JoinId(0)(Nothing)]] - $j = jump $s$wfoldr_ sc (GHC.Internal.Prim.+# sc1 1#) sc2 sc3 } in + $j = jump $s$wfoldr_ sc sc1 (GHC.Internal.Prim.+# sc2 1#) sc3 } in joinrec { $wlookupInArrayCont_ [InlPrag=[2], Occ=LoopBreaker, @@ -2258,14 +2128,14 @@ T26615.$s$wdisjointSubtrees jump $wlookupInArrayCont_ kA bx3 0# lvl2 } }; - 1# -> sc + 1# -> sc3 }; } in jump $s$wfoldr_ - GHC.Internal.Types.True - 0# + bx1 (GHC.Internal.Prim.sizeofSmallArray# @GHC.Internal.Types.Lifted @(T26615a.Leaf String a) bx1) - bx1 + 0# + GHC.Internal.Types.True }; T26615a.BitmapIndexed bx2 bx3 -> let { @@ -2317,23 +2187,23 @@ T26615.$s$wdisjointSubtrees @(GHC.Internal.Prim.SmallArray# (HashMap String a) -> GHC.Internal.Prim.SmallArray# (HashMap String b) -> GHC.Internal.Prim.Int#) - @(GHC.Internal.Types.ZonkAny 0 - -> GHC.Internal.Types.ZonkAny 1 -> GHC.Internal.Prim.Int#) + @(GHC.Internal.Types.UnusedType 0 "a" + -> GHC.Internal.Types.UnusedType 1 "b" -> GHC.Internal.Prim.Int#) of { GHC.Internal.Unsafe.Coerce.UnsafeRefl v2 -> case GHC.Internal.Prim.reallyUnsafePtrEquality# @GHC.Internal.Types.Lifted @GHC.Internal.Types.Lifted - @(GHC.Internal.Types.ZonkAny 0) - @(GHC.Internal.Types.ZonkAny 1) + @(GHC.Internal.Types.UnusedType 0 "a") + @(GHC.Internal.Types.UnusedType 1 "b") (bx1 `cast` (SelCo:Fun(arg) (Sub (Sym v2)) :: GHC.Internal.Prim.SmallArray# (HashMap String a) - ~R# GHC.Internal.Types.ZonkAny 0)) + ~R# GHC.Internal.Types.UnusedType 0 "a")) (bx3 `cast` (SelCo:Fun(arg) (SelCo:Fun(res) (Sub (Sym v2))) :: GHC.Internal.Prim.SmallArray# (HashMap String b) - ~R# GHC.Internal.Types.ZonkAny 1)) + ~R# GHC.Internal.Types.UnusedType 1 "b")) of { __DEFAULT -> joinrec { @@ -2495,23 +2365,23 @@ T26615.$s$wdisjointSubtrees @(GHC.Internal.Prim.SmallArray# (HashMap String a) -> GHC.Internal.Prim.SmallArray# (HashMap String b) -> GHC.Internal.Prim.Int#) - @(GHC.Internal.Types.ZonkAny 0 - -> GHC.Internal.Types.ZonkAny 1 -> GHC.Internal.Prim.Int#) + @(GHC.Internal.Types.UnusedType 0 "a" + -> GHC.Internal.Types.UnusedType 1 "b" -> GHC.Internal.Prim.Int#) of { GHC.Internal.Unsafe.Coerce.UnsafeRefl v2 -> case GHC.Internal.Prim.reallyUnsafePtrEquality# @GHC.Internal.Types.Lifted @GHC.Internal.Types.Lifted - @(GHC.Internal.Types.ZonkAny 0) - @(GHC.Internal.Types.ZonkAny 1) + @(GHC.Internal.Types.UnusedType 0 "a") + @(GHC.Internal.Types.UnusedType 1 "b") (bx `cast` (SelCo:Fun(arg) (Sub (Sym v2)) :: GHC.Internal.Prim.SmallArray# (HashMap String a) - ~R# GHC.Internal.Types.ZonkAny 0)) + ~R# GHC.Internal.Types.UnusedType 0 "a")) (bx1 `cast` (SelCo:Fun(arg) (SelCo:Fun(res) (Sub (Sym v2))) :: GHC.Internal.Prim.SmallArray# (HashMap String b) - ~R# GHC.Internal.Types.ZonkAny 1)) + ~R# GHC.Internal.Types.UnusedType 1 "b")) of { __DEFAULT -> joinrec { @@ -2564,7 +2434,7 @@ f = \ (@a) ------ Local rules for imported ids -------- "SPEC/T26615 $wdisjointSubtrees @String @_ @_" [2] - forall (@a) (@b) ($dEq :: Eq String). + forall (@a) (@b) ($dEq [Occ=Dead] :: Eq String). T26615a.$wdisjointSubtrees @String @a @b $dEq = T26615.$s$wdisjointSubtrees @a @b ===================================== testsuite/tests/typecheck/should_fail/T13292.stderr ===================================== @@ -14,15 +14,15 @@ T13292a.hs:4:12: warning: [GHC-39999] [-Wdeferred-type-errors (in -Wdefault)] In an equation for ‘someFunc’: someFunc = return () T13292.hs:6:1: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] - • Couldn't match type ‘GHC.Internal.Types.ZonkAny 0’ with ‘IO’ + • Couldn't match type ‘m0_0’ with ‘IO’ Expected: IO () - Actual: GHC.Internal.Types.ZonkAny 0 () + Actual: m0_0 () • When checking the type of the IO action ‘main’ T13292.hs:6:1: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] - • Couldn't match type ‘GHC.Internal.Types.ZonkAny 0’ with ‘IO’ + • Couldn't match type ‘m0_0’ with ‘IO’ Expected: IO () - Actual: GHC.Internal.Types.ZonkAny 0 () + Actual: m0_0 () • In the expression: main When checking the type of the IO action ‘main’ ===================================== testsuite/tests/typecheck/should_fail/T27390-explicit-kinds.stderr ===================================== @@ -0,0 +1,28 @@ +T27390a.hs:4:12: warning: [GHC-39999] [-Wdeferred-type-errors (in -Wdefault)] + • Ambiguous type variable ‘m0’ arising from a use of ‘return’ + prevents the constraint ‘(Monad m0)’ from being solved. + Relevant bindings include + someFunc :: m0 () (bound at T27390a.hs:4:1) + Probable fix: use a type annotation to specify what ‘m0’ should be. + Potentially matching instances: + instance Monad IO -- Defined in ‘GHC.Internal.Base’ + instance Monad Maybe -- Defined in ‘GHC.Internal.Base’ + ...plus six others + ...plus one instance involving out-of-scope types + (use -fprint-potential-instances to see them all) + • In the expression: return () + In an equation for ‘someFunc’: someFunc = return () + +T27390.hs:6:1: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] + • Couldn't match type ‘m0_0 :: Type -> Type’ with ‘IO’ + Expected: IO () + Actual: (m0_0 :: Type -> Type) () + • When checking the type of the IO action ‘main’ + +T27390.hs:6:1: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] + • Couldn't match type ‘m0_0 :: Type -> Type’ with ‘IO’ + Expected: IO () + Actual: (m0_0 :: Type -> Type) () + • In the expression: main + When checking the type of the IO action ‘main’ + ===================================== testsuite/tests/typecheck/should_fail/T27390.hs ===================================== @@ -0,0 +1,6 @@ +{-# language NoStarIsType #-} +module Main where + +import T27390a + +main = someFunc ===================================== testsuite/tests/typecheck/should_fail/T27390.stderr ===================================== @@ -0,0 +1,28 @@ +T27390a.hs:4:12: warning: [GHC-39999] [-Wdeferred-type-errors (in -Wdefault)] + • Ambiguous type variable ‘m0’ arising from a use of ‘return’ + prevents the constraint ‘(Monad m0)’ from being solved. + Relevant bindings include + someFunc :: m0 () (bound at T27390a.hs:4:1) + Probable fix: use a type annotation to specify what ‘m0’ should be. + Potentially matching instances: + instance Monad IO -- Defined in ‘GHC.Internal.Base’ + instance Monad Maybe -- Defined in ‘GHC.Internal.Base’ + ...plus six others + ...plus one instance involving out-of-scope types + (use -fprint-potential-instances to see them all) + • In the expression: return () + In an equation for ‘someFunc’: someFunc = return () + +T27390.hs:6:1: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] + • Couldn't match type ‘m0_0’ with ‘IO’ + Expected: IO () + Actual: m0_0 () + • When checking the type of the IO action ‘main’ + +T27390.hs:6:1: warning: [GHC-83865] [-Wdeferred-type-errors (in -Wdefault)] + • Couldn't match type ‘m0_0’ with ‘IO’ + Expected: IO () + Actual: m0_0 () + • In the expression: main + When checking the type of the IO action ‘main’ + ===================================== testsuite/tests/typecheck/should_fail/T27390a.hs ===================================== @@ -0,0 +1,4 @@ +module T27390a where + + +someFunc = return () ===================================== testsuite/tests/typecheck/should_fail/all.T ===================================== @@ -448,6 +448,8 @@ test('T13075', normal, compile_fail, ['']) test('LevPolyBounded', normal, compile_fail, ['']) test('T13487', normal, compile, ['']) test('T13292', normal, multimod_compile, ['T13292', '-v0 -fdefer-type-errors']) +test('T27390', normal, multimod_compile, ['T27390', '-v0 -fdefer-type-errors']) +test('T27390-explicit-kinds', [extra_files(['T27390.hs', 'T27390a.hs'])], multimod_compile, ['T27390', '-v0 -fdefer-type-errors -fprint-explicit-kinds']) test('T13300', normal, compile_fail, ['']) test('T13311', normal, compile_fail, ['']) test('T13446', normal, compile_fail, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/10205e33079675a596accac2e313d77… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/10205e33079675a596accac2e313d77… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: Don't use global variables to address concurrency bugs! (fixes #27234)
by Marge Bot (＠marge-bot) 23 Jun '26

23 Jun '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 9284a1f7 by Simon Hengel at 2026-06-23T05:55:33-04:00 Don't use global variables to address concurrency bugs! (fixes #27234) This was originally introduce with 88f38b03025386f0f1e8f5861eed67d80495168a to address #17922. In this specific case a better fix would have been to synchronize on stderr: withHandle_ "stderrSupportsAnsiColors" stderr $ \ _ -> do ... But apparently the dependency on `terminfo` was removed in 32ab07bf3d6ce45e8ea5b55e8095174a6b42a7f0, preventing #17922 in the first place. - - - - - 44309cd3 by Alan Zimmerman at 2026-06-23T05:56:20-04:00 EPA: remove LocatedL / SrcSpanAnnL and LocatedLI / SrcSpanAnnLI This is part of a refactor towards only having LocatedA / SrcSpanAnnA It removes the stated items, but has to add back one for BooleanFormula, LocatedBF / SrcSpanAnnBF This commit also use the HsConDetails RecCon extension point to capture the braces in a record constructor - - - - - 609cef61 by Simon Jakobi at 2026-06-23T10:07:09-04:00 Add explicit setBit/clearBit/complementBit for instance Bits Integer (#21176) The default setBit, clearBit, and complementBit methods allocate intermediate Integers per call. Define them explicitly via the new integerSetBit[#], integerClearBit[#] and integerComplementBit[#], built on the BigNat# primitives, which avoid those allocations. Allocation is not eliminated entirely -- the negative (IN) cases would need in-place mutation, which is left as future work. The default methods constant-folded on literal arguments via the integerOr/integerAnd/integerXor rules, which fold literal Integers of any size. The explicit functions have no such rule, so they (their Word-argument wrappers, and the Bits Integer methods) are marked INLINE to expose the underlying primops to the simplifier; see Note [INLINE for constant folding of bit operations]. This restores folding only on the small-int (IS) path -- large literal Integers (IP/IN) are no longer constant-folded, a minor regression for that case. T8832 covers the IS-path folding. The new golden-output test T21176 checks all three operations against the default implementations across the sign/size boundaries, recording each result plus its integerCheck validity. The base and ghc-bignum interface- stability export goldens gain the new functions. The main changelog entry lives in changelog.d under a new ghc-internal section (renamed from ghc-prim). CLC proposal: https://github.com/haskell/core-libraries-committee/issues/423 Co-Authored-By: Claude Opus 4.7 <noreply(a)anthropic.com> - - - - - 9a757c4d by Andreas Klebinger at 2026-06-23T10:07:14-04:00 Fix a profiling race condition resulting in segfaults. StgToCmm: Don't assume tagged FUN closures in closureCodeBody. When entering a closure the self/node pointer might not be tagged in some situations when a thunk is evaluated by multiple threads. So we most AND away the tag bits rather than subtracting an expected tag. Apply.cmm: Fix a race condition occuring when a thunk is mutated during GC. In stg_ap_0_fast when might need to run GC before entering a thunk. If this happens another thread or the GC itself might mutate the closure making entering it no longer valid. We now check for this. Add test and changelog for #27123 fixes. - - - - - 81 changed files: - + changelog.d/T21176 - + changelog.d/T27123.md - changelog.d/config - compiler/GHC/Data/BooleanFormula.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Hs.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Stats.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/StgToCmm/Bind.hs - compiler/GHC/SysTools/Terminal.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Utils/Backpack.hs - compiler/GHC/ThToHs.hs - compiler/Language/Haskell/Syntax.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - ghc/GHCi/UI.hs - libraries/base/changelog.md - libraries/ghc-bignum/changelog.md - libraries/ghc-internal/src/GHC/Internal/Bignum/Integer.hs - libraries/ghc-internal/src/GHC/Internal/Bits.hs - rts/Apply.cmm - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/interface-stability/ghc-bignum-exports.stdout - testsuite/tests/module/mod185.stderr - + testsuite/tests/numeric/should_run/T21176.hs - + testsuite/tests/numeric/should_run/T21176.stdout - testsuite/tests/numeric/should_run/all.T - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test10309.hs - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - + testsuite/tests/rts/T27123.hs - testsuite/tests/rts/all.T - testsuite/tests/simplCore/should_compile/T8832.hs - testsuite/tests/simplCore/should_compile/T8832.stdout - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Utils.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs - utils/haddock/haddock-api/src/Haddock/Types.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8faf48bac9140a764fb2bdb70866a0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8faf48bac9140a764fb2bdb70866a0… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T27296-stable-simpl] 61 commits: Hadrian: avoid response files when command line is short enough
by Simon Jakobi (＠sjakobi2) 23 Jun '26

23 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/T27296-stable-simpl at Glasgow Haskell Compiler / GHC Commits: 498bb21a by David Eichmann at 2026-06-09T18:02:39-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 - - - - - 87f510a5 by Simon Hengel at 2026-06-09T18:03:25-04:00 Don't use non-breaking spaces - - - - - 41a19379 by David Eichmann at 2026-06-09T18:04:11-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. - - - - - ce01ccb6 by sheaf at 2026-06-10T05:08:48-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 ------------------------- - - - - - d311c4f1 by Simon Jakobi at 2026-06-10T05:09:32-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> - - - - - 333df444 by sheaf at 2026-06-10T05:10:25-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 - - - - - 98c20394 by sheaf at 2026-06-10T05:11:09-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. - - - - - 5ac9ce7d by Zubin Duggal at 2026-06-10T21:26:32+05:30 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 - - - - - c9015f09 by sheaf at 2026-06-11T12:40:28-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 - - - - - 7ab90288 by Rodrigo Mesquita at 2026-06-11T12:41:11-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. - - - - - 8965cb76 by Marc Scholten at 2026-06-12T04:53:22-04:00 haddock: render modules concurrently - - - - - 8cc0b64a by Duncan Coutts at 2026-06-12T04:54:06-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). - - - - - cce574ed by Duncan Coutts at 2026-06-12T04:54:06-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. - - - - - 1f28d1f6 by Duncan Coutts at 2026-06-12T04:54:06-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. - - - - - 0ff29782 by Duncan Coutts at 2026-06-12T04:54:06-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(). - - - - - 7a688395 by Duncan Coutts at 2026-06-12T04:54:07-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. - - - - - 341ed474 by Duncan Coutts at 2026-06-12T04:54:07-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! - - - - - 674858e3 by Duncan Coutts at 2026-06-12T04:54:07-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. - - - - - 40764930 by sheaf at 2026-06-12T14:54:43-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). - - - - - 0f3d0a71 by Zubin Duggal at 2026-06-12T14:55:30-04:00 compiler: mark tool messages as errors/warnings depending on the exit code Fixes #27370 - - - - - d9ea2d76 by mangoiv at 2026-06-13T04:41:51-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 - - - - - 6ebaaba3 by David Eichmann at 2026-06-13T04:42:37-04:00 ghc-toolchain: don't throw when candidate executables are not found Fixes #27369 - - - - - 6c65e1e1 by David Eichmann at 2026-06-13T04:43:23-04:00 CI: lint-changelog checks for no-changelog label in script instead of rules - - - - - bab37cc6 by konsumlamm at 2026-06-13T19:10:21+02:00 Implement CLC proposal #378 Add `Data.Double` and `Data.Float` modules Document that GHC uses IEEE 754 - - - - - fb5246ad by fendor at 2026-06-15T18:07:23-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`. - - - - - 291ce3aa by ARATA Mizuki at 2026-06-15T18:08:26-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 - - - - - 011be91f by ARATA Mizuki at 2026-06-15T18:08:26-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 - - - - - e8a54713 by ARATA Mizuki at 2026-06-15T18:08:26-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 - - - - - 9438bec7 by Zubin Duggal at 2026-06-15T18:09:11-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 - - - - - 893e6133 by Andrew Lelechenko at 2026-06-15T23:55:36+01:00 base: more NonEmpty zips CLC proposal: https://github.com/haskell/core-libraries-committee/issues/409 - - - - - 1314f2fd by David Eichmann at 2026-06-16T05:46:52-04:00 Hadrian: fix ghc-internal .def file name - - - - - 7f72bcb3 by mangoiv at 2026-06-16T05:47:39-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. - - - - - 842bef9f by Alan Zimmerman at 2026-06-16T05:48:25-04:00 EPA: Use standard type family declaration for Anno - - - - - f6d30767 by Wolfgang Jeltsch at 2026-06-16T15:32:34-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. - - - - - a3fa10e0 by Christian Georgii at 2026-06-16T15:33:26-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 - - - - - d216412b by Ian-Woo Kim at 2026-06-16T20:25:57-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> - - - - - 8e1cc105 by Wolfgang Jeltsch at 2026-06-16T20:25:57-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. - - - - - 636c1c7a by Ian Duncan at 2026-06-16T20:26:50-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 - - - - - b734c75d by Igor Ranieri at 2026-06-16T20:27:32-04:00 haddock: Update CONTRIBUTING with missing step, add missing test dependency - - - - - 7fe4f2ec by Luite Stegeman at 2026-06-17T05:35:09-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 - - - - - 4671c126 by Sebastian Graf at 2026-06-17T05:35:55-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. - - - - - 67d41299 by Sebastian Graf at 2026-06-18T05:18:24-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 - - - - - fa5defde by Rodrigo Mesquita at 2026-06-18T05:19:11-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`. - - - - - 4efb4a66 by Alan Zimmerman at 2026-06-18T14:41:14-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 - - - - - c8d27dd4 by Simon Jakobi at 2026-06-18T14:41:59-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> - - - - - 09326ca6 by Matthew Pickering at 2026-06-20T23:41:12+02:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - 521e55bf by Matthew Pickering at 2026-06-20T23:41:13+02:00 hadrian: Fill in more of the default.host toolchain file When you are building a cross compiler this file will be used to build stage1 and it's libraries, so we need enough information here to work accurately. There is still more work to be done (see for example, word size is still fixed). - - - - - 23c9b6c3 by Matthew Pickering at 2026-06-20T23:42:52+02:00 hadrian: Build stage 2 cross compilers * Most of hadrian is abstracted over the stage in order to remove the assumption that the target of all stages is the same platform. This allows the RTS to be built for two different targets for example. * Abstracts the bindist creation logic to allow building either normal or cross bindists. Normal bindists use stage 1 libraries and a stage 2 compiler. Cross bindists use stage 2 libararies and a stage 2 compiler. * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 New hadrian target: * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler = stage 1, libraries = stage 2) This commit also contains various changes to make stage2 compilers feasible. ------------------------- Metric Decrease: LinkableUsage02 ManyAlternatives ManyConstructors MultiComponentModulesRecomp MultiLayerModulesRecomp RecordUpdPerf T10421 T12150 T12227 T12425 T12707 T13035 T13379 T13820 T15703 T16577 T18140 T18282 T18698a T18698b T18923 T1969 T20049 T21839c T3294 T4801 T5030 T5321FD T5321Fun T5631 T5642 T6048 T783 T9020 T9198 T9233 T9630 T9872d T9961 parsing001 T3064 Metric Increase: T26989 hard_hole_fits ------------------------- Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> - - - - - 26fed8ab by Matthew Pickering at 2026-06-20T23:42:52+02:00 ci: Test cross bindists We remove the special logic for testing in-tree cross compilers and instead test cross compiler bindists, like we do for all other platforms. - - - - - 80c8910e by Matthew Pickering at 2026-06-20T23:42:52+02:00 ci: Introduce CROSS_STAGE variable In preparation for building and testing stage3 bindists we introduce the CROSS_STAGE variable which is used by a CI job to determine what kind of bindist the CI job should produce. At the moment we are only using CROSS_STAGE=2 but in the future we will have some jobs which set CROSS_STAGE=3 to produce native bindists for a target, but produced by a cross compiler, which can be tested on by another CI job on the native platform. CROSS_STAGE=2: Build a normal cross compiler bindist CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target - - - - - 8215573d by Sven Tennie at 2026-06-20T23:42:52+02:00 ci: Increase timeout for emulators Test runs with emulators naturally take longer than on native machines. Generate jobs.yml - - - - - 5acb7dbc by Matthew Pickering at 2026-06-20T23:42:52+02:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. - - - - - 48345343 by Sven Tennie at 2026-06-20T23:42:52+02:00 Javascript skip T23697 See #22355 about how HSC2HS and the Javascript target don't play well together. - - - - - 5e44fd05 by Sven Tennie at 2026-06-20T23:42:52+02:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - ab349ec2 by Sven Tennie at 2026-06-20T23:42:52+02:00 Fix T22744 for GHCJS In fact, this test needs Template Haskell, not necessarily an interpreter. - - - - - c73352d8 by Sven Tennie at 2026-06-20T23:42:52+02:00 haddock-test: fix GHCJS haddock test failures Add --ghc-pkg-path flag support so haddock test runner can find cross-prefixed ghc-pkg (e.g. javascript-unknown-ghcjs-ghc-pkg) which is not on $PATH in cross install directories. Skip haddockHtmlTest on GHCJS: Threaded.hs uses forkOS in a TH splice, which GHCJS RTS doesn't support. Mark with js_skip in all.T. - - - - - 5e814e76 by Andreas Klebinger at 2026-06-22T23:00:24-04:00 compiler: Deduplicate hscTidy This function was accidentally duplicated during a refactor. Fixes #27351 - - - - - 473b97eb by sheaf at 2026-06-22T23:01:22-04:00 Avoid mkTick in Core Prep breaking ANF (part II) Hotfix for 2f9579765f55b3920ceb2e04995ff41a9d0e2d4e fixing a small oversight in the call to tickTickedExpr from mkTick, in which we improperly recursively called mkTick without passing on the preserve_anf flag. Fixes #27386 - - - - - 9284a1f7 by Simon Hengel at 2026-06-23T05:55:33-04:00 Don't use global variables to address concurrency bugs! (fixes #27234) This was originally introduce with 88f38b03025386f0f1e8f5861eed67d80495168a to address #17922. In this specific case a better fix would have been to synchronize on stderr: withHandle_ "stderrSupportsAnsiColors" stderr $ \ _ -> do ... But apparently the dependency on `terminfo` was removed in 32ab07bf3d6ce45e8ea5b55e8095174a6b42a7f0, preventing #17922 in the first place. - - - - - 44309cd3 by Alan Zimmerman at 2026-06-23T05:56:20-04:00 EPA: remove LocatedL / SrcSpanAnnL and LocatedLI / SrcSpanAnnLI This is part of a refactor towards only having LocatedA / SrcSpanAnnA It removes the stated items, but has to add back one for BooleanFormula, LocatedBF / SrcSpanAnnBF This commit also use the HsConDetails RecCon extension point to capture the braces in a record constructor - - - - - 2f6a5534 by Simon Jakobi at 2026-06-23T15:46:20+02:00 Add -dstable-core-dump-order for stable Core dump ordering (#27296) The order of top-level bindings in Core dumps (-ddump-simpl etc.) is the compiler's Unique-sensitive internal processing order, so an unrelated upstream change can reorder them and defeat a textual diff of two dumps. This adds an opt-in flag -dstable-core-dump-order that reorders the top-level bindings of dumps routed through dumpPassResult into a stable, Unique-independent order, so two dumps line up across rebuilds. See Note [Stable Core dump order] in GHC.Core.Ppr for the sort key and its rationale. Adds tests T27296 (binders GHC emits in non-source order by default, asserted to come out stably ordered under the flag) and T27296b (an untidied -ddump-float-out dump pinning the ordering of the anonymous lvl floats by literal value). Co-Authored-By: Claude Opus 4.8 <noreply(a)anthropic.com> - - - - - 334 changed files: - .gitlab-ci.yml - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - + 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/T27386 - + 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/stable-core-dump-order-27296 - + changelog.d/stage2-cross-compilers - + 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/RV64/CodeGen.hs - compiler/GHC/CmmToAsm/RV64/Instr.hs - compiler/GHC/CmmToAsm/RV64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/Regs.hs - compiler/GHC/Core/Lint.hs - compiler/GHC/Core/Opt/Arity.hs - compiler/GHC/Core/Opt/Simplify.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/Type.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Data/BooleanFormula.hs - compiler/GHC/Data/List/NonEmpty.hs - compiler/GHC/Driver/Backend.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main/Interactive.hs - compiler/GHC/Driver/Main/Passes.hs - compiler/GHC/Driver/Main/Passes.hs-boot - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/ImpExp.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Pat.hs - compiler/GHC/Hs/Stats.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/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.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/SysTools/Terminal.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Module.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/Utils/Backpack.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/Module/Deps.hs - compiler/GHC/Unit/State.hs - compiler/GHC/Unit/Types.hs - compiler/GHC/Utils/Logger.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/ImpExp.hs - compiler/Language/Haskell/Syntax/Pat.hs - compiler/Language/Haskell/Syntax/Type.hs - configure.ac - distrib/configure.ac.in - docs/users_guide/bugs.rst - docs/users_guide/debugging.rst - docs/users_guide/using.rst - ghc/GHCi/UI.hs - hadrian/README.md - hadrian/bindist/config.mk.in - hadrian/build-cabal - hadrian/cfg/default.host.target.in - + hadrian/cfg/system.config.host.in - hadrian/cfg/system.config.in - + hadrian/cfg/system.config.target.in - hadrian/hadrian.cabal - hadrian/src/Base.hs - + hadrian/src/BindistConfig.hs - hadrian/src/Builder.hs - hadrian/src/CommandLine.hs - hadrian/src/Context.hs - hadrian/src/Expression.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Builder/Ar.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Hadrian/Oracles/TextFile.hs - hadrian/src/Hadrian/Utilities.hs - hadrian/src/Main.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Flavour.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Changelog.hs - hadrian/src/Rules/Compile.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/Configure.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - hadrian/src/Settings/Warnings.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/base/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Lexeme.hs - libraries/process - m4/fp_find_nm.m4 - m4/prep_target_file.m4 - 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/testlib.py - testsuite/ghc-config/ghc-config.hs - + 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/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/ghc-e/should_fail/all.T - testsuite/tests/ghci.debugger/scripts/all.T - testsuite/tests/haddock/haddock_testsuite/Makefile - testsuite/tests/haddock/haddock_testsuite/all.T - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/javascript/closure/all.T - testsuite/tests/module/mod185.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - + testsuite/tests/perf/compiler/T26426.hs - testsuite/tests/perf/compiler/all.T - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test10309.hs - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - + testsuite/tests/profiling/should_compile/T27386.hs - testsuite/tests/profiling/should_compile/all.T - + 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/Makefile - + testsuite/tests/simplCore/should_compile/T27296.hs - + testsuite/tests/simplCore/should_compile/T27296.stdout - + testsuite/tests/simplCore/should_compile/T27296b.hs - + testsuite/tests/simplCore/should_compile/T27296b.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/Utils.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/LexParseRn.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/haddock-test/src/Test/Haddock/Config.hs - 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/41be6868005524a03887baae612d55… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/41be6868005524a03887baae612d55… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/fix-26953] The fix for test cases:
by recursion-ninja (＠recursion-ninja) 23 Jun '26

23 Jun '26

recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC Commits: 5374601f by Recursion Ninja at 2026-06-23T09:30:08-04:00 The fix for test cases: - Ppr035 - Ppr036 - Ppr048 - parsed Correcting WARNING/DEPRECATED/SCC pragma round-tripping - - - - - 5 changed files: - compiler/GHC/Hs/Lit.hs - compiler/GHC/Parser.y - compiler/GHC/Unit/Module/Warnings.hs - libraries/process - utils/check-exact/ExactPrint.hs Changes: ===================================== compiler/GHC/Hs/Lit.hs ===================================== @@ -504,7 +504,7 @@ instance Outputable (FractionalLit (GhcPass p)) where rat = fl_signi * (base ^^ fl_exp) in pprWithSourceText fl_text $ rational rat --- The 'Show[ instance is required for the derived +-- The 'Show' instance is required for the derived -- 'GHC.Parser.Lexer.Token' instance when DEBUG is enabled. instance Show (FractionalLit (GhcPass p)) where show (FL{..}) = unwords @@ -677,6 +677,10 @@ instance Eq (StringLiteral (GhcPass p)) where instance Outputable (StringLiteral (GhcPass p)) where ppr (StringLiteral{..}) = pprWithSourceText sl_src (doubleQuotes $ ftext sl_fs) +-- The 'Show' instance is required the 'parsed' test case of GHC's test-suite. +instance Show (StringLiteral (GhcPass p)) where + show (StringLiteral srcTxt litFS) = unwords [ show srcTxt, show litFS ] + -- | Get the 'SourceText' of a 'StringLiteral' {-# INLINE stringLitSourceText #-} stringLitSourceText :: StringLiteral (GhcPass p) -> SourceText ===================================== compiler/GHC/Parser.y ===================================== @@ -2074,10 +2074,10 @@ to varid (used for rule_vars), 'checkRuleTyVarBndrNames' must be updated. maybe_warning_pragma :: { Maybe (LWarningTxt GhcPs) } : '{-# DEPRECATED' strings '#-}' - {% fmap Just $ amsr (sLL $1 $> $ DeprecatedTxt (getDEPRECATED_PRAGs $1) (map stringLiteralToHsDocWst $ snd $ unLoc $2)) + {% fmap Just $ amsr (sLL $1 $> $ DeprecatedTxt (getDEPRECATED_PRAGs $1) (snd $ unLoc $2)) (AnnPragma (glR $1) (epTok $3) (fst $ unLoc $2) noAnn noAnn noAnn noAnn) } | '{-# WARNING' warning_category strings '#-}' - {% fmap Just $ amsr (sLL $1 $> $ WarningTxt (getWARNING_PRAGs $1) $2 (map stringLiteralToHsDocWst $ snd $ unLoc $3)) + {% fmap Just $ amsr (sLL $1 $> $ WarningTxt (getWARNING_PRAGs $1) $2 (snd $ unLoc $3)) (AnnPragma (glR $1) (epTok $4) (fst $ unLoc $3) noAnn noAnn noAnn noAnn)} | {- empty -} { Nothing } @@ -2107,7 +2107,7 @@ warning :: { OrdList (LWarnDecl GhcPs) } : warning_category namespace_spec namelist strings {% fmap unitOL $ amsA' (L (comb4 $1 $2 $3 $4) (Warning (fst $ unLoc $4) (unLoc $2) (unLoc $3) - (WarningTxt NoSourceText $1 (map stringLiteralToHsDocWst $ snd $ unLoc $4)))) } + (WarningTxt NoSourceText $1 (snd $ unLoc $4)))) } namespace_spec :: { Located (NamespaceSpecifier GhcPs) } : 'type' { sL1 $1 $ TypeNamespaceSpecifier (epTok $1) } @@ -2135,24 +2135,24 @@ deprecations :: { OrdList (LWarnDecl GhcPs) } deprecation :: { OrdList (LWarnDecl GhcPs) } : namespace_spec namelist strings {% fmap unitOL $ amsA' (sL (comb3 $1 $2 $>) $ (Warning (fst $ unLoc $3) (unLoc $1) (unLoc $2) - (DeprecatedTxt NoSourceText $ map stringLiteralToHsDocWst $ snd $ unLoc $3))) } + (DeprecatedTxt NoSourceText $ snd $ unLoc $3))) } -strings :: { Located ((EpToken "[", EpToken "]"),[Located (StringLiteral GhcPs)]) } - : STRING { sL1 $1 (noAnn,[L (gl $1) (getStringLiteral $1)]) } +strings :: { Located ((EpToken "[", EpToken "]"), [LocatedA (WithHsDocIdentifiers (StringLiteral GhcPs) GhcPs)]) } + : STRING { sL1 $1 (noAnn,[stringLiteralToHsDocWst (L (gl $1) (getStringLiteral $1))]) } | '[' stringlist ']' { sLL $1 $> $ ((epTok $1,epTok $3),fromOL (unLoc $2)) } -stringlist :: { Located (OrdList (Located (StringLiteral GhcPs))) } +stringlist :: { Located (OrdList (LocatedA (WithHsDocIdentifiers (StringLiteral GhcPs) GhcPs))) } : stringlist ',' STRING {% if isNilOL (unLoc $1) then return (sLL $1 $> (unLoc $1 `snocOL` - (L (gl $3) (getStringLiteral $3)))) + (stringLiteralToHsDocWst (L (gl $3) (getStringLiteral $3))))) else case (unLoc $1) of SnocOL hs t -> do - let { t' = addTrailingCommaS t (glR $2) } + t' <- addTrailingCommaA t (epTok $2) return (sLL $1 $> (snocOL hs t' `snocOL` - (L (gl $3) (getStringLiteral $3)))) + (stringLiteralToHsDocWst (L (gl $3) (getStringLiteral $3))))) } - | STRING { sLL $1 $> (unitOL (L (gl $1) (getStringLiteral $1))) } + | STRING { sLL $1 $> (unitOL (stringLiteralToHsDocWst (L (gl $1) (getStringLiteral $1)))) } | {- empty -} { noLoc nilOL } ----------------------------------------------------------------------------- @@ -4374,7 +4374,7 @@ getSCC lt = do let s = getSTRING lt then addFatalError $ mkPlainErrorMsgEnvelope (getLoc lt) $ PsErrSpaceInSCC else return s -stringLiteralToHsDocWst :: Located (StringLiteral GhcPs) -> LocatedE (WithHsDocIdentifiers (StringLiteral GhcPs) GhcPs) +stringLiteralToHsDocWst :: Located (StringLiteral GhcPs) -> LocatedA (WithHsDocIdentifiers (StringLiteral GhcPs) GhcPs) stringLiteralToHsDocWst sl = reLoc $ lexStringLiteral parseIdentifier sl -- Utilities for combining source spans @@ -4802,9 +4802,6 @@ addTrailingCommaN (L anns a) span = do else addTrailingCommaToN anns (srcSpan2e span) return (L anns' a) -addTrailingCommaS :: Located (StringLiteral GhcPs) -> EpaLocation -> Located (StringLiteral GhcPs) -addTrailingCommaS (L l sl) span = L (widenSpanL l [span]) sl - -- ------------------------------------- addTrailingDarrowC :: LocatedC a -> Located Token -> EpAnnComments -> LocatedC a ===================================== compiler/GHC/Unit/Module/Warnings.hs ===================================== @@ -139,7 +139,7 @@ warningTxtCategory _ = defaultWarningCategory -- | The message that the WarningTxt was specified to output warningTxtMessage :: WarningTxt (GhcPass p) -> - [LocatedE (WithHsDocIdentifiers (StringLiteral (GhcPass p)) (GhcPass p))] + [LocatedA (WithHsDocIdentifiers (StringLiteral (GhcPass p)) (GhcPass p))] warningTxtMessage (WarningTxt _ _ m) = m warningTxtMessage (DeprecatedTxt _ m) = m @@ -165,7 +165,7 @@ type instance XXWarningTxt (GhcPass _) = DataConCantHappen type instance XInWarningCategory (GhcPass _) = (EpToken "in", SourceText) type instance XXInWarningCategory (GhcPass _) = DataConCantHappen -type instance Anno (WithHsDocIdentifiers (StringLiteral pass) pass) = EpaLocation +type instance Anno (WithHsDocIdentifiers (StringLiteral pass) pass) = SrcSpanAnnA type instance Anno (InWarningCategory (GhcPass pass)) = EpaLocation type instance Anno (WarningCategory) = EpaLocation type instance Anno (WarningTxt (GhcPass pass)) = SrcSpanAnnP @@ -203,7 +203,7 @@ instance Outputable (WarningTxt (GhcPass pass)) where NoSourceText -> pp_ws ds SourceText src -> ftext src <+> pp_ws ds <+> text "#-}" -pp_ws :: [LocatedE (WithHsDocIdentifiers (StringLiteral (GhcPass p)) (GhcPass p))] -> SDoc +pp_ws :: [LocatedA (WithHsDocIdentifiers (StringLiteral (GhcPass p)) (GhcPass p))] -> SDoc pp_ws [l] = ppr $ unLoc l pp_ws ws = text "[" ===================================== libraries/process ===================================== @@ -1 +1 @@ -Subproject commit 11fd247ad33208da7a914acf15d4a09d64a6a4c4 +Subproject commit 92deb52c1781bf10ad390296dbc435abe103bfe4 ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -1962,8 +1962,7 @@ instance Typeable p => ExactPrint (StringLiteral (GhcPass p)) where printSourceTextAA srcTxt (show (unpackFS fstStr)) return (StringLiteral srcTxt fstStr) -{- -instance ExactPrint (LocatedN (StringLiteral (GhcPass p))) where +instance Typeable p => ExactPrint (LocatedN (StringLiteral (GhcPass p))) where getAnnotationEntry (L sann _) = fromAnn sann setAnnotationAnchor = setAnchorAn @@ -1971,7 +1970,7 @@ instance ExactPrint (LocatedN (StringLiteral (GhcPass p))) where ann' <- case ann of NameAnn a l t -> do - mn <- markName a (Just (l,n)) + mn <- markName a (Just (l, mkVarUnqual (sl_fs n))) case mn of (a', (Just (l',_n))) -> do return (NameAnn a' l' t) @@ -2000,10 +1999,10 @@ instance ExactPrint (LocatedN (StringLiteral (GhcPass p))) where (L name' _) <- markAnnotated (L name n) return (NameAnnQuote q' name' t) NameAnnTrailing t -> do - _anc' <- printUnicode anc n + let str = sourceTextToString (stringLitSourceText n) (show (unpackFS (sl_fs n))) + _ <- printStringAtAAC NoCaptureComments (EpaDelta (getHasLoc anc) (SameLine 0) []) str return (NameAnnTrailing t) return (L (EpAnn anc ann' cs) n) --} -- --------------------------------------------------------------------- @@ -2717,11 +2716,7 @@ instance ExactPrint (Sig GhcPs) where exact (SCCFunSig ((o,c),src) ln ml) = do o' <- markAnnOpen'' o src "{-# SCC" ln' <- markAnnotated ln - ml' <- case ml of - Nothing -> return Nothing - Just (L loc sl) -> do - L loc' _ <- markAnnotated (L loc (mkVarUnqual (sl_fs sl))) - return . Just $ L loc' sl + ml' <- markAnnotated ml c' <- markEpToken c return (SCCFunSig ((o',c'),src) ln' ml') View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5374601f0ac20d33fc8d40a2bdf850c… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5374601f0ac20d33fc8d40a2bdf850c… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mangoiv/26616] compiler: refactor error reporting code for ExplicitLevelImports
by Magnus (＠MangoIV) 23 Jun '26

23 Jun '26

Magnus pushed to branch wip/mangoiv/26616 at Glasgow Haskell Compiler / GHC Commits: de491d7f by mangoiv at 2026-06-23T14:35:23+02:00 compiler: refactor error reporting code for ExplicitLevelImports Refactors error reporting code for ExplicitLevelImports to pass in a RdrName and a GlobalReaderElt to be able to report errors that are faithful to the source and to more precisely distinguish between names that are in scope from different qualifications. Fixes #27385 and #26616 - - - - - 64 changed files: - + changelog.d/26616 - compiler/GHC/Hs/Expr.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Rename/Splice.hs-boot - compiler/GHC/Rename/Unbound.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Errors/Types.hs - compiler/GHC/Tc/Gen/Export.hs - compiler/GHC/Tc/Utils/Env.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Types/Name/Reader.hs - testsuite/tests/annotations/should_fail/annfail03.stderr - testsuite/tests/annotations/should_fail/annfail04.stderr - testsuite/tests/annotations/should_fail/annfail06.stderr - testsuite/tests/annotations/should_fail/annfail09.stderr - testsuite/tests/quasiquotation/qq001/qq001.stderr - testsuite/tests/quasiquotation/qq002/qq002.stderr - testsuite/tests/quasiquotation/qq003/qq003.stderr - testsuite/tests/quasiquotation/qq004/qq004.stderr - testsuite/tests/quotes/LiftErrMsg.stderr - testsuite/tests/quotes/LiftErrMsgDefer.stderr - testsuite/tests/quotes/LiftErrMsgTyped.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/T5721.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/splice-imports/SI03.stderr - testsuite/tests/splice-imports/SI05.stderr - testsuite/tests/splice-imports/SI08.stderr - testsuite/tests/splice-imports/SI08_oneshot.stderr - testsuite/tests/splice-imports/SI16.stderr - testsuite/tests/splice-imports/SI18.stderr - testsuite/tests/splice-imports/SI20.stderr - testsuite/tests/splice-imports/SI25.stderr - testsuite/tests/splice-imports/SI28.stderr - testsuite/tests/splice-imports/SI29.stderr - testsuite/tests/splice-imports/SI31.stderr - testsuite/tests/splice-imports/SI36.stderr - testsuite/tests/splice-imports/T26088.stderr - testsuite/tests/splice-imports/T26090.stderr - + testsuite/tests/splice-imports/T26616.hs - + testsuite/tests/splice-imports/T26616.stderr - testsuite/tests/splice-imports/all.T - testsuite/tests/th/T16976z.stderr - testsuite/tests/th/T17820a.stderr - testsuite/tests/th/T17820b.stderr - testsuite/tests/th/T17820c.stderr - testsuite/tests/th/T17820d.stderr - testsuite/tests/th/T17820e.stderr - testsuite/tests/th/T21547.stderr - testsuite/tests/th/T23829_hasty.stderr - testsuite/tests/th/T23829_hasty_b.stderr - testsuite/tests/th/T23829_tardy.ghc.stderr - testsuite/tests/th/T26098_local.stderr - testsuite/tests/th/T26098_quote.stderr - testsuite/tests/th/T26098_splice.stderr - testsuite/tests/th/T26099.stderr - testsuite/tests/th/T26568.stderr - testsuite/tests/th/T5795.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/de491d7f5d68d24c2c0c29991b0aeea… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/de491d7f5d68d24c2c0c29991b0aeea… You're receiving this email because of your account on gitlab.haskell.org.

1 0