March 2026 - ghc-commits

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 26 commits: hadrian: remove the broken bench flavour
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 604e1180 by Cheng Shao at 2026-03-11T15:00:42-04:00 hadrian: remove the broken bench flavour This patch removes the bench flavour from hadrian which has been broken for years and not used for actual benchmarking (for which `perf`/`release` is used instead). Closes #26825. - - - - - c3e64915 by Simon Jakobi at 2026-03-11T15:01:31-04:00 Add regression test for #18186 The original TypeInType language extension is replaced with DataKinds+PolyKinds for compatibility. Closes #18186. - - - - - 664996c7 by Andreas Klebinger at 2026-03-11T15:02:16-04:00 Bump nofib submodule. We accrued a number of nofib fixes we want to have here. - - - - - 517cf64e by Simon Jakobi at 2026-03-11T15:03:03-04:00 Add regression test for #15907 Closes #15907. - - - - - fff362cf by Simon Jakobi at 2026-03-11T15:03:49-04:00 Ensure T14272 is run in optasm way Closes #16539. - - - - - ec81ec2c by Simon Jakobi at 2026-03-11T15:03:49-04:00 Add regression test for #24632 Closes #24632. - - - - - cefec47b by Simon Jakobi at 2026-03-11T15:03:50-04:00 Fix module name of T9675: T6975 -> T9675 - - - - - d3690ae8 by Andreas Klebinger at 2026-03-11T15:04:31-04:00 User guide: Clarify phase control on INLINEABLE[foo] pragmas. Fixes #26851 - - - - - e7054934 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #12694 Closes #12694. - - - - - 4756d9f6 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #16275 Closes #16275. - - - - - 34b7e2c1 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #14908 Closes #14908. - - - - - 4243db3d by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #14151 Closes #14151. - - - - - 0e9f1453 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #12640 Closes #12640. - - - - - ae606c7f by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #15588 Closes #15588. - - - - - 5a38ce4e by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #9445 Closes #9445. - - - - - d054b467 by Cheng Shao at 2026-03-11T15:05:59-04:00 compiler: implement string interning logic for BCONPtrFS This patch adds a `FastStringEnv`-based cache of `MallocStrings` requests to `Interp`, so that when we load bytecode with many breakpoints that share the same module names & unit ids, we reuse the allocated remote pointers instead of issuing duplicte `MallocStrings` requests and bloating the C heap. Closes #26995. - - - - - b85a0293 by Simon Jakobi at 2026-03-11T15:06:41-04:00 Add perf test for #1216 Closes #1216. - - - - - cd7f7420 by Sylvain Henry at 2026-03-11T15:07:58-04:00 JS: check that tuple constructors are linked (#23709) Test js-mk_tup was failing before because tuple constructors weren't linked in. It's no longer an issue after the linker fixes. - - - - - d57f01a4 by Matthew Pickering at 2026-03-11T15:08:40-04:00 testsuite: Add test for foreign import prim with unboxed tuple return This commit just adds a test that foreign import prim works with unboxed sums. - - - - - 23d111ce by Matthew Pickering at 2026-03-11T15:08:41-04:00 Return a valid pointer in advanceStackFrameLocationzh When there is no next stack chunk, `advanceStackFrameLocationzh` used to return NULL in the pointer-typed StackSnapshot# result slot. Even though the caller treats that case as "no next frame", the result is still materialized in a GC-visible pointer slot. If a GC observes the raw NULL there, stack decoding can crash. Fix this by ensuring the dead pointer slot contains a valid closure pointer. Also make the optional result explicit by returning an unboxed sum instead of a tuple with a separate tag. Fixes #27009 - - - - - 4c58a3ae by Cheng Shao at 2026-03-11T15:09:22-04:00 hadrian: build profiled dynamic objects with -dynamic-too This patch enables hadrian to build profiled dynamic objects with `-dynamic-too`, addressing a build parallelism bottleneck in release pipelines. Closes #27010. - - - - - 67c01cda by mniip at 2026-03-11T15:42:50-04:00 ghc-internal: Remove GHC.Internal.Data.Eq It served no purpose other than being a re-export. - - - - - 087c32d7 by mniip at 2026-03-11T15:42:50-04:00 ghc-internal: Refine GHC.Internal.Base imports Removed re-exports from GHC.Internal.Base. This reveals some modules that don't actually use anything *defined* in GHC.Internal.Base, and that can be pushed down a little in the import graph. Replaced most imports of GHC.Internal.Base with non-wildcard imports from modules where the identifiers are actually defined. Part of #26834 - - - - - 25e2af18 by Sylvain Henry at 2026-03-11T15:42:56-04:00 Stg/Unarise: constant-folding during unarisation (#25650) When building an unboxed sum from a literal argument, mkUbxSum previously emitted a runtime cast via `case primop [lit] of var -> ...`. This wrapper prevented GHC from recognising the result as a static StgRhsCon, causing top-level closures to be allocated as thunks instead of being statically allocated. Fix: try to perform the numeric literal cast at compile time using mkLitNumberWrap (wrapping semantics). If successful, return the cast literal directly with an identity wrapper (no case expression). The runtime cast path is kept as fallback for non-literal arguments. Test: codeGen/should_compile/T25650 - - - - - 689e76d1 by Sylvain Henry at 2026-03-11T15:43:02-04:00 T17912: wait for opener thread to block before killing it (#24739) Instead of a fixed 1000ms delay, poll threadStatus until the opener thread is in BlockedOnForeignCall, ensuring killThread only fires once the thread is provably inside the blocking open() syscall. This prevents the test from accidentally passing on Windows due to scheduling races. - - - - - 5cba5500 by Cheng Shao at 2026-03-11T15:43:03-04:00 template-haskell: fix redundant import in Language.Haskell.TH.Quote This patch fixes a redundant import in `Language.Haskell.TH.Quote` that causes a ghc build failure when bootstrapping from 9.14 with validate flavours. Fixes #27014. - - - - - 302 changed files: - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Runtime/Interpreter/Types.hs - compiler/GHC/Stg/Pipeline.hs - compiler/GHC/Stg/Unarise.hs - docs/users_guide/exts/pragmas.rst - docs/users_guide/exts/rewrite_rules.rst - hadrian/doc/flavours.md - hadrian/hadrian.cabal - hadrian/src/Rules/Compile.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Ghc.hs - − hadrian/src/Settings/Flavours/Benchmark.hs - libraries/base/src/Control/Applicative.hs - libraries/base/src/Data/Char.hs - libraries/base/src/Data/Eq.hs - libraries/base/src/Data/Semigroup.hs - libraries/base/src/GHC/Base.hs - libraries/base/src/GHC/Weak/Finalize.hs - libraries/base/src/Prelude.hs - libraries/base/tests/IO/T17912.hs - libraries/base/tests/IO/all.T - libraries/ghc-experimental/src/GHC/Profiling/Eras.hs - libraries/ghc-internal/cbits/Stack.cmm - libraries/ghc-internal/codepages/MakeTable.hs - libraries/ghc-internal/ghc-internal.cabal.in - libraries/ghc-internal/src/GHC/Internal/AllocationLimitHandler.hs - libraries/ghc-internal/src/GHC/Internal/Arr.hs - libraries/ghc-internal/src/GHC/Internal/Base.hs - libraries/ghc-internal/src/GHC/Internal/Bits.hs - libraries/ghc-internal/src/GHC/Internal/ByteOrder.hs - libraries/ghc-internal/src/GHC/Internal/Char.hs - libraries/ghc-internal/src/GHC/Internal/Clock.hsc - libraries/ghc-internal/src/GHC/Internal/ClosureTypes.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Bound.hs - libraries/ghc-internal/src/GHC/Internal/Conc/IO.hs - libraries/ghc-internal/src/GHC/Internal/Conc/POSIX.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Signal.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs - libraries/ghc-internal/src/GHC/Internal/Conc/Sync.hs-boot - libraries/ghc-internal/src/GHC/Internal/Conc/Windows.hs - libraries/ghc-internal/src/GHC/Internal/ConsoleHandler.hsc - libraries/ghc-internal/src/GHC/Internal/Control/Arrow.hs - libraries/ghc-internal/src/GHC/Internal/Control/Concurrent/MVar.hs - libraries/ghc-internal/src/GHC/Internal/Control/Exception.hs - libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fail.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fix.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/IO/Class.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Imp.hs - libraries/ghc-internal/src/GHC/Internal/Control/Monad/ST/Lazy/Imp.hs - libraries/ghc-internal/src/GHC/Internal/Data/Bits.hs - libraries/ghc-internal/src/GHC/Internal/Data/Data.hs - libraries/ghc-internal/src/GHC/Internal/Data/Dynamic.hs - libraries/ghc-internal/src/GHC/Internal/Data/Either.hs - − libraries/ghc-internal/src/GHC/Internal/Data/Eq.hs - libraries/ghc-internal/src/GHC/Internal/Data/Foldable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Function.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Const.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Identity.hs - libraries/ghc-internal/src/GHC/Internal/Data/Functor/Utils.hs - libraries/ghc-internal/src/GHC/Internal/Data/IORef.hs - libraries/ghc-internal/src/GHC/Internal/Data/List.hs - libraries/ghc-internal/src/GHC/Internal/Data/Maybe.hs - libraries/ghc-internal/src/GHC/Internal/Data/Monoid.hs - libraries/ghc-internal/src/GHC/Internal/Data/OldList.hs - libraries/ghc-internal/src/GHC/Internal/Data/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Proxy.hs - libraries/ghc-internal/src/GHC/Internal/Data/STRef.hs - libraries/ghc-internal/src/GHC/Internal/Data/Semigroup/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Data/String.hs - libraries/ghc-internal/src/GHC/Internal/Data/Traversable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Bool.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Coercion.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Equality.hs - libraries/ghc-internal/src/GHC/Internal/Data/Type/Ord.hs - libraries/ghc-internal/src/GHC/Internal/Data/Typeable.hs - libraries/ghc-internal/src/GHC/Internal/Data/Typeable/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Data/Unique.hs - libraries/ghc-internal/src/GHC/Internal/Data/Version.hs - libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs - libraries/ghc-internal/src/GHC/Internal/Debug/Trace.hs-boot - libraries/ghc-internal/src/GHC/Internal/Encoding/UTF8.hs - libraries/ghc-internal/src/GHC/Internal/Enum.hs - libraries/ghc-internal/src/GHC/Internal/Environment.hs - libraries/ghc-internal/src/GHC/Internal/Event/Array.hs - libraries/ghc-internal/src/GHC/Internal/Event/Control.hs - libraries/ghc-internal/src/GHC/Internal/Event/EPoll.hsc - libraries/ghc-internal/src/GHC/Internal/Event/IntVar.hs - libraries/ghc-internal/src/GHC/Internal/Event/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Event/Internal/Types.hs - libraries/ghc-internal/src/GHC/Internal/Event/KQueue.hsc - libraries/ghc-internal/src/GHC/Internal/Event/Manager.hs - libraries/ghc-internal/src/GHC/Internal/Event/PSQ.hs - libraries/ghc-internal/src/GHC/Internal/Event/Poll.hsc - libraries/ghc-internal/src/GHC/Internal/Event/Thread.hs - libraries/ghc-internal/src/GHC/Internal/Event/TimeOut.hs - libraries/ghc-internal/src/GHC/Internal/Event/TimerManager.hs - libraries/ghc-internal/src/GHC/Internal/Event/Unique.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows.hsc - libraries/ghc-internal/src/GHC/Internal/Event/Windows/Clock.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows/ConsoleEvent.hsc - libraries/ghc-internal/src/GHC/Internal/Event/Windows/FFI.hsc - libraries/ghc-internal/src/GHC/Internal/Event/Windows/ManagedThreadPool.hs - libraries/ghc-internal/src/GHC/Internal/Event/Windows/Thread.hs - libraries/ghc-internal/src/GHC/Internal/Exception.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Backtrace.hs-boot - libraries/ghc-internal/src/GHC/Internal/Exception/Context.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs - libraries/ghc-internal/src/GHC/Internal/ExecutionStack.hs - libraries/ghc-internal/src/GHC/Internal/ExecutionStack/Internal.hsc - libraries/ghc-internal/src/GHC/Internal/Exts.hs - libraries/ghc-internal/src/GHC/Internal/Fingerprint.hs - libraries/ghc-internal/src/GHC/Internal/Fingerprint.hs-boot - libraries/ghc-internal/src/GHC/Internal/Fingerprint/Type.hs - libraries/ghc-internal/src/GHC/Internal/Float.hs - libraries/ghc-internal/src/GHC/Internal/Float/ConversionUtils.hs - libraries/ghc-internal/src/GHC/Internal/Float/RealFracMethods.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/ConstPtr.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Error.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/String.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/String/Encoding.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/C/Types.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/ForeignPtr/Imp.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Alloc.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Array.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Error.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Pool.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Marshal/Utils.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Ptr.hs - libraries/ghc-internal/src/GHC/Internal/Foreign/Storable.hs - libraries/ghc-internal/src/GHC/Internal/ForeignPtr.hs - libraries/ghc-internal/src/GHC/Internal/ForeignSrcLang.hs - libraries/ghc-internal/src/GHC/Internal/Functor/ZipList.hs - libraries/ghc-internal/src/GHC/Internal/GHCi.hs - libraries/ghc-internal/src/GHC/Internal/GHCi/Helpers.hs - libraries/ghc-internal/src/GHC/Internal/Generics.hs - libraries/ghc-internal/src/GHC/Internal/Heap/Closures.hs - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable.hsc - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable/Types.hsc - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTableProf.hsc - libraries/ghc-internal/src/GHC/Internal/Heap/ProfInfo/Types.hs - libraries/ghc-internal/src/GHC/Internal/IO.hs - libraries/ghc-internal/src/GHC/Internal/IO/Buffer.hs - libraries/ghc-internal/src/GHC/Internal/IO/BufferedIO.hs - libraries/ghc-internal/src/GHC/Internal/IO/Device.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/CodePage.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/CodePage/API.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/CodePage/Table.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Failure.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Iconv.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Latin1.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/Types.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/UTF16.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/UTF32.hs - libraries/ghc-internal/src/GHC/Internal/IO/Encoding/UTF8.hs - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO/FD.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/FD.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Internals.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/Flock.hsc - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/LinuxOFD.hsc - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/NoOp.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Lock/Windows.hsc - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Types.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Windows.hs - libraries/ghc-internal/src/GHC/Internal/IO/IOMode.hs - libraries/ghc-internal/src/GHC/Internal/IO/SubSystem.hs - libraries/ghc-internal/src/GHC/Internal/IO/Unsafe.hs - libraries/ghc-internal/src/GHC/Internal/IO/Windows/Encoding.hs - libraries/ghc-internal/src/GHC/Internal/IO/Windows/Handle.hsc - libraries/ghc-internal/src/GHC/Internal/IOArray.hs - libraries/ghc-internal/src/GHC/Internal/IORef.hs - libraries/ghc-internal/src/GHC/Internal/InfoProv.hs - libraries/ghc-internal/src/GHC/Internal/InfoProv/Types.hsc - libraries/ghc-internal/src/GHC/Internal/Int.hs - libraries/ghc-internal/src/GHC/Internal/IsList.hs - libraries/ghc-internal/src/GHC/Internal/Ix.hs - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - libraries/ghc-internal/src/GHC/Internal/Lexeme.hs - libraries/ghc-internal/src/GHC/Internal/List.hs - libraries/ghc-internal/src/GHC/Internal/MVar.hs - libraries/ghc-internal/src/GHC/Internal/Num.hs - libraries/ghc-internal/src/GHC/Internal/Numeric.hs - libraries/ghc-internal/src/GHC/Internal/OverloadedLabels.hs - libraries/ghc-internal/src/GHC/Internal/Pack.hs - libraries/ghc-internal/src/GHC/Internal/Profiling.hs - libraries/ghc-internal/src/GHC/Internal/Ptr.hs - libraries/ghc-internal/src/GHC/Internal/RTS/Flags.hsc - libraries/ghc-internal/src/GHC/Internal/RTS/Flags/Test.hsc - libraries/ghc-internal/src/GHC/Internal/Read.hs - libraries/ghc-internal/src/GHC/Internal/Real.hs - libraries/ghc-internal/src/GHC/Internal/ST.hs - libraries/ghc-internal/src/GHC/Internal/STM.hs - libraries/ghc-internal/src/GHC/Internal/STRef.hs - libraries/ghc-internal/src/GHC/Internal/Show.hs - libraries/ghc-internal/src/GHC/Internal/Stable.hs - libraries/ghc-internal/src/GHC/Internal/StableName.hs - libraries/ghc-internal/src/GHC/Internal/Stack.hs - libraries/ghc-internal/src/GHC/Internal/Stack.hs-boot - libraries/ghc-internal/src/GHC/Internal/Stack/Annotation.hs - libraries/ghc-internal/src/GHC/Internal/Stack/CCS.hsc - libraries/ghc-internal/src/GHC/Internal/Stack/CloneStack.hs - libraries/ghc-internal/src/GHC/Internal/Stack/Constants.hsc - libraries/ghc-internal/src/GHC/Internal/Stack/ConstantsProf.hsc - libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs - libraries/ghc-internal/src/GHC/Internal/StaticPtr.hs - libraries/ghc-internal/src/GHC/Internal/StaticPtr/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Stats.hsc - libraries/ghc-internal/src/GHC/Internal/Storable.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/Blank.hsc - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-internal/src/GHC/Internal/System/IO.hs - libraries/ghc-internal/src/GHC/Internal/System/IO/Error.hs - libraries/ghc-internal/src/GHC/Internal/System/Mem.hs - libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs - libraries/ghc-internal/src/GHC/Internal/System/Posix/Types.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lib.hs - libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs - libraries/ghc-internal/src/GHC/Internal/TH/Monad.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - libraries/ghc-internal/src/GHC/Internal/Text/ParserCombinators/ReadP.hs - libraries/ghc-internal/src/GHC/Internal/Text/ParserCombinators/ReadPrec.hs - libraries/ghc-internal/src/GHC/Internal/Text/Read.hs - libraries/ghc-internal/src/GHC/Internal/Text/Read/Lex.hs - libraries/ghc-internal/src/GHC/Internal/TopHandler.hs - libraries/ghc-internal/src/GHC/Internal/TypeLits.hs - libraries/ghc-internal/src/GHC/Internal/TypeLits/Internal.hs - libraries/ghc-internal/src/GHC/Internal/TypeNats.hs - libraries/ghc-internal/src/GHC/Internal/TypeNats/Internal.hs - libraries/ghc-internal/src/GHC/Internal/Unicode.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Bits.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/Unsafe/Coerce.hs - libraries/ghc-internal/src/GHC/Internal/Weak.hs - libraries/ghc-internal/src/GHC/Internal/Weak/Finalize.hs - libraries/ghc-internal/src/GHC/Internal/Windows.hs - libraries/ghc-internal/src/GHC/Internal/Word.hs - libraries/ghc-internal/tools/ucd2haskell/exe/UCD2Haskell/ModuleGenerators.hs - libraries/ghci/GHCi/CreateBCO.hs - libraries/template-haskell/Language/Haskell/TH/Quote.hs - nofib - testsuite/tests/codeGen/should_compile/Makefile - + testsuite/tests/codeGen/should_compile/T25650.hs - + testsuite/tests/codeGen/should_compile/T25650.stdout - testsuite/tests/codeGen/should_compile/all.T - + testsuite/tests/corelint/T15907.hs - + testsuite/tests/corelint/T15907A.hs - testsuite/tests/corelint/all.T - + testsuite/tests/dependent/should_fail/T15588.hs - + testsuite/tests/dependent/should_fail/T15588.stderr - testsuite/tests/dependent/should_fail/all.T - + testsuite/tests/ffi/should_run/PrimFFIUnboxedSum.hs - + testsuite/tests/ffi/should_run/PrimFFIUnboxedSum.stdout - + testsuite/tests/ffi/should_run/PrimFFIUnboxedSum_cmm.cmm - testsuite/tests/ffi/should_run/all.T - + testsuite/tests/ghci/scripts/T24632.hs - + testsuite/tests/ghci/scripts/T24632.script - + testsuite/tests/ghci/scripts/T24632.stdout - testsuite/tests/ghci/scripts/all.T - testsuite/tests/interface-stability/template-haskell-exports.stdout - testsuite/tests/javascript/js-mk_tup.hs - testsuite/tests/javascript/js-mk_tup.stdout - testsuite/tests/perf/compiler/T9675.hs - + testsuite/tests/perf/should_run/T1216.hs - + testsuite/tests/perf/should_run/T1216.stdout - testsuite/tests/perf/should_run/all.T - + testsuite/tests/polykinds/T18186.hs - + testsuite/tests/polykinds/T18186.stderr - testsuite/tests/polykinds/all.T - testsuite/tests/profiling/should_run/callstack001.stdout - testsuite/tests/profiling/should_run/callstack002.stderr - testsuite/tests/profiling/should_run/callstack002.stdout - + testsuite/tests/simplCore/should_compile/T12640.hs - + testsuite/tests/simplCore/should_compile/T12640.stderr - + testsuite/tests/simplCore/should_compile/T14908.hs - + testsuite/tests/simplCore/should_compile/T14908_Deps.hs - + testsuite/tests/simplCore/should_compile/T9445.hs - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/typecheck/should_compile/T14151.hs - testsuite/tests/typecheck/should_compile/all.T - + testsuite/tests/typecheck/should_fail/T12694.hs - + testsuite/tests/typecheck/should_fail/T12694.stderr - + testsuite/tests/typecheck/should_fail/T16275.stderr - + testsuite/tests/typecheck/should_fail/T16275A.hs - + testsuite/tests/typecheck/should_fail/T16275B.hs - + testsuite/tests/typecheck/should_fail/T16275B.hs-boot - testsuite/tests/typecheck/should_fail/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7cacaa78d160b92f06117f9aaf1405… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7cacaa78d160b92f06117f9aaf1405… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] hadrian: build profiled dynamic objects with -dynamic-too
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 4c58a3ae by Cheng Shao at 2026-03-11T15:09:22-04:00 hadrian: build profiled dynamic objects with -dynamic-too This patch enables hadrian to build profiled dynamic objects with `-dynamic-too`, addressing a build parallelism bottleneck in release pipelines. Closes #27010. - - - - - 2 changed files: - hadrian/src/Rules/Compile.hs - hadrian/src/Settings/Builders/Ghc.hs Changes: ===================================== hadrian/src/Rules/Compile.hs ===================================== @@ -59,14 +59,17 @@ compilePackage rs = do -- When building dynamically we depend on the static rule if shared libs -- are supported, because it will add the -dynamic-too flag when -- compiling to build the dynamic files alongside the static files - ( root -/- "**/build/**/*.dyn_o" :& root -/- "**/build/**/*.dyn_hi" :& Nil ) + forM_ wayPats $ \wayPat -> ( root -/- ("**/build/**/*." ++ wayPat ++ "dyn_o") :& root -/- ("**/build/**/*." ++ wayPat ++ "dyn_hi") :& Nil ) &%> \ ( dyn_o :& _dyn_hi :& _ ) -> do p <- platformSupportsSharedLibs if p then do + b <- parsePath (parseBuildObject root) "<object file path parser>" dyn_o + let ctx = objectContext b + way = removeWayUnit Dynamic $ C.way ctx -- We `need` ".o/.hi" because GHC is called with `-dynamic-too` -- and builds ".dyn_o/.dyn_hi" too. - changed <- needHasChanged [dyn_o -<.> "o", dyn_o -<.> "hi"] + changed <- needHasChanged [dyn_o -<.> osuf way, dyn_o -<.> hisuf way] -- If for some reason a previous Hadrian execution has been -- interrupted after the rule for .o/.hi generation has completed ===================================== hadrian/src/Settings/Builders/Ghc.hs ===================================== @@ -34,6 +34,8 @@ compileAndLinkHs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do useColor <- shakeColor <$> expr getShakeOptions let hasVanilla = elem vanilla ways hasDynamic = elem dynamic ways + hasProfiling = elem profiling ways + hasProfilingDynamic = elem profilingDynamic ways hieFiles <- ghcHieFiles <$> expr flavour stage <- getStage hie_path <- getHieBuildPath @@ -46,6 +48,12 @@ compileAndLinkHs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do , (hasVanilla && hasDynamic) ? builder (Ghc CompileHs) ? platformSupportsSharedLibs ? way vanilla ? arg "-dynamic-too" + , (hasProfiling && hasProfilingDynamic) ? builder (Ghc CompileHs) ? + platformSupportsSharedLibs ? way profiling ? mconcat + [ arg "-dynamic-too" + , arg "-dynosuf", arg $ osuf profilingDynamic + , arg "-dynhisuf", arg $ hisuf profilingDynamic + ] , commonGhcArgs , ghcLinkArgs , defaultGhcWarningsArgs View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4c58a3aecf8071bfcda6d0787652b89… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4c58a3aecf8071bfcda6d0787652b89… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: testsuite: Add test for foreign import prim with unboxed tuple return
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: d57f01a4 by Matthew Pickering at 2026-03-11T15:08:40-04:00 testsuite: Add test for foreign import prim with unboxed tuple return This commit just adds a test that foreign import prim works with unboxed sums. - - - - - 23d111ce by Matthew Pickering at 2026-03-11T15:08:41-04:00 Return a valid pointer in advanceStackFrameLocationzh When there is no next stack chunk, `advanceStackFrameLocationzh` used to return NULL in the pointer-typed StackSnapshot# result slot. Even though the caller treats that case as "no next frame", the result is still materialized in a GC-visible pointer slot. If a GC observes the raw NULL there, stack decoding can crash. Fix this by ensuring the dead pointer slot contains a valid closure pointer. Also make the optional result explicit by returning an unboxed sum instead of a tuple with a separate tag. Fixes #27009 - - - - - 6 changed files: - libraries/ghc-internal/cbits/Stack.cmm - libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs - + testsuite/tests/ffi/should_run/PrimFFIUnboxedSum.hs - + testsuite/tests/ffi/should_run/PrimFFIUnboxedSum.stdout - + testsuite/tests/ffi/should_run/PrimFFIUnboxedSum_cmm.cmm - testsuite/tests/ffi/should_run/all.T Changes: ===================================== libraries/ghc-internal/cbits/Stack.cmm ===================================== @@ -8,9 +8,11 @@ // developed. #if defined(StgStack_marking) -// Returns the next stackframe's StgStack* and offset in it. And, an indicator -// if this frame is the last one (`hasNext` bit.) -// (StgStack*, StgWord, StgWord) advanceStackFrameLocationzh(StgStack* stack, StgWord offsetWords) +// Returns the next stackframe location as +// (# (# #) | (# StgStack*, StgWord #) #) +// flattened to its runtime representation: +// (tag, StgStack*, StgWord) +// where tag 1 means no next frame and tag 2 means the payload is present. advanceStackFrameLocationzh (P_ stack, W_ offsetWords) { W_ frameSize; (frameSize) = ccall stackFrameSize(stack, offsetWords); @@ -27,27 +29,30 @@ advanceStackFrameLocationzh (P_ stack, W_ offsetWords) { stackSizeInBytes = WDS(stackSize); stackBottom = stackSizeInBytes + stackArrayPtr; + W_ tag, newOffsetWords; P_ newStack; - W_ newOffsetWords, hasNext; if(nextClosurePtr < stackBottom) (likely: True) { + tag = 2; newStack = stack; newOffsetWords = offsetWords + frameSize; - hasNext = 1; } else { P_ underflowFrameStack; (underflowFrameStack) = ccall getUnderflowFrameStack(stack, offsetWords); if (underflowFrameStack == NULL) (likely: True) { - newStack = NULL; - newOffsetWords = NULL; - hasNext = NULL; + // The empty alternative still has dead payload slots in the flattened + // sum representation, so the pointer field must contain a valid closure + // pointer rather than NULL. + tag = 1; + newStack = stack; + newOffsetWords = 0; } else { + tag = 2; newStack = underflowFrameStack; - newOffsetWords = NULL; - hasNext = 1; + newOffsetWords = 0; } } - return (newStack, newOffsetWords, hasNext); + return (tag, newStack, newOffsetWords); } // (StgWord, StgWord) getSmallBitmapzh(StgStack* stack, StgWord offsetWords) ===================================== libraries/ghc-internal/src/GHC/Internal/Stack/Decode.hs ===================================== @@ -11,6 +11,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeInType #-} {-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE UnboxedSums #-} {-# LANGUAGE UnliftedFFITypes #-} module GHC.Internal.Stack.Decode ( @@ -214,21 +215,19 @@ getStackFields stackSnapshot# = stackHead :: StackSnapshot# -> StackFrameLocation stackHead s# = (StackSnapshot s#, 0) -- GHC stacks are never empty --- | Advance to the next stack frame (if any) --- --- The last `Int#` in the result tuple is meant to be treated as bool --- (has_next). +-- | Advance to the next stack frame (if any). foreign import prim "advanceStackFrameLocationzh" advanceStackFrameLocation# :: - StackSnapshot# -> Word# -> (# StackSnapshot#, Word#, Int# #) + StackSnapshot# -> Word# -> (# (# #) | (# StackSnapshot#, Word# #) #) -- | Advance to the next stack frame (if any) advanceStackFrameLocation :: StackFrameLocation -> Maybe StackFrameLocation advanceStackFrameLocation ((StackSnapshot stackSnapshot#), index) = - let !(# s', i', hasNext #) = advanceStackFrameLocation# stackSnapshot# (wordOffsetToWord# index) - in if I# hasNext > 0 - then Just (StackSnapshot s', primWordToWordOffset i') - else Nothing + case advanceStackFrameLocation# stackSnapshot# (wordOffsetToWord# index) of + (# (# #) | #) -> + Nothing + (# | (# s', i' #) #) -> + Just (StackSnapshot s', primWordToWordOffset i') where primWordToWordOffset :: Word# -> WordOffset primWordToWordOffset w# = fromIntegral (W# w#) ===================================== testsuite/tests/ffi/should_run/PrimFFIUnboxedSum.hs ===================================== @@ -0,0 +1,24 @@ +{-# LANGUAGE GHCForeignImportPrim #-} +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE UnboxedTuples #-} +{-# LANGUAGE UnboxedSums #-} +{-# LANGUAGE UnliftedFFITypes #-} + +module Main where + +import GHC.Exts +import GHC.Word + +foreign import prim "sumWord" + sumWord# :: Word# -> (# (# #) | Word# #) + +render :: Word# -> String +render w# = + case sumWord# w# of + (# (# #) | #) -> "none" + (# | r# #) -> "some " ++ show (W# r#) + +main :: IO () +main = do + putStrLn (render 0##) + putStrLn (render 5##) ===================================== testsuite/tests/ffi/should_run/PrimFFIUnboxedSum.stdout ===================================== @@ -0,0 +1,2 @@ +none +some 6 ===================================== testsuite/tests/ffi/should_run/PrimFFIUnboxedSum_cmm.cmm ===================================== @@ -0,0 +1,9 @@ +#include "Cmm.h" + +sumWord(W_ w) { + if (w == 0) { + return (1, 0); + } else { + return (2, w + 1); + } +} ===================================== testsuite/tests/ffi/should_run/all.T ===================================== @@ -225,6 +225,8 @@ test('PrimFFIInt32', [req_c], compile_and_run, ['PrimFFIInt32_c.c']) test('PrimFFIWord32', [req_c], compile_and_run, ['PrimFFIWord32_c.c']) +test('PrimFFIUnboxedSum', req_cmm, compile_and_run, ['PrimFFIUnboxedSum_cmm.cmm']) + test('T493', [ req_c], compile_and_run, ['T493_c.c']) test('UnliftedNewtypesByteArrayOffset', [req_c], compile_and_run, ['UnliftedNewtypesByteArrayOffset_c.c']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/cd7f742008454f4e5b9499631d3a64… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/cd7f742008454f4e5b9499631d3a64… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] JS: check that tuple constructors are linked (#23709)
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: cd7f7420 by Sylvain Henry at 2026-03-11T15:07:58-04:00 JS: check that tuple constructors are linked (#23709) Test js-mk_tup was failing before because tuple constructors weren't linked in. It's no longer an issue after the linker fixes. - - - - - 2 changed files: - testsuite/tests/javascript/js-mk_tup.hs - testsuite/tests/javascript/js-mk_tup.stdout Changes: ===================================== testsuite/tests/javascript/js-mk_tup.hs ===================================== @@ -40,44 +40,32 @@ mkTup9 = unsafeCoerce js_mk_tup9 mkTup10 :: (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) mkTup10 = unsafeCoerce js_mk_tup10 --- We have to use the Haskell tuple constructors here to make sure --- that the linker includes them in the final output for us to use --- in our JS code. main :: IO () main = do putStr "mkTup2: " - print $ mkTup2 == (101, 102) print mkTup2 putStr "mkTup3: " - print $ mkTup3 == (101, 102, 103) print mkTup3 putStr "mkTup4: " - print $ mkTup4 == (101, 102, 103, 104) print mkTup4 putStr "mkTup5: " - print $ mkTup5 == (101, 102, 103, 104, 105) print mkTup5 putStr "mkTup6: " - print $ mkTup6 == (101, 102, 103, 104, 105, 106) print mkTup6 putStr "mkTup7: " - print $ mkTup7 == (101, 102, 103, 104, 105, 106, 107) print mkTup7 putStr "mkTup8: " - print $ mkTup8 == (101, 102, 103, 104, 105, 106, 107, 108) print mkTup8 putStr "mkTup9: " - print $ mkTup9 == (101, 102, 103, 104, 105, 106, 107, 108, 109) print mkTup9 putStr "mkTup10: " - print $ mkTup10 == (101, 102, 103, 104, 105, 106, 107, 108, 109, 110) print mkTup10 ===================================== testsuite/tests/javascript/js-mk_tup.stdout ===================================== @@ -1,18 +1,9 @@ -mkTup2: True -(101,102) -mkTup3: True -(101,102,103) -mkTup4: True -(101,102,103,104) -mkTup5: True -(101,102,103,104,105) -mkTup6: True -(101,102,103,104,105,106) -mkTup7: True -(101,102,103,104,105,106,107) -mkTup8: True -(101,102,103,104,105,106,107,108) -mkTup9: True -(101,102,103,104,105,106,107,108,109) -mkTup10: True -(101,102,103,104,105,106,107,108,109,110) +mkTup2: (101,102) +mkTup3: (101,102,103) +mkTup4: (101,102,103,104) +mkTup5: (101,102,103,104,105) +mkTup6: (101,102,103,104,105,106) +mkTup7: (101,102,103,104,105,106,107) +mkTup8: (101,102,103,104,105,106,107,108) +mkTup9: (101,102,103,104,105,106,107,108,109) +mkTup10: (101,102,103,104,105,106,107,108,109,110) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cd7f742008454f4e5b9499631d3a64e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/cd7f742008454f4e5b9499631d3a64e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Add perf test for #1216
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: b85a0293 by Simon Jakobi at 2026-03-11T15:06:41-04:00 Add perf test for #1216 Closes #1216. - - - - - 3 changed files: - + testsuite/tests/perf/should_run/T1216.hs - + testsuite/tests/perf/should_run/T1216.stdout - testsuite/tests/perf/should_run/all.T Changes: ===================================== testsuite/tests/perf/should_run/T1216.hs ===================================== @@ -0,0 +1,68 @@ +{-# LANGUAGE BangPatterns #-} + +import Data.Array.Base +import GHC.Arr(unsafeIndex,index) +import Data.Array.IArray +import Control.Monad.ST +import Data.Array.ST +import System.Environment(getArgs) + +type Elem = Double +type Vector = [Elem] +type Matrix = [Vector] + +n :: Num a => a +n = 40 + +a :: Matrix +a = [[if i==j then 1 else 0|i<-[1..n]]|j<-[1..n]] + +p :: Vector +p = [1..n] + +------------------------ array-based, update-in-place code + +type VectorA s = STUArray s Int Elem +type MatrixA s = STUArray s (Int,Int) Elem + +{-# INLINE myreadArray #-} +-- | Read an element from a mutable array +myreadArray :: (MArray a e m, Ix i) => a i e -> i -> m e +myreadArray marr i = do + (l,u) <- getBounds marr + unsafeRead marr (myindex (l,u) i) + +{-# INLINE mywriteArray #-} +-- | Write an element in a mutable array +mywriteArray :: (MArray a e m, Ix i) => a i e -> i -> e -> m () +mywriteArray marr i e = do + (l,u) <- getBounds marr + unsafeWrite marr (myindex (l,u) i) e + +myindex b i = index b i +-- the following is supposed to be the default implementation of index, +-- from GHC.Arr +-- myindex b i | inRange b i = unsafeIndex b i +-- | otherwise = error "Error in array index" + +matA :: MatrixA s -> VectorA s -> VectorA s -> ST s (VectorA s) +(m `matA` v) tmp = m `seq` v `seq` tmp `seq` l 1 1 0 + where l !i !j !s | i>n = return tmp + l i j s | j>n = mywriteArray tmp i s >> l (i+1) 1 0 + l i j s = do a<-myreadArray m (i,j) + b<-myreadArray v j + l i (j+1) (s+a*b) + +loopA a p q n | n==0 = return q +loopA a p q n = do + (a `matA` p) q + loopA a p q (n-1) + +testA c = runSTUArray (do + aA <- newListArray ((1,1),(n,n)) (concat a) + pA <- newListArray (1,n) p + qA <- newArray (1,n) 0 + loopA aA pA qA c + ) + +main = print $ testA 100_000 ===================================== testsuite/tests/perf/should_run/T1216.stdout ===================================== @@ -0,0 +1 @@ +array (1,40) [(1,1.0),(2,2.0),(3,3.0),(4,4.0),(5,5.0),(6,6.0),(7,7.0),(8,8.0),(9,9.0),(10,10.0),(11,11.0),(12,12.0),(13,13.0),(14,14.0),(15,15.0),(16,16.0),(17,17.0),(18,18.0),(19,19.0),(20,20.0),(21,21.0),(22,22.0),(23,23.0),(24,24.0),(25,25.0),(26,26.0),(27,27.0),(28,28.0),(29,29.0),(30,30.0),(31,31.0),(32,32.0),(33,33.0),(34,34.0),(35,35.0),(36,36.0),(37,37.0),(38,38.0),(39,39.0),(40,40.0)] ===================================== testsuite/tests/perf/should_run/all.T ===================================== @@ -112,6 +112,13 @@ test('T149', ], makefile_test, ['T149']) +test ('T1216', + [collect_stats('bytes allocated',5), + only_ways(['normal']) + ], + compile_and_run, + ['-O']) + test('T5113', [collect_stats('bytes allocated',5), only_ways(['normal']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b85a02933a1e7c884b19de1b7af9509… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b85a02933a1e7c884b19de1b7af9509… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] compiler: implement string interning logic for BCONPtrFS
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: d054b467 by Cheng Shao at 2026-03-11T15:05:59-04:00 compiler: implement string interning logic for BCONPtrFS This patch adds a `FastStringEnv`-based cache of `MallocStrings` requests to `Interp`, so that when we load bytecode with many breakpoints that share the same module names & unit ids, we reuse the allocated remote pointers instead of issuing duplicte `MallocStrings` requests and bloating the C heap. Closes #26995. - - - - - 4 changed files: - compiler/GHC/ByteCode/Linker.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Runtime/Interpreter/Init.hs - compiler/GHC/Runtime/Interpreter/Types.hs Changes: ===================================== compiler/GHC/ByteCode/Linker.hs ===================================== @@ -42,6 +42,7 @@ import qualified GHC.Types.Id as Id import GHC.Types.Unique.DFM -- Standard libraries +import Control.Concurrent import Data.Array.Unboxed import Foreign.Ptr import GHC.Exts @@ -87,9 +88,12 @@ lookupLiteral interp pkgs_loaded bytecode_state ptr = case ptr of BCONPtrStr bs -> do RemotePtr p <- fmap head $ interpCmd interp $ MallocStrings [bs] pure $ fromIntegral p - BCONPtrFS fs -> do - RemotePtr p <- fmap head $ interpCmd interp $ MallocStrings [bytesFS fs] - pure $ fromIntegral p + BCONPtrFS fs -> modifyMVar (interpStringCache interp) $ \fs_env -> + case lookupFsEnv fs_env fs of + Just (RemotePtr p) -> pure (fs_env, fromIntegral p) + Nothing -> do + rp@(RemotePtr p) <- fmap head $ interpCmd interp $ MallocStrings [bytesFS fs] + pure (extendFsEnv fs_env fs rp, fromIntegral p) BCONPtrFFIInfo (FFIInfo {..}) -> do RemotePtr p <- interpCmd interp $ PrepFFI ffiInfoArgs ffiInfoRet pure $ fromIntegral p ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -2845,7 +2845,7 @@ hscCompileCoreExpr' hsc_env srcspan ds_expr = do case interp of -- always generate JS code for the JS interpreter (no bytecode!) - Interp (ExternalInterp (ExtJS i)) _ _ -> + Interp { interpInstance = ExternalInterp (ExtJS i) } -> jsCodeGen hsc_env srcspan i this_mod stg_binds_with_deps binding_id _ -> do ===================================== compiler/GHC/Runtime/Interpreter/Init.hs ===================================== @@ -9,6 +9,7 @@ where import GHC.Prelude +import GHC.Data.FastString.Env import GHC.Driver.DynFlags import GHC.Platform import GHC.Platform.Ways @@ -71,6 +72,8 @@ initInterpreter dflags tmpfs logger platform finder_cache unit_env opts = do lookup_cache <- liftIO $ mkInterpSymbolCache + fs_cache <- liftIO $ newMVar emptyFsEnv + -- see Note [Target code interpreter] if #if !defined(wasm32_HOST_ARCH) @@ -100,7 +103,7 @@ initInterpreter dflags tmpfs logger platform finder_cache unit_env opts = do , wasmInterpHsSoSuffix = way_tag ++ dynLibSuffix (interpNameVer opts) , wasmInterpUnitState = ue_homeUnitState unit_env } - pure $ Just $ Interp (ExternalInterp $ ExtWasm $ ExtInterpState cfg s) loader lookup_cache + pure $ Just $ Interp (ExternalInterp $ ExtWasm $ ExtInterpState cfg s) loader lookup_cache fs_cache #endif -- JavaScript interpreter @@ -119,7 +122,7 @@ initInterpreter dflags tmpfs logger platform finder_cache unit_env opts = do , jsInterpFinderOpts = interpFinderOpts opts , jsInterpFinderCache = finder_cache } - return (Just (Interp (ExternalInterp (ExtJS (ExtInterpState cfg s))) loader lookup_cache)) + return (Just (Interp (ExternalInterp (ExtJS (ExtInterpState cfg s))) loader lookup_cache fs_cache)) -- external interpreter | interpExternal opts @@ -146,7 +149,7 @@ initInterpreter dflags tmpfs logger platform finder_cache unit_env opts = do } s <- liftIO $ newMVar InterpPending loader <- liftIO Loader.uninitializedLoader - return (Just (Interp (ExternalInterp (ExtIServ (ExtInterpState conf s))) loader lookup_cache)) + return (Just (Interp (ExternalInterp (ExtIServ (ExtInterpState conf s))) loader lookup_cache fs_cache)) -- Internal interpreter | otherwise @@ -154,7 +157,7 @@ initInterpreter dflags tmpfs logger platform finder_cache unit_env opts = do #if defined(HAVE_INTERNAL_INTERPRETER) do loader <- liftIO Loader.uninitializedLoader - return (Just (Interp InternalInterp loader lookup_cache)) + return (Just (Interp InternalInterp loader lookup_cache fs_cache)) #else return Nothing #endif ===================================== compiler/GHC/Runtime/Interpreter/Types.hs ===================================== @@ -47,6 +47,7 @@ import GHC.Linker.Types import GHCi.RemoteTypes import GHCi.Message ( Pipe ) +import GHC.Data.FastString.Env import GHC.Platform #if defined(HAVE_INTERNAL_INTERPRETER) import GHC.Platform.Ways @@ -75,6 +76,9 @@ data Interp = Interp , interpSymbolCache :: !InterpSymbolCache -- ^ LookupSymbol cache + + , interpStringCache :: !(MVar (FastStringEnv (RemotePtr ()))) + -- ^ MallocStrings cache } data InterpInstance View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d054b4676298ea2189cd48fcf175676… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d054b4676298ea2189cd48fcf175676… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 7 commits: Add regression test for #12694
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: e7054934 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #12694 Closes #12694. - - - - - 4756d9f6 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #16275 Closes #16275. - - - - - 34b7e2c1 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #14908 Closes #14908. - - - - - 4243db3d by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #14151 Closes #14151. - - - - - 0e9f1453 by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #12640 Closes #12640. - - - - - ae606c7f by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #15588 Closes #15588. - - - - - 5a38ce4e by Simon Jakobi at 2026-03-11T15:05:16-04:00 Add regression test for #9445 Closes #9445. - - - - - 18 changed files: - + testsuite/tests/dependent/should_fail/T15588.hs - + testsuite/tests/dependent/should_fail/T15588.stderr - testsuite/tests/dependent/should_fail/all.T - + testsuite/tests/simplCore/should_compile/T12640.hs - + testsuite/tests/simplCore/should_compile/T12640.stderr - + testsuite/tests/simplCore/should_compile/T14908.hs - + testsuite/tests/simplCore/should_compile/T14908_Deps.hs - + testsuite/tests/simplCore/should_compile/T9445.hs - testsuite/tests/simplCore/should_compile/all.T - + testsuite/tests/typecheck/should_compile/T14151.hs - testsuite/tests/typecheck/should_compile/all.T - + testsuite/tests/typecheck/should_fail/T12694.hs - + testsuite/tests/typecheck/should_fail/T12694.stderr - + testsuite/tests/typecheck/should_fail/T16275.stderr - + testsuite/tests/typecheck/should_fail/T16275A.hs - + testsuite/tests/typecheck/should_fail/T16275B.hs - + testsuite/tests/typecheck/should_fail/T16275B.hs-boot - testsuite/tests/typecheck/should_fail/all.T Changes: ===================================== testsuite/tests/dependent/should_fail/T15588.hs ===================================== @@ -0,0 +1,25 @@ +{- This program used to cause a panic (#15588), but it should possibly even be +accepted. See #15589. -} +{-# LANGUAGE AllowAmbiguousTypes #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} +module T15588 where + +import Data.Proxy +import Data.Type.Equality +import Data.Type.Bool +import Data.Kind + +data SameKind :: forall k. k -> k -> Type +type family IfK (e :: Proxy (j :: Bool)) (f :: m) (g :: n) :: If j m n where + IfK (_ :: Proxy True) f _ = f + IfK (_ :: Proxy False) _ g = g + +y :: forall ck (c :: ck). ck :~: Proxy True -> () +y Refl = let x :: forall a b (d :: a). SameKind (IfK c b d) d + x = undefined + in () + ===================================== testsuite/tests/dependent/should_fail/T15588.stderr ===================================== @@ -0,0 +1,7 @@ +T15588.hs:18:9: error: [GHC-25897] + • Couldn't match kind ‘j’ with ‘True’ + Expected kind ‘Proxy j’, + but ‘_ :: Proxy True’ has kind ‘Proxy True’ + • In the first argument of ‘IfK’, namely ‘(_ :: Proxy True)’ + In the type family declaration for ‘IfK’ + ===================================== testsuite/tests/dependent/should_fail/all.T ===================================== @@ -34,6 +34,7 @@ test('T15215', normal, compile_fail, ['']) test('T15308', normal, compile_fail, ['-fno-print-explicit-kinds']) test('T15343', normal, compile_fail, ['']) test('T15380', normal, compile_fail, ['']) +test('T15588', normal, compile_fail, ['']) test('T15591b', normal, compile_fail, ['']) test('T15591c', normal, compile_fail, ['']) test('T15743c', normal, compile_fail, ['']) ===================================== testsuite/tests/simplCore/should_compile/T12640.hs ===================================== @@ -0,0 +1,18 @@ +{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies #-} +module T12640 where + +class Ex2 a b c | a b -> c where + (+++) :: a -> b -> c + +instance Ex2 Bool Bool Bool where + (+++) = ex_or + +{-# INLINE [2] ex_or #-} +ex_or = (||) + +{-# RULES +"force-inline" forall a b . ex_or a b = a || b + #-} + +main = print (True +++ True) + ===================================== testsuite/tests/simplCore/should_compile/T12640.stderr ===================================== @@ -0,0 +1,2 @@ +Rule fired: Class op show (BUILTIN) +Rule fired: force-inline (T12640) ===================================== testsuite/tests/simplCore/should_compile/T14908.hs ===================================== @@ -0,0 +1,58 @@ +{-# LANGUAGE OverloadedStrings, LambdaCase #-} +import Data.String +import T14908_Deps +import Data.List (nub, sort) +import System.Environment + +data Expr = Var String | Not Expr | Expr :|: Expr | Expr :&: Expr deriving Eq + +nfd e = if e == e' then e else nfd e' + where e' = rec e + rec x@(Var _) = x + rec x@(Not (Var _)) = x + rec (Not (Not x)) = x + rec (Not (a :|: b)) = rec $ Not a :&: Not b + rec (Not (a :&: b)) = rec $ Not a :|: Not b + rec ((a :|: b) :&: c) = rec $ (a :&: c) :|: (b :&: c) + rec (a :&: (b :|: c)) = rec $ (a :&: b) :|: (a :&: c) + rec (a :&: b) = rec a :&: rec b + rec (a :|: b) = rec a :|: rec b + +eval :: Expr -> Reader [(String, Bool)] Bool +eval (Var x) = asks (lookup x) >>= maybe (error $ "Var `" ++ x ++ "` not defined!") return +eval (Not x) = not <$> eval x +eval (a :&: b) = (&&) <$> eval a <*> eval b +eval (a :|: b) = (||) <$> eval a <*> eval b + +instance Show Expr where + show (Var x) = x + show (Not (Var x)) = "¬" ++ x + show (Not x) = "¬(" ++ show x ++ ")" + show (a :|: b) = show' a ++ " ∨ " ++ show' b where show' c@(_ :&: _) = "(" ++ show c ++ ")"; show' c = show c + show (a :&: b) = show' a ++ " ∧ " ++ show' b where show' c@(_ :|: _) = "(" ++ show c ++ ")"; show' c = show c + +instance IsString Expr where + fromString = Var + +fullImage e = (runReader (eval e) . zipWith (,) vs) <$> bits (length vs) + where vs = nub $ sort $ vars e + vars (Var x) = [x] + vars (Not x) = vars x + vars (a :&: b) = vars a ++ vars b + vars (a :|: b) = vars a ++ vars b + bits 0 = [[]] + bits n = ((False:) <$> xs) ++ ((True:) <$> xs) where xs = bits (n - 1) + +testNFD e = fullImage e == fullImage (nfd e) + +instance Arbitrary Expr where + arbitrary = sized gen + where gen n = choose (1, max 1 (min 4 n)) >>= \case + 1 -> (Var . (:"") . (['a'..]!!)) <$> choose (1, 5) -- no más de 5 vars + 2 -> (:&:) <$> gen (n-1) <*> gen (n-1) + 3 -> (:|:) <$> gen (n-1) <*> gen (n-1) + 4 -> Not <$> gen (n-1) + +main = do + [a,b] <- map (read :: String -> Int) <$> getArgs + quickCheckWith (stdArgs {maxSize = fromIntegral 10, maxSuccess = fromIntegral 1000}) testNFD ===================================== testsuite/tests/simplCore/should_compile/T14908_Deps.hs ===================================== @@ -0,0 +1,100 @@ +module T14908_Deps + ( Reader + , runReader + , asks + , Arbitrary(..) + , Gen + , sized + , choose + , Args(..) + , stdArgs + , quickCheckWith + ) where + +import System.CPUTime (getCPUTime) + +newtype Reader r a = Reader { runReader :: r -> a } + +instance Functor (Reader r) where + fmap f (Reader g) = Reader (f . g) + +instance Applicative (Reader r) where + pure x = Reader (\_ -> x) + Reader f <*> Reader g = Reader (\r -> f r (g r)) + +instance Monad (Reader r) where + return = pure + Reader g >>= f = Reader (\r -> runReader (f (g r)) r) + +asks :: (r -> a) -> Reader r a +asks f = Reader f + +newtype Gen a = Gen { runGen :: Int -> Int -> (a, Int) } + +instance Functor Gen where + fmap f (Gen g) = Gen $ \n s -> + let (x, s') = g n s + in (f x, s') + +instance Applicative Gen where + pure x = Gen (\_ s -> (x, s)) + Gen f <*> Gen g = Gen $ \n s -> + let (h, s1) = f n s + (x, s2) = g n s1 + in (h x, s2) + +instance Monad Gen where + return = pure + Gen g >>= f = Gen $ \n s -> + let (x, s1) = g n s + in runGen (f x) n s1 + +class Arbitrary a where + arbitrary :: Gen a + +sized :: (Int -> Gen a) -> Gen a +sized f = Gen $ \n s -> runGen (f n) n s + +choose :: (Int, Int) -> Gen Int +choose (lo, hi) = Gen $ \_ s -> + let s' = nextSeed s + width = hi - lo + 1 + offset = if width <= 0 then 0 else abs s' `mod` width + in (lo + offset, s') + +data Args = Args + { maxSize :: Int + , maxSuccess :: Int + } + +stdArgs :: Args +stdArgs = Args + { maxSize = 100 + , maxSuccess = 100 + } + +quickCheckWith :: (Arbitrary a, Show a) => Args -> (a -> Bool) -> IO () +quickCheckWith args prop = do + seed0 <- seedFromCPUTime + loop 0 seed0 + where + total = max 0 (maxSuccess args) + maxN = max 1 (maxSize args) + + loop n seed + | n >= total = putStrLn ("+++ OK, passed " ++ show total ++ " tests.") + | otherwise = + let size = (n `mod` maxN) + 1 + (x, seed') = runGen arbitrary size seed + in if prop x + then loop (n + 1) seed' + else putStrLn ("*** Failed! Falsified with input: " ++ show x) + +seedFromCPUTime :: IO Int +seedFromCPUTime = do + t <- getCPUTime + return (fromInteger (t `mod` 2147483647)) + +nextSeed :: Int -> Int +nextSeed x = + fromInteger ((1103515245 * toInteger x + 12345) `mod` 2147483647) ===================================== testsuite/tests/simplCore/should_compile/T9445.hs ===================================== @@ -0,0 +1,13 @@ +module T9445 (Transform) where + +data Transform = Transform + { m00 :: !Float, m10 :: !Float, m20 :: !Float + , m01 :: !Float, m11 :: !Float, m21 :: !Float + , m02 :: !Float, m12 :: !Float, m22 :: !Float + } + +instance Num Transform where + abs (Transform a00 a01 a02 a03 a04 a05 a06 a07 a08) = + (Transform (abs a00) (abs a01) (abs a02) (abs a03) + (abs a04) (abs a05) (abs a06) (abs a07) (abs a08)) + ===================================== testsuite/tests/simplCore/should_compile/all.T ===================================== @@ -190,6 +190,7 @@ test('T9400', only_ways(['optasm']), compile, ['-O0 -ddump-simpl -dsuppress-uniq test('T9441a', [only_ways(['optasm']), check_errmsg(r'f1 = f2') ], compile, ['-ddump-simpl -dsuppress-ticks']) test('T9441b', [only_ways(['optasm']), check_errmsg(r'Rec {') ], compile, ['-ddump-simpl']) test('T9441c', [only_ways(['optasm']), check_errmsg(r'Rec {') ], compile, ['-ddump-simpl']) +test('T9445', only_ways(['optasm']), compile, ['-Wno-missing-methods']) test('T9583', only_ways(['optasm']), compile, ['']) test('T9565', only_ways(['optasm']), compile, ['']) test('T5821', only_ways(['optasm']), compile, ['']) @@ -227,6 +228,7 @@ test('T9509', test('T12603', normal, makefile_test, ['T12603']) +test('T12640', [grep_errmsg(r'force-inline')], compile, ['-O2 -ddump-rule-firings']) test('T12877', normal, makefile_test, ['T12877']) test('T13027', normal, compile, ['']) test('T13025', @@ -279,6 +281,7 @@ test('T14152a', [extra_files(['T14152.hs']), pre_cmd('cp T14152.hs T14152a.hs'), compile, ['-fno-exitification -ddump-simpl']) test('T13990', normal, compile, ['-dcore-lint -O']) test('T14650', normal, compile, ['-O2']) +test('T14908', normal, multimod_compile, ['T14908', '-O2 -v0']) test('T14959', normal, compile, ['-O']) test('T14978', normal, ===================================== testsuite/tests/typecheck/should_compile/T14151.hs ===================================== @@ -0,0 +1,20 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE KindSignatures #-} +{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE RankNTypes #-} +module T14151 where + +newtype HFix h a = HFix (h (HFix h) a) + +class EqForall f where + eqForall :: f a -> f a -> Bool + +class EqHetero h where + eqHetero :: (forall x. f x -> f x -> Bool) -> h f a -> h f a -> Bool + +instance EqHetero h => EqForall (HFix h) where + eqForall (HFix a) (HFix b) = eqHetero eqForall a b + +instance EqHetero h => Eq (HFix h a) where + (==) = eqForall ===================================== testsuite/tests/typecheck/should_compile/all.T ===================================== @@ -601,6 +601,7 @@ test('T13915b', expect_broken(15245), compile, ['']) test('T13984', normal, compile, ['']) test('T14128', normal, multimod_compile, ['T14128Main', '-v0']) test('T14149', normal, compile_fail, ['']) +test('T14151', normal, compile, ['']) test('T14154', normal, compile, ['']) test('T14158', normal, compile, ['']) test('T13943', normal, compile, ['-fsolve-constant-dicts']) ===================================== testsuite/tests/typecheck/should_fail/T12694.hs ===================================== @@ -0,0 +1,5 @@ +{-# LANGUAGE GADTs #-} +module T12694 where + +f :: Bool ~ Int => a -> b +f x = x ===================================== testsuite/tests/typecheck/should_fail/T12694.stderr ===================================== @@ -0,0 +1,20 @@ +T12694.hs:5:7: error: [GHC-25897] + • Could not deduce ‘a ~ b’ + from the context: Bool ~ Int + bound by the type signature for: + f :: forall a b. (Bool ~ Int) => a -> b + at T12694.hs:4:1-25 + ‘a’ is a rigid type variable bound by + the type signature for: + f :: forall a b. (Bool ~ Int) => a -> b + at T12694.hs:4:1-25 + ‘b’ is a rigid type variable bound by + the type signature for: + f :: forall a b. (Bool ~ Int) => a -> b + at T12694.hs:4:1-25 + • In the expression: x + In an equation for ‘f’: f x = x + • Relevant bindings include + x :: a (bound at T12694.hs:5:3) + f :: a -> b (bound at T12694.hs:5:1) + ===================================== testsuite/tests/typecheck/should_fail/T16275.stderr ===================================== @@ -0,0 +1,5 @@ +T16275B.hs-boot:4:10: error: [GHC-65507] + • Wildcard ‘_’ not allowed + • In the first argument of ‘T’, namely ‘_’ + In the type signature: foo :: T _ + ===================================== testsuite/tests/typecheck/should_fail/T16275A.hs ===================================== @@ -0,0 +1,3 @@ +module T16275A where + +import {-# SOURCE #-} T16275B ===================================== testsuite/tests/typecheck/should_fail/T16275B.hs ===================================== @@ -0,0 +1 @@ +module T16275B where ===================================== testsuite/tests/typecheck/should_fail/T16275B.hs-boot ===================================== @@ -0,0 +1,4 @@ +module T16275B where + +data T a +foo :: T _ ===================================== testsuite/tests/typecheck/should_fail/all.T ===================================== @@ -430,6 +430,7 @@ test('T12589', normal, compile_fail, ['']) test('T12529', normal, compile_fail, ['']) test('T12563', normal, compile, ['']) # Turns out we can accept this one after all! test('T12648', normal, compile_fail, ['']) +test('T12694', normal, compile_fail, ['']) test('T12729', normal, compile_fail, ['']) test('T12785b', normal, compile_fail, ['']) test('T12803', normal, compile_fail, ['']) @@ -518,6 +519,8 @@ test('T16059e', [extra_files(['T16059b.hs'])], multimod_compile_fail, ['T16059e', '-v0']) test('T16255', normal, compile_fail, ['']) test('T16204c', normal, compile_fail, ['']) +test('T16275', [extra_files(['T16275A.hs', 'T16275B.hs', 'T16275B.hs-boot'])], + multimod_compile_fail, ['T16275A', '-v0']) test('T16394', normal, compile_fail, ['']) test('T16414', normal, compile_fail, ['']) test('T16453E1', extra_files(['T16453T.hs', 'T16453S.hs']), multimod_compile_fail, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d3690ae808d75f63a2f682bb44a7af… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d3690ae808d75f63a2f682bb44a7af… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] User guide: Clarify phase control on INLINEABLE[foo] pragmas.
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: d3690ae8 by Andreas Klebinger at 2026-03-11T15:04:31-04:00 User guide: Clarify phase control on INLINEABLE[foo] pragmas. Fixes #26851 - - - - - 2 changed files: - docs/users_guide/exts/pragmas.rst - docs/users_guide/exts/rewrite_rules.rst Changes: ===================================== docs/users_guide/exts/pragmas.rst ===================================== @@ -570,6 +570,12 @@ optionally specify a phase number, thus: - "``NOINLINE[~k] f``" means: be willing to inline ``f`` until phase ``k``, but from phase ``k`` onwards do not inline it. +- "``INLINEABLE[k] f``" means: do not inline ``f`` until phase ``k``, but + from phase ``k`` onwards GHC is free to inline it. + +- "``INLINEABLE[~k] f``" means: GHC is free to inline ``f`` until phase + ``k``, but from phase ``k`` onwards do not inline it. + The same information is summarised here: .. code-block:: none @@ -579,6 +585,8 @@ The same information is summarised here: {-# INLINE [~2] f #-} -- Yes No {-# NOINLINE [2] f #-} -- No Maybe {-# NOINLINE [~2] f #-} -- Maybe No + {-# INLINEABLE [2] f #-} -- No Maybe + {-# INLINEABLE [~2] f #-} -- Maybe No {-# INLINE f #-} -- Yes Yes {-# NOINLINE f #-} -- No No ===================================== docs/users_guide/exts/rewrite_rules.rst ===================================== @@ -293,6 +293,16 @@ its :pragma:`RULES` have had a chance to fire. The warning flag :ghc-flag:`-Winline-rule-shadowing` (see :ref:`options-sanity`) warns about this situation. +All of this applies similarly to :pragma:`INLINABLE` (also accepted as +``INLINABLE``; see :ref:`inline-noinline-pragma`). As with +the other pragmas, you can use explicit :ref:`phase-control` to delay +inlining so that a :pragma:`RULES` rewrite has an opportunity to match first. + +The key difference from :pragma:`INLINE` (see :ref:`inline-pragma`) is that +:pragma:`INLINABLE` does not guarantee inlining, leaving the inlining decision +to GHC's usual heuristics. Use :pragma:`INLINE` when your RULE setup relies +on inlining happening reliably, and :pragma:`INLINABLE` otherwise. + .. _conlike: How rules interact with ``CONLIKE`` pragmas @@ -528,4 +538,3 @@ Controlling what's going on in rewrite rules see how to write rules that will do fusion and yet give an efficient program even if fusion doesn't happen. More rules in ``GHC/List.hs``. - View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d3690ae808d75f63a2f682bb44a7af8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d3690ae808d75f63a2f682bb44a7af8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 3 commits: Ensure T14272 is run in optasm way
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: fff362cf by Simon Jakobi at 2026-03-11T15:03:49-04:00 Ensure T14272 is run in optasm way Closes #16539. - - - - - ec81ec2c by Simon Jakobi at 2026-03-11T15:03:49-04:00 Add regression test for #24632 Closes #24632. - - - - - cefec47b by Simon Jakobi at 2026-03-11T15:03:50-04:00 Fix module name of T9675: T6975 -> T9675 - - - - - 6 changed files: - + testsuite/tests/ghci/scripts/T24632.hs - + testsuite/tests/ghci/scripts/T24632.script - + testsuite/tests/ghci/scripts/T24632.stdout - testsuite/tests/ghci/scripts/all.T - testsuite/tests/perf/compiler/T9675.hs - testsuite/tests/simplCore/should_compile/all.T Changes: ===================================== testsuite/tests/ghci/scripts/T24632.hs ===================================== @@ -0,0 +1,22 @@ +{-# LANGUAGE GADTs #-} +{-# LANGUAGE DataKinds #-} + +module T24632 where + +import GHC.TypeLits +import Data.Proxy + +data N (n :: Nat) where + O :: (n ~ 0) => N n + S :: (1 <= n) => N n + +f :: forall n. KnownNat n => (1 <= n => N n) -> N n +f c = case cmpNat @1 @n Proxy Proxy of EQI -> c + +g :: KnownNat n => N n +g = f S + +--x :: N 1 -- With type signature: no issue +x = g @1 + +-- ghci> :force x --> internal error: stg_ap_p_ret ===================================== testsuite/tests/ghci/scripts/T24632.script ===================================== @@ -0,0 +1,2 @@ +:load T24632.hs +seq x () ===================================== testsuite/tests/ghci/scripts/T24632.stdout ===================================== @@ -0,0 +1 @@ +() ===================================== testsuite/tests/ghci/scripts/all.T ===================================== @@ -384,6 +384,7 @@ test('T13869', extra_files(['T13869a.hs', 'T13869b.hs']), ghci_script, ['T13869. test('ListTuplePunsPpr', normal, ghci_script, ['ListTuplePunsPpr.script']) test('ListTuplePunsPprNoAbbrevTuple', [expect_broken(23135), limit_stdout_lines(13)], ghci_script, ['ListTuplePunsPprNoAbbrevTuple.script']) test('T24459', normal, ghci_script, ['T24459.script']) +test('T24632', normal, ghci_script, ['T24632.script']) # Test package renaming in GHCi session test('GhciPackageRename', ===================================== testsuite/tests/perf/compiler/T9675.hs ===================================== @@ -1,4 +1,4 @@ -module T6975 where +module T9675 where data Foo = Foo { field1 :: Int -> Int , field2 :: Int -> Int ===================================== testsuite/tests/simplCore/should_compile/all.T ===================================== @@ -270,7 +270,8 @@ test('T14140', normal, makefile_test, ['T14140']) -test('T14272', normal, compile, ['']) +# T14272 used to cause a compiler heap overflow in optasm: #16539 +test('T14272', only_ways(['optasm']), compile, ['']) test('T14270a', normal, compile, ['']) test('T14152', [ only_ways(['optasm']), check_errmsg(r'dead code') ], compile, ['-ddump-simpl']) test('T14152a', [extra_files(['T14152.hs']), pre_cmd('cp T14152.hs T14152a.hs'), View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/517cf64e88567383017c0307d3c4f3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/517cf64e88567383017c0307d3c4f3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Add regression test for #15907
by Marge Bot (＠marge-bot) 11 Mar '26

11 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 517cf64e by Simon Jakobi at 2026-03-11T15:03:03-04:00 Add regression test for #15907 Closes #15907. - - - - - 3 changed files: - + testsuite/tests/corelint/T15907.hs - + testsuite/tests/corelint/T15907A.hs - testsuite/tests/corelint/all.T Changes: ===================================== testsuite/tests/corelint/T15907.hs ===================================== @@ -0,0 +1,11 @@ +module T15907 where + +import T15907A + +testMemo :: IO () +testMemo = do + let keys = [[1 .. n] | n <- [1 .. 1000]] + keys2 = [[n, n - 1 .. 1] | n <- [1 .. 1000]] + mlength = memo length + putStr (show (map mlength (keys ++ keys ++ keys2 ++ keys2))) + putStr (show (mlength [1 .. 100000])) ===================================== testsuite/tests/corelint/T15907A.hs ===================================== @@ -0,0 +1,92 @@ +module T15907A + ( memo + , memoSized + ) where + +import Control.Concurrent.MVar (MVar, newMVar, putMVar, takeMVar) +import Data.Array.IO (IOArray, newArray, readArray, writeArray) +import System.IO.Unsafe (unsafePerformIO) +import System.Mem.StableName (StableName, hashStableName, makeStableName) +import System.Mem.Weak (Weak, deRefWeak, finalize, mkWeak, mkWeakPtr) + +type MemoTable key val = + MVar + ( Int + , IOArray Int [MemoEntry key val] + ) + +data MemoEntry key val = MemoEntry !(StableName key) !(Weak val) + +memo :: (a -> b) -> a -> b +memo f = memoSized defaultTableSize f + +defaultTableSize :: Int +defaultTableSize = 1001 + +memoSized :: Int -> (a -> b) -> a -> b +memoSized size f = strict (lazyMemoSized size f) + +strict :: (a -> b) -> a -> b +strict = ($!) + +lazyMemoSized :: Int -> (a -> b) -> a -> b +lazyMemoSized size f = + let (table, weak) = + unsafePerformIO $ do + tbl <- newArray (0, size) [] + mvar <- newMVar (size, tbl) + weak <- mkWeakPtr mvar (Just (tableFinalizer tbl size)) + pure (mvar, weak) + in memo' f table weak + +tableFinalizer :: IOArray Int [MemoEntry key val] -> Int -> IO () +tableFinalizer table size = + sequence_ [finalizeBucket i | i <- [0 .. size]] + where + finalizeBucket i = do + bucket <- readArray table i + sequence_ [finalize w | MemoEntry _ w <- bucket] + +memo' :: (a -> b) -> MemoTable a b -> Weak (MemoTable a b) -> a -> b +memo' f ref weakRef = \k -> unsafePerformIO $ do + stableKey <- makeStableName k + (size, table) <- takeMVar ref + let hashKey = hashStableName stableKey `mod` size + bucket <- readArray table hashKey + lkp <- lookupSN stableKey bucket + case lkp of + Just result -> do + putMVar ref (size, table) + pure result + Nothing -> do + let result = f k + weak <- mkWeak k result (Just (finalizer hashKey stableKey weakRef)) + writeArray table hashKey (MemoEntry stableKey weak : bucket) + putMVar ref (size, table) + pure result + +finalizer :: Int -> StableName a -> Weak (MemoTable a b) -> IO () +finalizer hashKey stableKey weakRef = do + r <- deRefWeak weakRef + case r of + Nothing -> pure () + Just mvar -> do + (size, table) <- takeMVar mvar + bucket <- readArray table hashKey + let newBucket = + [ e + | e@(MemoEntry sn _) <- bucket + , sn /= stableKey + ] + writeArray table hashKey newBucket + putMVar mvar (size, table) + +lookupSN :: StableName key -> [MemoEntry key val] -> IO (Maybe val) +lookupSN sn [] = sn `seq` pure Nothing +lookupSN sn (MemoEntry sn' weak : xs) + | sn == sn' = do + maybeItem <- deRefWeak weak + case maybeItem of + Nothing -> error ("dead weak pair: " ++ show (hashStableName sn)) + Just v -> pure (Just v) + | otherwise = lookupSN sn xs ===================================== testsuite/tests/corelint/all.T ===================================== @@ -1,4 +1,5 @@ +test('T15907', only_ways(['normal']), multimod_compile, ['T15907', '-O -dannot-lint -v0']) test('T21115', normal, compile_fail, ['']) test('T21115b', req_th, compile_fail, ['-dsuppress-uniques -dsuppress-all']) test('T21152', normal, compile, ['-g3']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/517cf64e88567383017c0307d3c4f32… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/517cf64e88567383017c0307d3c4f32… You're receiving this email because of your account on gitlab.haskell.org.

1 0