October 2025 - ghc-commits

[Git][ghc/ghc] Pushed new branch wip/torsten.schmits/mercury-fixed
by Torsten Schmits (＠torsten.schmits) 22 Oct '25

22 Oct '25

Torsten Schmits pushed new branch wip/torsten.schmits/mercury-fixed at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/torsten.schmits/mercury-fixed You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/bchinn-argparse-filetype] 19 commits: Add submodules for template-haskell-lift and template-haskell-quasiquoter
by Brandon Chinn (＠brandonchinn178) 22 Oct '25

22 Oct '25

Brandon Chinn pushed to branch wip/bchinn-argparse-filetype at Glasgow Haskell Compiler / GHC Commits: 4be32153 by Teo Camarasu at 2025-10-15T08:06:09-04:00 Add submodules for template-haskell-lift and template-haskell-quasiquoter These two new boot libraries expose stable subsets of the template-haskell interface. This is an implemenation of the GHC proposal https://github.com/ghc-proposals/ghc-proposals/pull/696 Work towards #25262 - - - - - 0c00c9c3 by Ben Gamari at 2025-10-15T08:06:51-04:00 rts: Eliminate uses of implicit constant arrays Folding of `const`-sized variable-length arrays to a constant-length array is a gnu extension which clang complains about. Closes #26502. - - - - - bf902a1d by Fendor at 2025-10-15T16:00:59-04:00 Refactor distinct constructor tables map construction Adds `GHC.Types.Unique.FM.alterUFM_L`, `GHC.Types.Unique.DFM.alterUDFM_L` `GHC.Data.Word64Map.alterLookup` to support fusion of distinct constructor data insertion and lookup during the construction of the `DataCon` map in `GHC.Stg.Debug.numberDataCon`. Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - b3585ba1 by Fendor at 2025-10-15T16:00:59-04:00 Allow per constructor refinement of distinct-constructor-tables Introduce `-fno-distinct-constructor-tables`. A distinct constructor table configuration is built from the combination of flags given, in order. For example, to only generate distinct constructor tables for a few specific constructors and no others, just pass `-fdistinct-constructor-tables-only=C1,...,CN`. This flag can be supplied multiple times to extend the set of constructors to generate a distinct info table for. You can disable generation of distinct constructor tables for all configurations by passing `-fno-distinct-constructor-tables`. The various configurations of these flags is included in the `DynFlags` fingerprints, which should result in the expected recompilation logic. Adds a test that checks for distinct tables for various given or omitted constructors. Updates CountDepsAst and CountDepsParser tests to account for new dependencies. Fixes #23703 Co-authored-by: Fendor <fendor(a)posteo.de> Co-authored-by: Finley McIlwaine <finleymcilwaine(a)gmail.com> - - - - - e17dc695 by fendor at 2025-10-15T16:01:41-04:00 Fix typos in haddock documentation for stack annotation API - - - - - f85058d3 by Zubin Duggal at 2025-10-17T13:50:52+05:30 compiler: Attempt to systematize Unique tags by introducing an ADT for each different tag Fixes #26264 Metric Decrease: T9233 - - - - - c85c845d by sheaf at 2025-10-17T22:35:32-04:00 Don't prematurely final-zonk PatSyn declarations This commit makes GHC hold off on the final zonk for pattern synonym declarations, in 'GHC.Tc.TyCl.PatSyn.tc_patsyn_finish'. This accommodates the fact that pattern synonym declarations without a type signature can contain unfilled metavariables, e.g. if the RHS of the pattern synonym involves view-patterns whose type mentions promoted (level 0) metavariables. Just like we do for ordinary function bindings, we should allow these metavariables to be settled later, instead of eagerly performing a final zonk-to-type. Now, the final zonking-to-type for pattern synonyms is performed in GHC.Tc.Module.zonkTcGblEnv. Fixes #26465 - - - - - ba3e5bdd by Rodrigo Mesquita at 2025-10-18T16:57:18-04:00 Move code-gen aux symbols from ghc-internal to rts These symbols were all previously defined in ghc-internal and made the dependency structure awkward, where the rts may refer to some of these symbols and had to work around that circular dependency the way described in #26166. Moreover, the code generator will produce code that uses these symbols! Therefore, they should be available in the rts: PRINCIPLE: If the code generator may produce code which uses this symbol, then it should be defined in the rts rather than, say, ghc-internal. That said, the main motivation is towards fixing #26166. Towards #26166. Pre-requisite of !14892 - - - - - f31de2a9 by Ben Gamari at 2025-10-18T16:57:18-04:00 rts: Avoid static symbol references to ghc-internal This resolves #26166, a bug due to new constraints placed by Apple's linker on undefined references. One source of such references in the RTS is the many symbols referenced in ghc-internal. To mitigate #26166, we make these references dynamic, as described in Note [RTS/ghc-internal interface]. Fixes #26166 Co-authored-by: Rodrigo Mesquita <rodrigo.m.mesquita(a)gmail.com> Co-authored-by: Cheng Shao <terrorjack(a)type.dance> - - - - - 43fdfddc by Ben Gamari at 2025-10-18T16:57:18-04:00 compiler: Rename isMathFun -> isLibcFun This set includes more than just math functions. - - - - - 4ed5138f by Ben Gamari at 2025-10-18T16:57:18-04:00 compiler: Add libc allocator functions to libc_funs Prototypes for these are now visible from `Prim.h`, resulting in multiple-declaration warnings in the unregisterised job. - - - - - 9a0a076b by Ben Gamari at 2025-10-18T16:57:18-04:00 rts: Minimize header dependencies of Prim.h Otherwise we will end up with redundant and incompatible declarations resulting in warnings during the unregisterised build. - - - - - 26b8a414 by Diego Antonio Rosario Palomino at 2025-10-18T16:58:10-04:00 Cmm Parser: Fix incorrect example in comment The Parser.y file contains a comment with an incorrect example of textual Cmm (used in .cmm files). This commit updates the comment to ensure it reflects valid textual Cmm syntax. Fixes #26313 - - - - - d4a9d6d6 by ARATA Mizuki at 2025-10-19T18:43:47+09:00 Handle implications between x86 feature flags This includes: * Multiple -msse* options can be specified * -mavx implies -msse4.2 * -mavx2 implies -mavx * -mfma implies -mavx * -mavx512f implies -mavx2 and -mfma * -mavx512{cd,er,pf} imply -mavx512f Closes #24989 Co-authored-by: sheaf <sam.derbyshire(a)gmail.com> - - - - - c9b8465c by Cheng Shao at 2025-10-20T10:16:00-04:00 wasm: workaround WebKit bug in dyld This patch works around a WebKit bug and allows dyld to run on WebKit based platforms as well. See added note for detailed explanation. Co-authored-by: Codex <codex(a)openai.com> - - - - - 91b6be10 by Julian Ospald at 2025-10-20T18:21:03-04:00 Improve error handling in 'getPackageArchives' When the library dirs in the package conf files are not set up correctly, the JS linker will happily ignore such packages and not link against them, although they're part of the link plan. Fixes #26383 - - - - - 6c5269da by Sven Tennie at 2025-10-20T18:21:44-04:00 Align coding style Improve readability by using the same style for all constructor calls in this function. - - - - - 3d305889 by Sven Tennie at 2025-10-20T18:21:44-04:00 Reduce complexity by removing joins with mempty ldArgs, cArgs and cppArgs are all `mempty`. Thus concatenating them adds nothing but some complexity while reading the code. - - - - - 472af3e0 by Brandon Chinn at 2025-10-21T21:08:57-07:00 Replace deprecated argparse.FileType - - - - - 175 changed files: - .gitmodules - compiler/GHC/Builtin/Uniques.hs - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/Cmm/Info.hs - compiler/GHC/Cmm/Info/Build.hs - compiler/GHC/Cmm/Parser.y - compiler/GHC/Cmm/Pipeline.hs - compiler/GHC/Cmm/UniqueRenamer.hs - compiler/GHC/CmmToAsm/Config.hs - compiler/GHC/CmmToAsm/Wasm/FromCmm.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToAsm/X86/Instr.hs - compiler/GHC/CmmToC.hs - compiler/GHC/CmmToLlvm/Base.hs - compiler/GHC/Core/Make.hs - compiler/GHC/Core/Opt/Monad.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Simplify/Monad.hs - compiler/GHC/Core/PatSyn.hs - compiler/GHC/CoreToStg/Prep.hs - compiler/GHC/Data/Word64Map/Internal.hs - compiler/GHC/Data/Word64Map/Lazy.hs - compiler/GHC/Driver/CodeOutput.hs - compiler/GHC/Driver/Config/CmmToAsm.hs - compiler/GHC/Driver/Config/Stg/Debug.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Iface/Binary.hs - compiler/GHC/Iface/Flags.hs - compiler/GHC/Iface/Recomp/Flags.hs - compiler/GHC/Iface/Rename.hs - compiler/GHC/JS/JStg/Monad.hs - compiler/GHC/Linker/Dynamic.hs - compiler/GHC/Linker/Static.hs - compiler/GHC/Platform.hs - compiler/GHC/Platform/Reg.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Stg/Debug.hs - + compiler/GHC/Stg/Debug/Types.hs - compiler/GHC/Stg/EnforceEpt.hs - compiler/GHC/Stg/Pipeline.hs - compiler/GHC/StgToCmm/ExtCode.hs - compiler/GHC/StgToCmm/Monad.hs - compiler/GHC/StgToJS/CodeGen.hs - compiler/GHC/StgToJS/Ids.hs - compiler/GHC/StgToJS/Linker/Linker.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Types.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Zonk/Type.hs - compiler/GHC/Types/Name/Cache.hs - compiler/GHC/Types/Unique.hs - compiler/GHC/Types/Unique/DFM.hs - compiler/GHC/Types/Unique/DSM.hs - compiler/GHC/Types/Unique/FM.hs - compiler/GHC/Types/Unique/Supply.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/ghc.cabal.in - docs/users_guide/9.16.1-notes.rst - docs/users_guide/compare-flags.py - docs/users_guide/debug-info.rst - docs/users_guide/using.rst - hadrian/src/Packages.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Libffi.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Packages.hs - libraries/ghc-experimental/src/GHC/Stack/Annotation/Experimental.hs - + libraries/ghc-internal/cbits/RtsIface.c - libraries/ghc-internal/ghc-internal.cabal.in - + libraries/ghc-internal/include/RtsIfaceSymbols.h - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs - + libraries/template-haskell-lift - + libraries/template-haskell-quasiquoter - rts/BuiltinClosures.c - rts/CloneStack.h - rts/Compact.cmm - rts/ContinuationOps.cmm - rts/Exception.cmm - rts/Prelude.h - rts/PrimOps.cmm - rts/Printer.c - rts/RtsAPI.c - rts/RtsStartup.c - rts/RtsSymbols.c - + rts/RtsToHsIface.c - rts/StgStdThunks.cmm - rts/configure.ac - − rts/external-symbols.list.in - rts/gen_event_types.py - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - + rts/include/rts/RtsToHsIface.h - rts/include/rts/Types.h - rts/include/stg/Prim.h - rts/posix/OSMem.c - rts/posix/Signals.c - libraries/ghc-internal/cbits/atomic.c → rts/prim/atomic.c - libraries/ghc-internal/cbits/bitrev.c → rts/prim/bitrev.c - libraries/ghc-internal/cbits/bswap.c → rts/prim/bswap.c - libraries/ghc-internal/cbits/clz.c → rts/prim/clz.c - libraries/ghc-internal/cbits/ctz.c → rts/prim/ctz.c - libraries/ghc-internal/cbits/int64x2minmax.c → rts/prim/int64x2minmax.c - libraries/ghc-internal/cbits/longlong.c → rts/prim/longlong.c - libraries/ghc-internal/cbits/mulIntMayOflo.c → rts/prim/mulIntMayOflo.c - libraries/ghc-internal/cbits/pdep.c → rts/prim/pdep.c - libraries/ghc-internal/cbits/pext.c → rts/prim/pext.c - libraries/ghc-internal/cbits/popcnt.c → rts/prim/popcnt.c - libraries/ghc-internal/cbits/vectorQuotRem.c → rts/prim/vectorQuotRem.c - libraries/ghc-internal/cbits/word2float.c → rts/prim/word2float.c - − rts/rts.buildinfo.in - rts/rts.cabal - rts/wasm/JSFFI.c - rts/wasm/scheduler.cmm - rts/win32/libHSghc-internal.def - testsuite/driver/runtests.py - testsuite/tests/codeGen/should_gen_asm/all.T - + testsuite/tests/codeGen/should_gen_asm/mavx-should-enable-popcnt.asm - + testsuite/tests/codeGen/should_gen_asm/mavx-should-enable-popcnt.hs - + testsuite/tests/codeGen/should_gen_asm/msse-option-order.asm - + testsuite/tests/codeGen/should_gen_asm/msse-option-order.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/ghc-api/T26264.hs - + testsuite/tests/ghc-api/T26264.stdout - testsuite/tests/ghc-api/all.T - testsuite/tests/overloadedrecflds/should_compile/BootFldReexport.stderr - testsuite/tests/overloadedrecflds/should_fail/T16745.stderr - testsuite/tests/overloadedrecflds/should_fail/T18999_NoDisambiguateRecordFields.stderr - + testsuite/tests/patsyn/should_compile/T26465b.hs - + testsuite/tests/patsyn/should_compile/T26465c.hs - + testsuite/tests/patsyn/should_compile/T26465d.hs - + testsuite/tests/patsyn/should_compile/T26465d.stderr - testsuite/tests/patsyn/should_compile/all.T - + testsuite/tests/patsyn/should_fail/T26465.hs - + testsuite/tests/patsyn/should_fail/T26465.stderr - testsuite/tests/patsyn/should_fail/all.T - testsuite/tests/perf/should_run/UniqLoop.hs - testsuite/tests/regalloc/regalloc_unit_tests.hs - + testsuite/tests/rts/ipe/distinct-tables/Main.hs - + testsuite/tests/rts/ipe/distinct-tables/Makefile - + testsuite/tests/rts/ipe/distinct-tables/X.hs - + testsuite/tests/rts/ipe/distinct-tables/all.T - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables01.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables02.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables03.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables04.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables05.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables06.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables07.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables08.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables09.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables10.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables11.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables12.stdout - + testsuite/tests/rts/ipe/distinct-tables/distinct_tables13.stdout - testsuite/tests/simplCore/should_compile/rule2.stderr - testsuite/tests/th/T8761.stderr - utils/deriveConstants/Main.hs - 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/cc7d226d6ed46c62cdc9daae4182c8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/cc7d226d6ed46c62cdc9daae4182c8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26503] Implement QualifiedStrings (#26503)
by Brandon Chinn (＠brandonchinn178) 22 Oct '25

22 Oct '25

Brandon Chinn pushed to branch wip/T26503 at Glasgow Haskell Compiler / GHC Commits: fb50abde by Brandon Chinn at 2025-10-21T19:13:51-07:00 Implement QualifiedStrings (#26503) - - - - - 41 changed files: - compiler/GHC/Builtin/Types.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/StringMeta.hs - docs/users_guide/9.16.1-notes.rst - + docs/users_guide/exts/qualified_strings.rst - libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - testsuite/tests/driver/T4437.hs - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.stdout - testsuite/tests/interface-stability/template-haskell-exports.stdout - 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/DumpTypecheckedAst.stderr - + testsuite/tests/qualified-strings/Makefile - + testsuite/tests/qualified-strings/should_fail/Makefile - + testsuite/tests/qualified-strings/should_fail/all.T - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.stderr - + testsuite/tests/qualified-strings/should_run/Example/ByteStringAscii.hs - + testsuite/tests/qualified-strings/should_run/Example/ByteStringUtf8.hs - + testsuite/tests/qualified-strings/should_run/Example/Text.hs - + testsuite/tests/qualified-strings/should_run/Makefile - + testsuite/tests/qualified-strings/should_run/all.T - + testsuite/tests/qualified-strings/should_run/qstrings_expr.hs - + testsuite/tests/qualified-strings/should_run/qstrings_expr.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_pat.hs - + testsuite/tests/qualified-strings/should_run/qstrings_pat.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_th.hs - + testsuite/tests/qualified-strings/should_run/qstrings_th.stdout - utils/check-exact/ExactPrint.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fb50abde06132749c7d71e46e639437… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fb50abde06132749c7d71e46e639437… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/bchinn-argparse-filetype] Replace deprecated argparse.FileType
by Brandon Chinn (＠brandonchinn178) 22 Oct '25

22 Oct '25

Brandon Chinn pushed to branch wip/bchinn-argparse-filetype at Glasgow Haskell Compiler / GHC Commits: cc7d226d by Brandon Chinn at 2025-10-21T16:36:26-07:00 Replace deprecated argparse.FileType - - - - - 3 changed files: - docs/users_guide/compare-flags.py - rts/gen_event_types.py - testsuite/driver/runtests.py Changes: ===================================== docs/users_guide/compare-flags.py ===================================== @@ -35,7 +35,7 @@ def expected_undocumented(flag: str) -> bool: return False -def read_documented_flags(doc_flags) -> Set[str]: +def read_documented_flags(doc_flags: Path) -> Set[str]: # Map characters that mark the end of a flag # to whitespace. trans = str.maketrans({ @@ -44,10 +44,10 @@ def read_documented_flags(doc_flags) -> Set[str]: '⟨': ' ', }) return {line.translate(trans).split()[0] - for line in doc_flags.read().split('\n') + for line in doc_flags.read_text().split('\n') if line != ''} -def read_ghc_flags(ghc_path: str) -> Set[str]: +def read_ghc_flags(ghc_path: Path) -> Set[str]: ghc_output = subprocess.check_output([ghc_path, '--show-options']) ghci_output = subprocess.check_output([ghc_path, '--interactive', '--show-options']) @@ -63,16 +63,16 @@ def error(s: str): def main() -> None: import argparse parser = argparse.ArgumentParser() - parser.add_argument('--ghc', type=argparse.FileType('r'), + parser.add_argument('--ghc', type=Path, help='path of GHC executable', required=True) - parser.add_argument('--doc-flags', type=argparse.FileType(mode='r', encoding='UTF-8'), + parser.add_argument('--doc-flags', type=Path, help='path of ghc-flags.txt output from Sphinx', required=True) args = parser.parse_args() doc_flags = read_documented_flags(args.doc_flags) - ghc_flags = read_ghc_flags(args.ghc.name) + ghc_flags = read_ghc_flags(args.ghc) failed = False ===================================== rts/gen_event_types.py ===================================== @@ -1,6 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +from pathlib import Path from typing import List, Union, Dict from collections import namedtuple @@ -198,17 +199,17 @@ def generate_event_types_defines() -> str: def main() -> None: import argparse parser = argparse.ArgumentParser() - parser.add_argument('--event-types-array', type=argparse.FileType('w'), metavar='FILE') - parser.add_argument('--event-types-defines', type=argparse.FileType('w'), metavar='FILE') + parser.add_argument('--event-types-array', type=Path, metavar='FILE') + parser.add_argument('--event-types-defines', type=Path, metavar='FILE') args = parser.parse_args() check_events() if args.event_types_array: - args.event_types_array.write(generate_event_types_array()) + args.event_types_array.write_text(generate_event_types_array()) if args.event_types_defines: - args.event_types_defines.write(generate_event_types_defines()) + args.event_types_defines.write_text(generate_event_types_defines()) if __name__ == '__main__': main() ===================================== testsuite/driver/runtests.py ===================================== @@ -83,7 +83,7 @@ parser.add_argument("--way", action="append", help="just this way") parser.add_argument("--skipway", action="append", help="skip this way") parser.add_argument("--threads", type=int, help="threads to run simultaneously") parser.add_argument("--verbose", type=int, choices=[0,1,2,3,4,5], help="verbose (Values 0 through 5 accepted)") -parser.add_argument("--junit", type=argparse.FileType('wb'), help="output testsuite summary in JUnit format") +parser.add_argument("--junit", type=Path, help="output testsuite summary in JUnit format") parser.add_argument("--broken-test", action="append", default=[], help="a test name to mark as broken for this run") parser.add_argument("--test-env", default='local', help="Override default chosen test-env.") parser.add_argument("--perf-baseline", type=GitRef, metavar='COMMIT', help="Baseline commit for performance comparsons.") @@ -91,7 +91,7 @@ perf_group.add_argument("--skip-perf-tests", action="store_true", help="skip per perf_group.add_argument("--only-perf-tests", action="store_true", help="Only do performance tests") parser.add_argument("--ignore-perf-failures", choices=['increases','decreases','all'], help="Do not fail due to out-of-tolerance perf tests") -parser.add_argument("--only-report-hadrian-deps", type=argparse.FileType('w'), +parser.add_argument("--only-report-hadrian-deps", type=Path, help="Dry run the testsuite and report all extra hadrian dependencies needed on the given file") args = parser.parse_args() @@ -615,14 +615,14 @@ else: summary(t, f) if args.junit: - junit(t).write(args.junit) - args.junit.close() + with args.junit.open("wb") as f: + junit(t).write(f) if config.only_report_hadrian_deps: print("WARNING - skipping all tests and only reporting required hadrian dependencies:", config.hadrian_deps) - for d in config.hadrian_deps: - print(d,file=config.only_report_hadrian_deps) - config.only_report_hadrian_deps.close() + with config.only_report_hadrian_deps.open("w") as f: + for d in config.hadrian_deps: + print(d, file=f) if len(t.unexpected_failures) > 0 or \ len(t.unexpected_stat_failures) > 0 or \ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cc7d226d6ed46c62cdc9daae4182c8a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cc7d226d6ed46c62cdc9daae4182c8a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/bchinn-argparse-filetype
by Brandon Chinn (＠brandonchinn178) 22 Oct '25

22 Oct '25

Brandon Chinn pushed new branch wip/bchinn-argparse-filetype at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/bchinn-argparse-filetype You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] 2 commits: Wibble CoercionHole free vars
by Simon Peyton Jones (＠simonpj) 22 Oct '25

22 Oct '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: 4fc4a4f2 by Simon Peyton Jones at 2025-10-21T23:07:07+01:00 Wibble CoercionHole free vars - - - - - 3030178d by Simon Peyton Jones at 2025-10-21T23:07:22+01:00 Wibble improve forall - - - - - 4 changed files: - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Solver/Monad.hs Changes: ===================================== compiler/GHC/Core/TyCo/FVs.hs ===================================== @@ -238,6 +238,16 @@ ill-scoped; an alternative we have not explored. But see `occCheckExpand` in this module for a function that does, selectively, expand synonyms to reduce free-var occurences. + +Note [CoercionHoles and coercion free variables] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Generally, we do not treat a CoercionHole as a free variable of a coercion; +see `tyCoVarsOfType` and friends. + +But there is an exception. When finding the free /coercion/ variables of a type, +in `coVarsOfType`, we /do/ treat a CoercionHole as a free variable. Why? +The sole reason is in Note [Emitting the residual implication in simplifyInfer] +in GHC.Tc.Solver. Yuk. This is not pretty. -} {- ********************************************************************* @@ -352,8 +362,7 @@ deepTcvFolder = TyCoFolder { tcf_view = noView -- See Note [Free vars and synon do_hole _is hole = deep_ty (varType (coHoleCoVar hole)) -- We don't collect the CoercionHole itself, but we /do/ -- need to collect the free variables of its /kind/ - -- See (CHFV1) in Note [CoercionHoles and coercion free variables] - -- in GHC.Core.TyCo.Rep + -- See Note [CoercionHoles and coercion free variables] {- ********************************************************************* * * @@ -423,7 +432,12 @@ shallowTcvFolder = TyCoFolder { tcf_view = noView -- See Note [Free vars and sy Here we are only interested in the free /coercion/ variables. We can achieve this through a slightly different TyCo folder. -Notice that we look deeply, into kinds. +Notice that + +* We look deeply, into kinds. + +* We /include/ CoercionHoles. Why? Specifically because of #14584, + Note [Emitting the residual implication in simplifyInfer] in GHC.Tc.Solver See #14880. -} @@ -466,9 +480,9 @@ deepCoVarFolder = TyCoFolder { tcf_view = noView | otherwise = appEndoOS (deep_cv_ty (varType v)) $ acc `extendVarSet` v - do_hole _ _ = mempty - -- See (CHFV1) in Note [CoercionHoles and coercion free variables] - -- in GHC.Core.TyCo.Rep + do_hole is hole = do_covar is (coHoleCoVar hole) + -- We /do/ treat a CoercionHole as a free variable + -- See Note [CoercionHoles and coercion free variables] ------- Same again, but for DCoVarSet ---------- -- But this time the free vars are shallow @@ -675,7 +689,7 @@ tyCoFVsOfCo (FunCo { fco_mult = w, fco_arg = co1, fco_res = co2 }) fv_cand in_sc tyCoFVsOfCo (CoVarCo v) fv_cand in_scope acc = tyCoFVsOfCoVar v fv_cand in_scope acc tyCoFVsOfCo (HoleCo {}) fv_cand in_scope acc = emptyFV fv_cand in_scope acc - -- Ignore holes: see (CHFV1) in Note [CoercionHoles and coercion free variables] + -- Ignore holes: Note [CoercionHoles and coercion free variables] tyCoFVsOfCo (AxiomCo _ cs) fv_cand in_scope acc = tyCoFVsOfCos cs fv_cand in_scope acc tyCoFVsOfCo (UnivCo { uco_lty = t1, uco_rty = t2, uco_deps = deps}) fv_cand in_scope acc = (tyCoFVsOfCos deps `unionFV` tyCoFVsOfType t1 ===================================== compiler/GHC/Core/TyCo/Rep.hs ===================================== @@ -1687,7 +1687,7 @@ holes `HoleCo`, which get filled in later. -- | A coercion to be filled in by the type-checker. See Note [Coercion holes] data CoercionHole = CoercionHole { ch_co_var :: CoVar - -- See Note [CoercionHoles and coercion free variables] + -- See Note [Coercion holes] wrinkle (COH2) , ch_ref :: IORef (Maybe (Coercion, CoHoleSet)) -- The CoHoleSet is (possibly a superset of) @@ -1789,38 +1789,24 @@ the evidence for unboxed equalities: Other notes about HoleCo: - * INVARIANT: CoercionHole and HoleCo are used only during type checking, +(COH1) INVARIANT: CoercionHole and HoleCo are used only during type checking, and should never appear in Core. Just like unification variables; a Type can contain a TcTyVar, but only during type checking. If, one day, we use type-level information to separate out forms that can appear during type-checking vs forms that can appear in core proper, holes in Core will be ruled out. - * See Note [CoercionHoles and coercion free variables] - - * Coercion holes can be compared for equality like other coercions: - by looking at the types coerced. - - -Note [CoercionHoles and coercion free variables] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Why does a CoercionHole contain a CoVar, as well as reference to fill in? +(COH2) Why does a CoercionHole contain a CoVar, as well as reference to fill in? * It really helps for debug pretty-printing. * It carries a type which makes `coercionKind` and `coercionRole` work * It has a Unique, which gives the hole an identity; see calls to `ctEvEvId` -(CHFV1) We do not treat a CoercionHole as a free variable of a coercion. - In the past we did: See #14584, and Note [What prevents a constraint from floating] - in GHC.Tc.Solver, item (4): +(COH3) See Note [CoercionHoles and coercion free variables] in GHC.Core.TyCo.FVs - forall k. [W] co1 :: t1 ~# t2 |> co2 - [W] co2 :: k ~# * +(COH4) Coercion holes can be compared for equality like other coercions: + by looking at the types coerced. - Here co2 is a CoercionHole. But we /must/ know that it is free in - co1, because that's all that stops it floating outside the - implication. - But nowadays this is all irrelevant because we don't float constraints. Note [CoercionHoles and CoHoleSets] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Tc/Solver/Equality.hs ===================================== @@ -543,6 +543,7 @@ can_eq_nc_forall ev eq_rel s1 s2 -- Generate and solve the constraints that live in the body of the implication -- See (SF5) and (SF6) in Note [Solving forall equalities] + ; nested_ev_binds_var <- newNoTcEvBinds ; (unifs, (all_co, solved)) <- reportFineGrainUnifications $ do { -- Generate constraints @@ -553,13 +554,8 @@ can_eq_nc_forall ev eq_rel s1 s2 ; traceTcS "Trying to solve the implication" (ppr s1 $$ ppr s2 $$ ppr wanteds) - -- Solve the `wanteds` in a nested context - -- Use the /same/ TcEvBinds var as the context; we do not expect any dict binds - -- but we do want to record any used Given coercions (in `evb_tcvs`) so that - -- they are kept alive by `neededEvVars`. Admittedly they are free in `all_co`, - -- but only if we zonk it, which `neededEvVars` does not do (see test T7196). - ; ev_binds_var <- getTcEvBindsVar - ; residual_wanted <- nestImplicTcS skol_info_anon ev_binds_var tclvl $ + -- Solve the `wanteds` in a nested context. + ; residual_wanted <- nestImplicTcS skol_info_anon nested_ev_binds_var tclvl $ solveSimpleWanteds wanteds ; return (all_co, isSolvedWC residual_wanted) } @@ -568,7 +564,13 @@ can_eq_nc_forall ev eq_rel s1 s2 ; kickOutAfterUnification unifs ; if solved - then do { setWantedEq orig_dest emptyCoHoleSet all_co + then do { -- Record any used used Given coercions (in `evb_tcvs`) so that + -- they are kept alive by `neededEvVars`. Admittedly they are free in `all_co`, + -- but only if we zonk it, which `neededEvVars` does not do (see test T7196). + ev_binds_var <- getTcEvBindsVar + ; updTcEvBinds ev_binds_var nested_ev_binds_var + + ; setWantedEq orig_dest emptyCoHoleSet all_co -- emptyCoHoleSet: fully solved, so all_co has no holes ; stopWith ev "Polytype equality: solved" } ===================================== compiler/GHC/Tc/Solver/Monad.hs ===================================== @@ -20,7 +20,7 @@ module GHC.Tc.Solver.Monad ( failTcS, warnTcS, addErrTcS, wrapTcS, ctLocWarnTcS, runTcSEqualities, nestTcS, nestImplicTcS, tryShortCutTcS, nestFunDepsTcS, - setEvBindsTcS, setTcLevelTcS, + setEvBindsTcS, setTcLevelTcS, updTcEvBinds, selectNextWorkItem, getWorkList, @@ -1434,6 +1434,10 @@ setTcEvBindsMap :: EvBindsVar -> EvBindMap -> TcS () setTcEvBindsMap ev_binds_var binds = wrapTcS $ TcM.setTcEvBindsMap ev_binds_var binds +updTcEvBinds :: EvBindsVar -> EvBindsVar -> TcS () +updTcEvBinds evb nested_evb + = wrapTcS $ TcM.updTcEvBinds evb nested_evb + getDefaultInfo :: TcS (DefaultEnv, Bool) getDefaultInfo = wrapTcS TcM.tcGetDefaultTys View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8a9962249f6f9c0f7e18d88971afde… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8a9962249f6f9c0f7e18d88971afde… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26503] 2 commits: Unify HsString + HsMultilineString
by Brandon Chinn (＠brandonchinn178) 22 Oct '25

22 Oct '25

Brandon Chinn pushed to branch wip/T26503 at Glasgow Haskell Compiler / GHC Commits: e311129f by Brandon Chinn at 2025-10-21T14:23:53-07:00 Unify HsString + HsMultilineString - - - - - 93ad609b by Brandon Chinn at 2025-10-21T14:46:14-07:00 Implement QualifiedStrings (#26503) - - - - - 58 changed files: - compiler/GHC/Builtin/Types.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Syn/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Quote.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/String.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Error/Codes.hs - + compiler/GHC/Types/StringMeta.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/ghc.cabal.in - + docs/users_guide/exts/qualified_strings.rst - libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/driver/T4437.hs - testsuite/tests/ghc-api/annotations-literals/literals.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - testsuite/tests/ghc-api/annotations-literals/parsed.stdout - testsuite/tests/interface-stability/template-haskell-exports.stdout - 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/DumpTypecheckedAst.stderr - + testsuite/tests/qualified-strings/Makefile - + testsuite/tests/qualified-strings/should_fail/Makefile - + testsuite/tests/qualified-strings/should_fail/all.T - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.stderr - + testsuite/tests/qualified-strings/should_run/Example/ByteStringAscii.hs - + testsuite/tests/qualified-strings/should_run/Example/ByteStringUtf8.hs - + testsuite/tests/qualified-strings/should_run/Example/Text.hs - + testsuite/tests/qualified-strings/should_run/Makefile - + testsuite/tests/qualified-strings/should_run/all.T - + testsuite/tests/qualified-strings/should_run/qstrings_expr.hs - + testsuite/tests/qualified-strings/should_run/qstrings_expr.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_pat.hs - + testsuite/tests/qualified-strings/should_run/qstrings_pat.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_th.hs - + testsuite/tests/qualified-strings/should_run/qstrings_th.stdout - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bc9a4f77e813ecf19a88b417f247ac… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bc9a4f77e813ecf19a88b417f247ac… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26503] Implement QualifiedStrings (#26503)
by Brandon Chinn (＠brandonchinn178) 22 Oct '25

22 Oct '25

Brandon Chinn pushed to branch wip/T26503 at Glasgow Haskell Compiler / GHC Commits: bc9a4f77 by Brandon Chinn at 2025-10-21T12:31:59-07:00 Implement QualifiedStrings (#26503) - - - - - 33 changed files: - compiler/GHC/Builtin/Types.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Pat.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/StringMeta.hs - + docs/users_guide/exts/qualified_strings.rst - libraries/ghc-boot-th/GHC/Boot/TH/Ppr.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - testsuite/tests/driver/T4437.hs - + testsuite/tests/qualified-strings/Makefile - + testsuite/tests/qualified-strings/should_fail/Makefile - + testsuite/tests/qualified-strings/should_fail/all.T - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.hs - + testsuite/tests/qualified-strings/should_fail/qstrings_multiline_no_ext.stderr - + testsuite/tests/qualified-strings/should_run/Example/ByteStringAscii.hs - + testsuite/tests/qualified-strings/should_run/Example/ByteStringUtf8.hs - + testsuite/tests/qualified-strings/should_run/Example/Text.hs - + testsuite/tests/qualified-strings/should_run/Makefile - + testsuite/tests/qualified-strings/should_run/all.T - + testsuite/tests/qualified-strings/should_run/qstrings_expr.hs - + testsuite/tests/qualified-strings/should_run/qstrings_expr.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_pat.hs - + testsuite/tests/qualified-strings/should_run/qstrings_pat.stdout - + testsuite/tests/qualified-strings/should_run/qstrings_th.hs - + testsuite/tests/qualified-strings/should_run/qstrings_th.stdout - utils/check-exact/ExactPrint.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bc9a4f77e813ecf19a88b417f247acb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/bc9a4f77e813ecf19a88b417f247acb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] Wibble Endo
by Simon Peyton Jones (＠simonpj) 22 Oct '25

22 Oct '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: 8a996224 by Simon Peyton Jones at 2025-10-21T18:29:39+01:00 Wibble Endo - - - - - 1 changed file: - compiler/GHC/Utils/EndoOS.hs Changes: ===================================== compiler/GHC/Utils/EndoOS.hs ===================================== @@ -28,4 +28,5 @@ pattern EndoOS :: (a->a) -> EndoOS a pattern EndoOS f <- EndoOS' f where EndoOS f = EndoOS' (oneShot f) - -- ^^^^^^ The one-shot trick! + -- oneShot: this is the core of the one-shot trick! + -- Note [The one-shot state monad trick] in GHC.Utils.Monad. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8a9962249f6f9c0f7e18d88971afdee… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8a9962249f6f9c0f7e18d88971afdee… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T23162-spj] 4 commits: Do not treat CoercionHoles as free variables in coercions
by Simon Peyton Jones (＠simonpj) 22 Oct '25

22 Oct '25

Simon Peyton Jones pushed to branch wip/T23162-spj at Glasgow Haskell Compiler / GHC Commits: d8f1c49d by Simon Peyton Jones at 2025-10-21T17:00:59+01:00 Do not treat CoercionHoles as free variables in coercions This fixes a long-standing wart in the free-variable finder; now CoercionHoles are no longer treated as a "free variable" of a coercion. I got big and unexpected performance regressions when making this change. Turned out that CallArity didn't discover that the free variable finder could be eta-expanded, which gave very poor code. So I re-used Note [The one-shot state monad trick] for Endo, resulting in GHC.Utils.EndoOS. Very simple, big win. - - - - - c3413786 by Simon Peyton Jones at 2025-10-21T17:00:59+01:00 Fix buglet in solving equalities from QCIs - - - - - 23988363 by Simon Peyton Jones at 2025-10-21T17:00:59+01:00 Improve equality checking for foralls a bit ...by re-using the TcEvBindsVar - - - - - 5f0af575 by Simon Peyton Jones at 2025-10-21T17:00:59+01:00 Update debug-tracing in CallArity No effect on behaviour, and commented out anyway - - - - - 9 changed files: - compiler/GHC/Core/Opt/CallArity.hs - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Tc/Solver/Equality.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Utils/TcType.hs - compiler/GHC/Types/Unique/DSM.hs - + compiler/GHC/Utils/EndoOS.hs - compiler/ghc.cabal.in Changes: ===================================== compiler/GHC/Core/Opt/CallArity.hs ===================================== @@ -598,9 +598,8 @@ callArityBind boring_vars ae_body int (NonRec v rhs) -- Recursive let. See Note [Recursion and fixpointing] callArityBind boring_vars ae_body int b@(Rec binds) - = -- (if length binds > 300 then - -- pprTrace "callArityBind:Rec" - -- (vcat [ppr (Rec binds'), ppr ae_body, ppr int, ppr ae_rhs]) else id) $ + = -- pprTrace "callArityBind:Rec" + -- (vcat [ppr (map fst binds), ppr ae_body, ppr int, ppr ae_rhs]) $ (final_ae, Rec binds') where -- See Note [Taking boring variables into account] @@ -614,7 +613,9 @@ callArityBind boring_vars ae_body int b@(Rec binds) fix :: [(Id, Maybe (Bool, Arity, CallArityRes), CoreExpr)] -> (CallArityRes, [(Id, CoreExpr)]) fix ann_binds - | -- pprTrace "callArityBind:fix" (vcat [ppr ann_binds, ppr any_change, ppr ae]) $ + | -- pprTrace "callArityBind:fix" (vcat + -- [ text "binds" <+> vcat [ppr (id,stuff) | (id,stuff,_rhs) <- ann_binds] + -- , ppr any_change, ppr ae]) $ any_change = fix ann_binds' | otherwise @@ -650,7 +651,12 @@ callArityBind boring_vars ae_body int b@(Rec binds) | safe_arity == 0 = ae_rhs -- If it is not a function, its body is evaluated only once | otherwise = calledMultipleTimes ae_rhs - i' = i `setIdCallArity` trimmed_arity + i' = -- (if trimmed_arity == new_arity then id else + -- pprTrace "trimming" + -- (vcat [ ppr i <+> ppr new_arity <+> ppr trimmed_arity + -- , text "safe" <+> ppr safe_arity + -- , text "is_thunk" <+> ppr is_thunk ])) $ + i `setIdCallArity` trimmed_arity in (True, (i', Just (called_once, new_arity, ae_rhs'), rhs')) where ===================================== compiler/GHC/Core/TyCo/FVs.hs ===================================== @@ -66,7 +66,10 @@ import GHC.Types.Unique.Set import GHC.Types.Var.Set import GHC.Types.Var.Env + import GHC.Utils.Misc +import GHC.Utils.EndoOS + import GHC.Data.Pair import Data.Semigroup @@ -285,9 +288,9 @@ done by the Call Arity pass. TL;DR: check this regularly! -} -runTyCoVars :: Endo TyCoVarSet -> TyCoVarSet +runTyCoVars :: EndoOS TyCoVarSet -> TyCoVarSet {-# INLINE runTyCoVars #-} -runTyCoVars f = appEndo f emptyVarSet +runTyCoVars f = appEndoOS f emptyVarSet {- ********************************************************************* * * @@ -320,28 +323,37 @@ tyCoVarsOfMCo (MCo co) = tyCoVarsOfCo co tyCoVarsOfCos :: [Coercion] -> TyCoVarSet tyCoVarsOfCos cos = runTyCoVars (deep_cos cos) -deep_ty :: Type -> Endo TyCoVarSet -deep_tys :: [Type] -> Endo TyCoVarSet -deep_co :: Coercion -> Endo TyCoVarSet -deep_cos :: [Coercion] -> Endo TyCoVarSet +deep_ty :: Type -> EndoOS TyCoVarSet +deep_tys :: [Type] -> EndoOS TyCoVarSet +deep_co :: Coercion -> EndoOS TyCoVarSet +deep_cos :: [Coercion] -> EndoOS TyCoVarSet (deep_ty, deep_tys, deep_co, deep_cos) = foldTyCo deepTcvFolder emptyVarSet -deepTcvFolder :: TyCoFolder TyCoVarSet (Endo TyCoVarSet) +deepTcvFolder :: TyCoFolder TyCoVarSet (EndoOS TyCoVarSet) +-- It's important that we use a one-shot EndoOS, to ensure that all +-- the free-variable finders are eta-expanded. Lacking the one-shot-ness +-- led to some big slow downs. See Note [The one-shot state monad trick] +-- in GHC.Utils.Monad deepTcvFolder = TyCoFolder { tcf_view = noView -- See Note [Free vars and synonyms] , tcf_tyvar = do_tcv, tcf_covar = do_tcv , tcf_hole = do_hole, tcf_tycobinder = do_bndr } where - do_tcv is v = Endo do_it + do_tcv is v = EndoOS do_it where do_it acc | v `elemVarSet` is = acc | v `elemVarSet` acc = acc - | otherwise = appEndo (deep_ty (varType v)) $ + | otherwise = appEndoOS (deep_ty (varType v)) $ acc `extendVarSet` v + do_bndr :: TyCoVarSet -> TyVar -> ForAllTyFlag -> TyCoVarSet do_bndr is tcv _ = extendVarSet is tcv - do_hole is hole = do_tcv is (coHoleCoVar hole) - -- See Note [CoercionHoles and coercion free variables] - -- in GHC.Core.TyCo.Rep + + do_hole :: VarSet -> CoercionHole -> EndoOS TyCoVarSet + do_hole _is hole = deep_ty (varType (coHoleCoVar hole)) + -- We don't collect the CoercionHole itself, but we /do/ + -- need to collect the free variables of its /kind/ + -- See (CHFV1) in Note [CoercionHoles and coercion free variables] + -- in GHC.Core.TyCo.Rep {- ********************************************************************* * * @@ -378,18 +390,18 @@ shallowTyCoVarsOfCoVarEnv cos = shallowTyCoVarsOfCos (nonDetEltsUFM cos) -- It's OK to use nonDetEltsUFM here because we immediately -- forget the ordering by returning a set -shallow_ty :: Type -> Endo TyCoVarSet -shallow_tys :: [Type] -> Endo TyCoVarSet -shallow_co :: Coercion -> Endo TyCoVarSet -shallow_cos :: [Coercion] -> Endo TyCoVarSet +shallow_ty :: Type -> EndoOS TyCoVarSet +shallow_tys :: [Type] -> EndoOS TyCoVarSet +shallow_co :: Coercion -> EndoOS TyCoVarSet +shallow_cos :: [Coercion] -> EndoOS TyCoVarSet (shallow_ty, shallow_tys, shallow_co, shallow_cos) = foldTyCo shallowTcvFolder emptyVarSet -shallowTcvFolder :: TyCoFolder TyCoVarSet (Endo TyCoVarSet) +shallowTcvFolder :: TyCoFolder TyCoVarSet (EndoOS TyCoVarSet) shallowTcvFolder = TyCoFolder { tcf_view = noView -- See Note [Free vars and synonyms] , tcf_tyvar = do_tcv, tcf_covar = do_tcv , tcf_hole = do_hole, tcf_tycobinder = do_bndr } where - do_tcv is v = Endo do_it + do_tcv is v = EndoOS do_it where do_it acc | v `elemVarSet` is = acc | v `elemVarSet` acc = acc @@ -427,13 +439,13 @@ coVarsOfTypes tys = runTyCoVars (deep_cv_tys tys) coVarsOfCo co = runTyCoVars (deep_cv_co co) coVarsOfCos cos = runTyCoVars (deep_cv_cos cos) -deep_cv_ty :: Type -> Endo CoVarSet -deep_cv_tys :: [Type] -> Endo CoVarSet -deep_cv_co :: Coercion -> Endo CoVarSet -deep_cv_cos :: [Coercion] -> Endo CoVarSet +deep_cv_ty :: Type -> EndoOS CoVarSet +deep_cv_tys :: [Type] -> EndoOS CoVarSet +deep_cv_co :: Coercion -> EndoOS CoVarSet +deep_cv_cos :: [Coercion] -> EndoOS CoVarSet (deep_cv_ty, deep_cv_tys, deep_cv_co, deep_cv_cos) = foldTyCo deepCoVarFolder emptyVarSet -deepCoVarFolder :: TyCoFolder TyCoVarSet (Endo CoVarSet) +deepCoVarFolder :: TyCoFolder TyCoVarSet (EndoOS CoVarSet) deepCoVarFolder = TyCoFolder { tcf_view = noView , tcf_tyvar = do_tyvar, tcf_covar = do_covar , tcf_hole = do_hole, tcf_tycobinder = do_bndr } @@ -445,17 +457,18 @@ deepCoVarFolder = TyCoFolder { tcf_view = noView -- the tyvar won't end up in the accumulator, so -- we'd look repeatedly. Blargh. - do_covar is v = Endo do_it + do_bndr is tcv _ = extendVarSet is tcv + + do_covar is v = EndoOS do_it where do_it acc | v `elemVarSet` is = acc | v `elemVarSet` acc = acc - | otherwise = appEndo (deep_cv_ty (varType v)) $ + | otherwise = appEndoOS (deep_cv_ty (varType v)) $ acc `extendVarSet` v - do_bndr is tcv _ = extendVarSet is tcv - do_hole is hole = do_covar is (coHoleCoVar hole) - -- See Note [CoercionHoles and coercion free variables] - -- in GHC.Core.TyCo.Rep + do_hole _ _ = mempty + -- See (CHFV1) in Note [CoercionHoles and coercion free variables] + -- in GHC.Core.TyCo.Rep ------- Same again, but for DCoVarSet ---------- -- But this time the free vars are shallow @@ -480,7 +493,7 @@ closeOverKinds :: TyCoVarSet -> TyCoVarSet -- add the deep free variables of its kind closeOverKinds vs = nonDetStrictFoldVarSet do_one vs vs where - do_one v acc = appEndo (deep_ty (varType v)) acc + do_one v acc = appEndoOS (deep_ty (varType v)) acc {- --------------- Alternative version 1 (using FV) ------------ closeOverKinds = fvVarSet . closeOverKindsFV . nonDetEltsUniqSet @@ -661,9 +674,8 @@ tyCoFVsOfCo (FunCo { fco_mult = w, fco_arg = co1, fco_res = co2 }) fv_cand in_sc = (tyCoFVsOfCo co1 `unionFV` tyCoFVsOfCo co2 `unionFV` tyCoFVsOfCo w) fv_cand in_scope acc tyCoFVsOfCo (CoVarCo v) fv_cand in_scope acc = tyCoFVsOfCoVar v fv_cand in_scope acc -tyCoFVsOfCo (HoleCo h) fv_cand in_scope acc - = tyCoFVsOfCoVar (coHoleCoVar h) fv_cand in_scope acc - -- See Note [CoercionHoles and coercion free variables] +tyCoFVsOfCo (HoleCo {}) fv_cand in_scope acc = emptyFV fv_cand in_scope acc + -- Ignore holes: see (CHFV1) in Note [CoercionHoles and coercion free variables] tyCoFVsOfCo (AxiomCo _ cs) fv_cand in_scope acc = tyCoFVsOfCos cs fv_cand in_scope acc tyCoFVsOfCo (UnivCo { uco_lty = t1, uco_rty = t2, uco_deps = deps}) fv_cand in_scope acc = (tyCoFVsOfCos deps `unionFV` tyCoFVsOfType t1 ===================================== compiler/GHC/Core/TyCo/Rep.hs ===================================== @@ -1804,17 +1804,23 @@ Other notes about HoleCo: Note [CoercionHoles and coercion free variables] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Why does a CoercionHole contain a CoVar, as well as reference to -fill in? Because we want to treat that CoVar as a free variable of -the coercion. See #14584, and Note [What prevents a -constraint from floating] in GHC.Tc.Solver, item (4): +Why does a CoercionHole contain a CoVar, as well as reference to fill in? + * It really helps for debug pretty-printing. + * It carries a type which makes `coercionKind` and `coercionRole` work + * It has a Unique, which gives the hole an identity; see calls to `ctEvEvId` + +(CHFV1) We do not treat a CoercionHole as a free variable of a coercion. + In the past we did: See #14584, and Note [What prevents a constraint from floating] + in GHC.Tc.Solver, item (4): forall k. [W] co1 :: t1 ~# t2 |> co2 [W] co2 :: k ~# * -Here co2 is a CoercionHole. But we /must/ know that it is free in -co1, because that's all that stops it floating outside the -implication. + Here co2 is a CoercionHole. But we /must/ know that it is free in + co1, because that's all that stops it floating outside the + implication. + + But nowadays this is all irrelevant because we don't float constraints. Note [CoercionHoles and CoHoleSets] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Tc/Solver/Equality.hs ===================================== @@ -554,24 +554,21 @@ can_eq_nc_forall ev eq_rel s1 s2 ; traceTcS "Trying to solve the implication" (ppr s1 $$ ppr s2 $$ ppr wanteds) -- Solve the `wanteds` in a nested context - ; ev_binds_var <- newNoTcEvBinds + -- Use the /same/ TcEvBinds var as the context; we do not expect any dict binds + -- but we do want to record any used Given coercions (in `evb_tcvs`) so that + -- they are kept alive by `neededEvVars`. Admittedly they are free in `all_co`, + -- but only if we zonk it, which `neededEvVars` does not do (see test T7196). + ; ev_binds_var <- getTcEvBindsVar ; residual_wanted <- nestImplicTcS skol_info_anon ev_binds_var tclvl $ solveSimpleWanteds wanteds ; return (all_co, isSolvedWC residual_wanted) } - -- Kick out any inerts constraints that mention unified type variables ; kickOutAfterUnification unifs ; if solved - then do { all_co <- zonkCo all_co - -- setWantedEq will add `all_co` to the `ebv_tcvs`, to record - -- that `all_co` is used. But if `all_co` contains filled - -- CoercionHoles, from the nested solve, and we may miss the - -- use of CoVars. Test T7196 showed this up - - ; setWantedEq orig_dest emptyCoHoleSet all_co + then do { setWantedEq orig_dest emptyCoHoleSet all_co -- emptyCoHoleSet: fully solved, so all_co has no holes ; stopWith ev "Polytype equality: solved" } @@ -2935,8 +2932,7 @@ lookup_eq_in_qcis :: CtEvidence -> EqRel -> TcType -> TcType -> SolverStage () -- [W] t1 ~# t2 -- and a Given quantified contraint like (forall a b. blah => a ~ b) -- Why? See Note [Looking up primitive equalities in quantified constraints] --- See also GHC.Tc.Solver.Dict --- Note [Equality superclasses in quantified constraints] +-- See also GHC.Tc.Solver.Dict Note [Equality superclasses in quantified constraints] lookup_eq_in_qcis (CtGiven {}) _ _ _ = nopStage () @@ -2952,10 +2948,18 @@ lookup_eq_in_qcis ev@(CtWanted (WantedCt { ctev_dest = dest, ctev_loc = loc })) where hole = case dest of HoleDest hole -> hole -- Equality constraints have HoleDest - _ -> pprPanic "lookup_eq_in_qcis" (ppr dest) + _ -> pprPanic "lookup_eq_in_qcis" (ppr dest) try :: SwapFlag -> SolverStage () - try swap -- First try looking for (lhs ~ rhs) + -- E.g. We are trying to solve (say) + -- [W] g : [Int] ~# b) + -- from [G] forall x. blah => b ~ [x] -- A quantified constraint + -- We can solve it like this + -- d::b~[Int] := $df @Int blah -- Apply the quantified constraint + -- g'::b~#[Int] := sc_sel d -- Binding, extract the coercion from d + -- g(co-hole) := sym g' -- Fill the original coercion hole + -- Here g' is a fresh coercion variable. + try swap | Just (cls, tys) <- unSwap swap (boxEqPred eq_rel) lhs rhs = Stage $ do { let cls_pred = mkClassPred cls tys @@ -2965,7 +2969,7 @@ lookup_eq_in_qcis ev@(CtWanted (WantedCt { ctev_dest = dest, ctev_loc = loc })) OneInst {} -> do { dict_ev <- newWantedEvVarNC loc emptyCoHoleSet cls_pred ; chooseInstance dict_ev res - ; let co_var = coHoleCoVar hole + ; co_var <- newEvVar (unSwap swap (mkEqPred eq_rel) lhs rhs) ; setEvBind (mkWantedEvBind co_var EvCanonical (mk_sc_sel cls tys dict_ev)) ; fillCoercionHole hole emptyCoHoleSet $ maybeSymCo swap (mkCoVarCo co_var) ===================================== compiler/GHC/Tc/Types/Evidence.hs ===================================== @@ -392,6 +392,8 @@ data EvBindsVar -- so that we can report unused given constraints, -- in GHC.Tc.Solver.neededEvVars -- See Note [Tracking redundant constraints] in GHC.Tc.Solver + -- Also: we garbage-collect unused bindings in `neededEvVars`, + -- so this matters for correctness too. } | CoEvBindsVar { -- See Note [Coercion evidence only] ===================================== compiler/GHC/Tc/Utils/TcType.hs ===================================== @@ -234,9 +234,11 @@ import GHC.Builtin.Names import GHC.Builtin.Types ( coercibleClass, eqClass, heqClass, unitTyConKey , listTyCon, constraintKind ) import GHC.Types.Basic -import GHC.Utils.Misc import GHC.Data.Maybe import GHC.Data.List.SetOps ( getNth, findDupsEq ) + +import GHC.Utils.Misc +import GHC.Utils.EndoOS import GHC.Utils.Outputable import GHC.Utils.Panic @@ -1176,11 +1178,11 @@ exactTyCoVarsOfTypes :: [Type] -> TyCoVarSet exactTyCoVarsOfType ty = runTyCoVars (exact_ty ty) exactTyCoVarsOfTypes tys = runTyCoVars (exact_tys tys) -exact_ty :: Type -> Endo TyCoVarSet -exact_tys :: [Type] -> Endo TyCoVarSet +exact_ty :: Type -> EndoOS TyCoVarSet +exact_tys :: [Type] -> EndoOS TyCoVarSet (exact_ty, exact_tys, _, _) = foldTyCo exactTcvFolder emptyVarSet -exactTcvFolder :: TyCoFolder TyCoVarSet (Endo TyCoVarSet) +exactTcvFolder :: TyCoFolder TyCoVarSet (EndoOS TyCoVarSet) exactTcvFolder = deepTcvFolder { tcf_view = coreView } -- This is the key line ===================================== compiler/GHC/Types/Unique/DSM.hs ===================================== @@ -168,7 +168,7 @@ instance MonadGetUnique USM.UniqSM where newtype UniqDSMT m result = UDSMT' (DUniqSupply -> m (result, DUniqSupply)) deriving (Functor) --- Similar to GHC.Utils.Monad.State.Strict, using Note [The one-shot state monad trick] +-- Similar to GHC.Utils.Monad, using Note [The one-shot state monad trick] -- Using the one-shot trick is necessary for performance. -- Using transfomer's strict `StateT` regressed some performance tests in 1-2%. -- The one-shot trick here fixes those regressions. ===================================== compiler/GHC/Utils/EndoOS.hs ===================================== @@ -0,0 +1,31 @@ +{-# LANGUAGE PatternSynonyms #-} + +-- | One-shot endomorphisms +-- Mostly for backwards compatibility. + +-- One-shot endomorphisms +-- Like GHC.Internal.Data.Semigroup.Internal.Endo, but uting +-- the one-shot trick from +-- Note [The one-shot state monad trick] in GHC.Utils.Monad. + +module GHC.Utils.EndoOS( EndoOS(EndoOS, appEndoOS ) ) where + +import GHC.Prelude + +import Data.Semigroup +import GHC.Exts (oneShot) + +newtype EndoOS a = EndoOS' { appEndoOS :: a -> a } + + +instance Semigroup (EndoOS a) where + f <> g = EndoOS (appEndoOS f . appEndoOS g) + +instance Monoid (EndoOS a) where + mempty = EndoOS id + +pattern EndoOS :: (a->a) -> EndoOS a +pattern EndoOS f <- EndoOS' f + where + EndoOS f = EndoOS' (oneShot f) + -- ^^^^^^ The one-shot trick! ===================================== compiler/ghc.cabal.in ===================================== @@ -997,6 +997,7 @@ Library GHC.Utils.Containers.Internal.BitUtil GHC.Utils.Containers.Internal.StrictPair GHC.Utils.Error + GHC.Utils.EndoOS GHC.Utils.Exception GHC.Utils.Fingerprint GHC.Utils.FV View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/861d46ce0292a867a25f648d8c552e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/861d46ce0292a867a25f648d8c552e… You're receiving this email because of your account on gitlab.haskell.org.

1 0