March 2026 - ghc-commits

[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] 18 commits: packaging: correctly propagate build/host/target to bindist configure script
by Sven Tennie (＠supersven) 06 Mar '26

06 Mar '26

Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: d8c7ae82 by Matthew Pickering at 2026-03-06T18:18:53+00:00 packaging: correctly propagate build/host/target to bindist configure script At the moment the host and target which we will produce a compiler for is fixed at the initial configure time. Therefore we need to persist the choice made at this time into the installation bindist as well so we look for the right tools, with the right prefixes at install time. In the future, we want to provide a bit more control about what kind of bindist we produce so the logic about what the host/target will have to be written by hadrian rather than persisted by the configure script. In particular with cross compilers we want to either build a normal stage 2 cross bindist or a stage 3 bindist, which creates a bindist which has a native compiler for the target platform. Fixes #21970 - - - - - 0c829587 by Matthew Pickering at 2026-03-06T18:18:53+00:00 hadrian: Fill in more of the default.host toolchain file When you are building a cross compiler this file will be used to build stage1 and it's libraries, so we need enough information here to work accurately. There is still more work to be done (see for example, word size is still fixed). - - - - - 5b5a6ca4 by Matthew Pickering at 2026-03-06T18:18:53+00:00 hadrian: Disable docs when cross compiling Before there were a variety of ad-hoc places where doc building was disabled when cross compiling. * Some CI jobs sets --docs=none in gen_ci.hs * Some CI jobs set --docs=none in .gitlab/ci.sh * There was some logic in hadrian to not need the ["docs"] target when making a bindist. Now the situation is simple: * If you are cross compiling then defaultDocsTargets is empty by default. In theory, there is no reason why we can't build documentation for cross compiler bindists, but this is left to future work to generalise the documentation building rules to allow this (#24289) - - - - - 7299194d by Matthew Pickering at 2026-03-06T18:44:59+00:00 hadrian: Build stage 2 cross compilers * Most of hadrian is abstracted over the stage in order to remove the assumption that the target of all stages is the same platform. This allows the RTS to be built for two different targets for example. * Abstracts the bindist creation logic to allow building either normal or cross bindists. Normal bindists use stage 1 libraries and a stage 2 compiler. Cross bindists use stage 2 libararies and a stage 2 compiler. * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 New hadrian target: * `binary-dist-dir-cross`: Build a cross compiler bindist (compiler = stage 1, libraries = stage 2) This commit also contains various changes to make stage2 compilers feasible. ------------------------- Metric Decrease: ManyAlternatives MultiComponentModulesRecomp MultiLayerModulesRecomp T10421 T12425 T12707 T13035 T13379 T15703 T16577 T18698a T18698b T18923 T1969 T21839c T3294 T4801 T5030 T5321Fun T5642 T783 T9198 T9872d T9961 parsing001 T5321FD T6048 T12227 T18140 T18282 T9233 T5631 T9630 ------------------------- Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> Fix rebase: settings-use-distro-mingw is now staged - - - - - e29870c1 by Matthew Pickering at 2026-03-06T18:44:59+00:00 ci: Test cross bindists We remove the special logic for testing in-tree cross compilers and instead test cross compiler bindists, like we do for all other platforms. - - - - - 16bebd8d by Matthew Pickering at 2026-03-06T18:44:59+00:00 ci: Introduce CROSS_STAGE variable In preparation for building and testing stage3 bindists we introduce the CROSS_STAGE variable which is used by a CI job to determine what kind of bindist the CI job should produce. At the moment we are only using CROSS_STAGE=2 but in the future we will have some jobs which set CROSS_STAGE=3 to produce native bindists for a target, but produced by a cross compiler, which can be tested on by another CI job on the native platform. CROSS_STAGE=2: Build a normal cross compiler bindist CROSS_STAGE=3: Build a stage 3 bindist, one which is a native compiler and library for the target - - - - - 355c7588 by Matthew Pickering at 2026-03-06T18:44:59+00:00 hadrian: Refactor system-cxx-std-lib rules0 I noticed a few things wrong with the hadrian rules for `system-cxx-std-lib` rules. * For `text` there is an ad-hoc check to depend on `system-cxx-std-lib` outside of `configurePackage`. * The `system-cxx-std-lib` dependency is not read from cabal files. * Recache is not called on the packge database after the `.conf` file is generated, a more natural place for this rule is `registerRules`. Treating this uniformly like other packages is complicated by it not having any source code or a cabal file. However we can do a bit better by reporting the dependency firstly in `PackageData` and then needing the `.conf` file in the same place as every other package in `configurePackage`. Fixes #25303 - - - - - 562e6c2b by Sven Tennie at 2026-03-06T18:44:59+00:00 ci: Increase timeout for emulators Test runs with emulators naturally take longer than on native machines. Generate jobs.yml - - - - - 3e9e4b88 by Sven Tennie at 2026-03-06T18:44:59+00:00 ghc: Distinguish between having an interpreter and having an internal one Otherwise, we fail with warnings when compiling tools. Actually, these are related but different things: - ghc can run an interpreter (either internal or external) - ghc is compiled with an internal interpreter - - - - - 129df626 by Matthew Pickering at 2026-03-06T18:44:59+00:00 ci: Javascript don't set CROSS_EMULATOR There is no CROSS_EMULATOR needed to run javascript binaries, so we don't set the CROSS_EMULATOR to some dummy value. Co-authored-by: Sven Tennie <sven.tennie(a)gmail.com> - - - - - 226c5a6b by Sven Tennie at 2026-03-06T18:44:59+00:00 Javascript skip T23697 See #22355 about how HSC2HS and the Javascript target don't play well together. - - - - - b0a8db62 by Sven Tennie at 2026-03-06T18:44:59+00:00 Mark T24602 as fragile It was skipped before (due to CROSS_EMULATOR being set, which changed for JS), so we don't make things worse by marking it as fragile. - - - - - 3273d218 by Sven Tennie at 2026-03-06T18:44:59+00:00 Windows needs NM_STAGE0 as well The stage0 always needs nm. - - - - - 34d3ee6a by Sven Tennie at 2026-03-06T18:44:59+00:00 T17912 sometimes works for windows-validate This seems to be timing related. However, just simply increasing the timeout (sleep) statement of this test didn't help. Maybe, it has been flaky on CI before. - - - - - 10d4ee46 by Sven Tennie at 2026-03-06T18:45:00+00:00 stripping: Not for >= Stage2 cross-compiled Currently, we can only strip objects of the host target. - - - - - 4a0df931 by Sven Tennie at 2026-03-06T18:48:44+00:00 hadrian: Improve readability of inTreeCompilerArgs Refer to the stages of executables and libraries. This should express the intention better. - - - - - e70ec872 by Sven Tennie at 2026-03-06T18:50:26+00:00 hadrian: Fix difference between in-tree and out-of-tree GHC test args Done by canonicalizing the package database path. (The issue was a not fully reduced path.) - - - - - 539d5b7d by Sven Tennie at 2026-03-06T18:52:04+00:00 Add a config flag for LibDir and derived values For cross-compilers, we have to refer to the libs of the succeeding stage. This also affects other files previously relying on top_dir in GHC. - - - - - 78 changed files: - .gitlab/ci.sh - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - compiler/GHC/Driver/Config/Interpreter.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Settings.hs - compiler/GHC/Settings/IO.hs - configure.ac - distrib/configure.ac.in - ghc/GHC/Driver/Session/Mode.hs - ghc/GHCi/UI.hs - ghc/Main.hs - ghc/ghc-bin.cabal.in - hadrian/README.md - hadrian/bindist/Makefile - hadrian/bindist/config.mk.in - hadrian/cfg/default.host.target.in - + hadrian/cfg/system.config.host.in - hadrian/cfg/system.config.in - + hadrian/cfg/system.config.target.in - hadrian/hadrian.cabal - hadrian/src/Base.hs - + hadrian/src/BindistConfig.hs - hadrian/src/Builder.hs - hadrian/src/Context.hs - hadrian/src/Expression.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Hadrian/Builder.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Haskell/Cabal/Type.hs - hadrian/src/Hadrian/Haskell/Hash.hs - hadrian/src/Hadrian/Oracles/TextFile.hs - hadrian/src/Oracles/Flag.hs - hadrian/src/Oracles/Flavour.hs - hadrian/src/Oracles/Setting.hs - hadrian/src/Oracles/TestSettings.hs - hadrian/src/Packages.hs - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Compile.hs - hadrian/src/Rules/Documentation.hs - hadrian/src/Rules/Generate.hs - hadrian/src/Rules/Gmp.hs - hadrian/src/Rules/Library.hs - hadrian/src/Rules/Program.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings.hs - hadrian/src/Settings/Builders/Cabal.hs - hadrian/src/Settings/Builders/Common.hs - hadrian/src/Settings/Builders/Configure.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Builders/Hsc2Hs.hs - hadrian/src/Settings/Builders/RunTest.hs - hadrian/src/Settings/Builders/SplitSections.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Benchmark.hs - hadrian/src/Settings/Flavours/Development.hs - hadrian/src/Settings/Flavours/GhcInGhci.hs - hadrian/src/Settings/Flavours/Performance.hs - hadrian/src/Settings/Flavours/Quick.hs - hadrian/src/Settings/Flavours/QuickCross.hs - hadrian/src/Settings/Flavours/Quickest.hs - hadrian/src/Settings/Flavours/Validate.hs - hadrian/src/Settings/Packages.hs - hadrian/src/Settings/Program.hs - hadrian/src/Settings/Warnings.hs - libraries/base/tests/IO/all.T - libraries/base/tests/all.T - m4/fp_find_nm.m4 - m4/fptools_set_platform_vars.m4 - m4/prep_target_file.m4 - testsuite/ghc-config/ghc-config.hs - testsuite/tests/javascript/closure/all.T The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f4503bbfdb2415c4175b79c2f11d6b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/f4503bbfdb2415c4175b79c2f11d6b… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL_20260306
by Sven Tennie (＠supersven) 06 Mar '26

06 Mar '26

Sven Tennie pushed new branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL_20260306 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/romes/hadrian-cross-stage2-re… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/mangoiv/24797] T2T: handle implicitly lifted typed splice
by Magnus (＠MangoIV) 06 Mar '26

06 Mar '26

Magnus pushed to branch wip/mangoiv/24797 at Glasgow Haskell Compiler / GHC Commits: d66ab8f5 by mangoiv at 2026-03-06T18:10:56+01:00 T2T: handle implicitly lifted typed splice After moving the implicit lifting of splices to the renamer, we sometimes get an implicit argument to T2T - we do not know how to lift these typed splices since there's no notion of lifting types in GHC yet. As a solution, we revert the splicing and recur using on a term level variable that encloses the name that was implicitly lifted. There is, however, a wrinkle with this approach - when implicitly lifting, we record the splice and when actually splicing, we try to generate code for a splice which does not exist anymore - instead of failing immediately, we return a thunk containing a panic. If we ever were to splice the now dropped argument, we would get that panic instead. Resolves: #24797 - - - - - 3 changed files: - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Tc/Gen/App.hs Changes: ===================================== compiler/GHC/HsToCore/Quote.hs ===================================== @@ -166,7 +166,7 @@ dsBracket (HsBracketTc { hsb_wrap = mb_wrap, hsb_splices = splices, hsb_quote = PatBr _ p -> runOverloaded $ do { MkC p1 <- repTopP p ; return p1 } TypBr _ t -> runOverloaded $ do { MkC t1 <- repLTy t ; return t1 } DecBrG _ gp -> runOverloaded $ do { MkC ds1 <- repTopDs gp ; return ds1 } - DecBrL {} -> panic "dsUntypedBracket: unexpected DecBrL" + DecBrL {} -> panic "dsBracket: unexpected DecBrL" where wrap = expectJust mb_wrap -- Not used in VarBr case -- In the overloaded case we have to get given a wrapper, it is just @@ -1481,7 +1481,7 @@ repTy (HsKindSig _ t k) = do t1 <- repLTy t k1 <- repLTy k repTSig t1 k1 -repTy (HsSpliceTy (HsUntypedSpliceNested n) _) = rep_splice n +repTy (HsSpliceTy (HsUntypedSpliceNested n) _) = rep_splice False n repTy t@(HsSpliceTy (HsUntypedSpliceTop _ _) _) = pprPanic "repTy: top level splice" (ppr t) repTy (HsExplicitListTy _ _ tys) = do tys1 <- repLTys tys @@ -1532,13 +1532,17 @@ repRole (L _ Nothing) = rep2_nw inferRName [] -- See Note [How brackets and nested splices are handled] in GHC.Tc.Gen.Splice -- We return a CoreExpr of any old type; the context should know -rep_splice :: Name -> MetaM (Core a) -rep_splice splice_name +rep_splice :: Bool -> Name -> MetaM (Core a) +rep_splice b splice_name = do { mb_val <- lift $ dsLookupMetaEnv splice_name ; case mb_val of Just (DsSplice e) -> do { e' <- lift $ dsExpr e ; return (MkC e') } - _ -> pprPanic "HsSplice" (ppr splice_name) } + -- If a splice was recorded to be pending but was later + -- discovered to not be splicable, we cannot return a corresponding + -- core expr here + Nothing -> return (pprPanic "HsSplice: looked at reverted pending splice" (ppr splice_name <+> text "typed:" <+> ppr b)) + Just _ -> pprPanic "HsSplice" (ppr splice_name <+> text "typed:" <+> ppr b) } -- Should not happen; statically checked ----------------------------------------------------------------------------- @@ -1701,8 +1705,8 @@ repE (ArithSeq _ _ aseq) = ds3 <- repLE e3 repFromThenTo ds1 ds2 ds3 -repE (HsTypedSplice (HsTypedSpliceNested n) _) = rep_splice n -repE (HsUntypedSplice (HsUntypedSpliceNested n) _) = rep_splice n +repE (HsTypedSplice (HsTypedSpliceNested n) _) = rep_splice True n +repE (HsUntypedSplice (HsUntypedSpliceNested n) _) = rep_splice False n repE e@(HsUntypedSplice (HsUntypedSpliceTop _ _) _) = pprPanic "repE: top level splice" (ppr e) repE e@(HsTypedSplice HsTypedSpliceTop _) = pprPanic "repE: top level splice" (ppr e) repE (HsStatic _ e) = repLE e >>= rep2 staticEName . (:[]) . unC @@ -2223,7 +2227,7 @@ repP (EmbTyPat _ t) = do { t' <- repLTy (hstp_body t) repP (InvisPat _ t) = do { t' <- repLTy (hstp_body t) ; repPinvis t' } repP (OrPat _ ps) = do { ps' <- repLPs1 ps; repPor ps' } -repP (SplicePat (HsUntypedSpliceNested n) _) = rep_splice n +repP (SplicePat (HsUntypedSpliceNested n) _) = rep_splice False n repP p@(SplicePat (HsUntypedSpliceTop _ _) _) = pprPanic "repP: top level splice" (ppr p) repP other = notHandled (ThExoticPattern other) ===================================== compiler/GHC/Rename/Expr.hs ===================================== @@ -331,7 +331,7 @@ rnExpr (HsVar _ (L l v)) -> rnExpr (ExplicitList noAnn []) | otherwise - -> do { res_expr <- checkThLocalNameWithLift (L (l2l l) (WithUserRdr v nm)) + -> do { res_expr <- checkThLocalNameWithLift (L l (WithUserRdr v nm)) ; return (res_expr, unitFV nm) } }}} ===================================== compiler/GHC/Tc/Gen/App.hs ===================================== @@ -1179,6 +1179,19 @@ expr_to_type earg = = do { t <- go (L l e) ; let splice_result' = HsUntypedSpliceTop finalizers t ; return (L l (HsSpliceTy splice_result' splice)) } + -- If T2T gets passed a typed splice and this splice was implicitly lifted, we revert the lifting + -- and instead try to T2T the variable without lifting and splicing it first. + -- This allows us to work around situations where a variable was not correctly identified as + -- as type variable and thus implicitly lifted before T2T. + -- This is to accomodate for moving the code that does implicit lifting to the renamer. + go (L l (HsTypedSplice _splice_result splice)) + | XTypedSplice HsImplicitLiftSplice + { implicit_lift_lid = lid + , implicit_lift_bind_lvl = bind_lvls + , implicit_lift_used_lvl = used_lvl } <- splice + , L lnm (WithUserRdr _ nm) <- lid + = do { addDiagnosticAt (locA lnm) (TcRnBadlyLevelledType nm bind_lvls used_lvl) + ; go (L l (HsVar noExtField lid)) } go (L l (HsHole (HoleVar (L _ rdr)))) | isUnderscore occ = return (L l (HsWildCardTy noExtField)) | startsWithUnderscore occ = View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d66ab8f526805e46ce8bc75399b5662… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d66ab8f526805e46ce8bc75399b5662… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/24797
by Magnus (＠MangoIV) 06 Mar '26

06 Mar '26

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

1 0

[Git][ghc/ghc][wip/sjakobi/regression-tests-3] Add regression test for #11505
by Simon Jakobi (＠sjakobi2) 06 Mar '26

06 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/regression-tests-3 at Glasgow Haskell Compiler / GHC Commits: f2cd5ef1 by Simon Jakobi at 2026-03-06T16:35:56+01:00 Add regression test for #11505 Closes #11505. - - - - - 4 changed files: - + testsuite/tests/typecheck/should_compile/T11505Bar.hs - + testsuite/tests/typecheck/should_compile/T11505Foo.hs - + testsuite/tests/typecheck/should_compile/T11505Foo.hs-boot - testsuite/tests/typecheck/should_compile/all.T Changes: ===================================== testsuite/tests/typecheck/should_compile/T11505Bar.hs ===================================== @@ -0,0 +1,3 @@ +module T11505Bar where + +import {-# SOURCE #-} T11505Foo ===================================== testsuite/tests/typecheck/should_compile/T11505Foo.hs ===================================== @@ -0,0 +1,12 @@ +module T11505Foo where + +import T11505Bar + +-- #11505: this used to fail with: +-- +-- T11505Foo.hs:12:1: +-- Type constructor `Foo' has conflicting definitions in the module +-- and its hs-boot file +-- Main module: data Foo = Foo {x :: {-# UNPACK #-} !Int} +-- Boot file: data Foo = Foo {x :: !Int} +data Foo = Foo { x :: {-# UNPACK #-} !Int } ===================================== testsuite/tests/typecheck/should_compile/T11505Foo.hs-boot ===================================== @@ -0,0 +1,3 @@ +module T11505Foo where + +data Foo = Foo { x :: {-# UNPACK #-} !Int } ===================================== testsuite/tests/typecheck/should_compile/all.T ===================================== @@ -818,6 +818,7 @@ test('T20356', normal, compile, ['']) test('T20584', normal, compile, ['']) test('T21558', normal, compile, ['-w']) test('T20584b', normal, compile, ['']) +test('T11505', [extra_files(['T11505Foo.hs', 'T11505Foo.hs-boot', 'T11505Bar.hs'])], multimod_compile, ['T11505Foo', '-v0']) test('T20588b', [extra_files(['T20588b.hs', 'T20588b.hs-boot', 'T20588b_aux.hs'])], multimod_compile, ['T20588b_aux.hs', '-v0']) test('T20588d', [extra_files(['T20588d.hs', 'T20588d.hs-boot', 'T20588d_aux.hs'])], multimod_compile, ['T20588d_aux.hs', '-v0']) test('T20661', [extra_files(['T20661.hs', 'T20661.hs-boot', 'T20661_aux.hs'])], multimod_compile, ['T20661_aux.hs', '-v0']) @@ -963,4 +964,3 @@ test('T26746', normal, compile, ['']) test('T26737', normal, compile, ['']) test('T26805a', normal, compile, ['']) test('T24464', normal, compile, ['']) - View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f2cd5ef13fd9693ee1b553d18d8c8d8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f2cd5ef13fd9693ee1b553d18d8c8d8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Deleted branch wip/jeltsch/duplex-readability-and-writability
by Wolfgang Jeltsch (＠jeltsch) 06 Mar '26

06 Mar '26

Wolfgang Jeltsch deleted branch wip/jeltsch/duplex-readability-and-writability at Glasgow Haskell Compiler / GHC -- You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T13729] Add regression test for #13729
by Simon Jakobi (＠sjakobi2) 06 Mar '26

06 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/T13729 at Glasgow Haskell Compiler / GHC Commits: 9cd32e92 by Simon Jakobi at 2026-03-06T15:05:27+01:00 Add regression test for #13729 Closes #13729. - - - - - 11 changed files: - + testsuite/tests/driver/T13729/A/Setup.hs - + testsuite/tests/driver/T13729/A/TH.hs - + testsuite/tests/driver/T13729/A/Types1.hs - + testsuite/tests/driver/T13729/A/Types2.hs - + testsuite/tests/driver/T13729/A/p.cabal - + testsuite/tests/driver/T13729/B/Main.hs - + testsuite/tests/driver/T13729/B/Setup.hs - + testsuite/tests/driver/T13729/B/q.cabal - + testsuite/tests/driver/T13729/Makefile - + testsuite/tests/driver/T13729/Setup.hs - + testsuite/tests/driver/T13729/all.T Changes: ===================================== testsuite/tests/driver/T13729/A/Setup.hs ===================================== @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain ===================================== testsuite/tests/driver/T13729/A/TH.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE TemplateHaskell #-} +module TH where + +import Language.Haskell.TH +import Language.Haskell.TH.Syntax +import Types + +th_string = lift . show =<< reify ''Foo ===================================== testsuite/tests/driver/T13729/A/Types1.hs ===================================== @@ -0,0 +1,3 @@ +module Types where + +data Foo = Bar ===================================== testsuite/tests/driver/T13729/A/Types2.hs ===================================== @@ -0,0 +1,3 @@ +module Types where + +data Foo = Bar | Baz ===================================== testsuite/tests/driver/T13729/A/p.cabal ===================================== @@ -0,0 +1,10 @@ +cabal-version: 2.2 +name: A +version: 0.1.0.0 +build-type: Simple + +library + exposed-modules: TH, Types + hs-source-dirs: . + build-depends: base >=4.14 && <5, template-haskell + default-language: Haskell2010 ===================================== testsuite/tests/driver/T13729/B/Main.hs ===================================== @@ -0,0 +1,6 @@ +{-# LANGUAGE TemplateHaskell #-} +module Main where + +import TH + +main = putStrLn $(th_string) ===================================== testsuite/tests/driver/T13729/B/Setup.hs ===================================== @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain ===================================== testsuite/tests/driver/T13729/B/q.cabal ===================================== @@ -0,0 +1,10 @@ +cabal-version: 2.2 +name: B +version: 0.1.0.0 +build-type: Simple + +executable B + main-is: Main.hs + hs-source-dirs: . + build-depends: base >=4.14 && <5, A + default-language: Haskell2010 ===================================== testsuite/tests/driver/T13729/Makefile ===================================== @@ -0,0 +1,40 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +SETUP='$(PWD)/Setup' -v0 +CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --package-db='$(PWD)/tmp.d' --prefix='$(PWD)/inst' $(VANILLA) $(PROF) $(DYN) + +T13729: + '$(GHC_PKG)' init tmp.d + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup + + # Build package A with the first Foo definition. + rm -rf A/dist + cp A/Types1.hs A/Types.hs + (cd A; $(CONFIGURE) --ipid "A-0.1") + (cd A; $(SETUP) build) + (cd A; $(SETUP) copy) + (cd A; $(SETUP) register) + + # Build package B and record the splice output. + rm -rf B/dist + (cd B; $(CONFIGURE) --ipid "B-0.1") + (cd B; $(SETUP) build) + (cd B; $(SETUP) copy) + (cd B; $(SETUP) register) + ./inst/bin/B > out1 + grep -q Bar out1 + ! grep -q Baz out1 + + # Overwrite Types.hs with the second Foo definition, rebuild A, then rebuild B + # without -fforce-recomp. + cp A/Types2.hs A/Types.hs + (cd A; $(SETUP) build) + (cd A; $(SETUP) copy) + (cd A; $(SETUP) register) + (cd B; $(SETUP) build) + (cd B; $(SETUP) copy) + (cd B; $(SETUP) register) + ./inst/bin/B > out2 + grep -q Baz out2 ===================================== testsuite/tests/driver/T13729/Setup.hs ===================================== @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain ===================================== testsuite/tests/driver/T13729/all.T ===================================== @@ -0,0 +1,20 @@ +if config.have_vanilla: + vanilla = '--enable-library-vanilla' +else: + vanilla = '--disable-library-vanilla' + +if config.have_profiling: + prof = '--enable-library-profiling' +else: + prof = '--disable-library-profiling' + +if not config.compiler_profiled and config.have_dynamic: + dyn = '--enable-shared' +else: + dyn = '--disable-shared' + +test('T13729', [extra_files(['A', 'B', 'Setup.hs']), + when(fast(), skip), + js_broken(22349)], + run_command, + ['$MAKE -s --no-print-directory T13729 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9cd32e925ab5f27225ae1af534ae5cc… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9cd32e925ab5f27225ae1af534ae5cc… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/T13729] Add regression test for #13729
by Simon Jakobi (＠sjakobi2) 06 Mar '26

06 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/T13729 at Glasgow Haskell Compiler / GHC Commits: 100877c6 by Simon Jakobi at 2026-03-06T14:50:27+01:00 Add regression test for #13729 Closes #13729. - - - - - 11 changed files: - + testsuite/tests/driver/T13729/Makefile - + testsuite/tests/driver/T13729/Setup.hs - + testsuite/tests/driver/T13729/all.T - + testsuite/tests/driver/T13729/p/Setup.hs - + testsuite/tests/driver/T13729/p/TH.hs - + testsuite/tests/driver/T13729/p/Types.hs - + testsuite/tests/driver/T13729/p/Types2.hs - + testsuite/tests/driver/T13729/p/p.cabal - + testsuite/tests/driver/T13729/q/Main.hs - + testsuite/tests/driver/T13729/q/Setup.hs - + testsuite/tests/driver/T13729/q/q.cabal Changes: ===================================== testsuite/tests/driver/T13729/Makefile ===================================== @@ -0,0 +1,39 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +SETUP='$(PWD)/Setup' -v0 +CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --with-hc-pkg='$(GHC_PKG)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' --package-db='$(PWD)/tmp.d' --prefix='$(PWD)/inst' $(VANILLA) $(PROF) $(DYN) + +T13729: + '$(GHC_PKG)' init tmp.d + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup + + # Build package A with the checked-in Foo definition. + rm -rf p/dist + (cd p; $(CONFIGURE) --ipid "A-0.1") + (cd p; $(SETUP) build) + (cd p; $(SETUP) copy) + (cd p; $(SETUP) register) + + # Build package B and record the splice output. + rm -rf q/dist + (cd q; $(CONFIGURE) --ipid "B-0.1") + (cd q; $(SETUP) build) + (cd q; $(SETUP) copy) + (cd q; $(SETUP) register) + ./inst/bin/B > out1 + grep -q Bar out1 + ! grep -q Baz out1 + + # Overwrite Types.hs with the second Foo definition, rebuild A, then rebuild B + # without -fforce-recomp. + cp p/Types2.hs p/Types.hs + (cd p; $(SETUP) build) + (cd p; $(SETUP) copy) + (cd p; $(SETUP) register) + (cd q; $(SETUP) build) + (cd q; $(SETUP) copy) + (cd q; $(SETUP) register) + ./inst/bin/B > out2 + grep -q Baz out2 ===================================== testsuite/tests/driver/T13729/Setup.hs ===================================== @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain ===================================== testsuite/tests/driver/T13729/all.T ===================================== @@ -0,0 +1,20 @@ +if config.have_vanilla: + vanilla = '--enable-library-vanilla' +else: + vanilla = '--disable-library-vanilla' + +if config.have_profiling: + prof = '--enable-library-profiling' +else: + prof = '--disable-library-profiling' + +if not config.compiler_profiled and config.have_dynamic: + dyn = '--enable-shared' +else: + dyn = '--disable-shared' + +test('T13729', [extra_files(['p', 'q', 'Setup.hs']), + when(fast(), skip), + js_broken(22349)], + run_command, + ['$MAKE -s --no-print-directory T13729 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn]) ===================================== testsuite/tests/driver/T13729/p/Setup.hs ===================================== @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain ===================================== testsuite/tests/driver/T13729/p/TH.hs ===================================== @@ -0,0 +1,8 @@ +{-# LANGUAGE TemplateHaskell #-} +module TH where + +import Language.Haskell.TH +import Language.Haskell.TH.Syntax +import Types + +th_string = lift . show =<< reify ''Foo ===================================== testsuite/tests/driver/T13729/p/Types.hs ===================================== @@ -0,0 +1,3 @@ +module Types where + +data Foo = Bar | Baz ===================================== testsuite/tests/driver/T13729/p/Types2.hs ===================================== @@ -0,0 +1,3 @@ +module Types where + +data Foo = Bar | Baz ===================================== testsuite/tests/driver/T13729/p/p.cabal ===================================== @@ -0,0 +1,10 @@ +cabal-version: 2.2 +name: A +version: 0.1.0.0 +build-type: Simple + +library + exposed-modules: TH, Types + hs-source-dirs: . + build-depends: base >=4.14 && <5, template-haskell + default-language: Haskell2010 ===================================== testsuite/tests/driver/T13729/q/Main.hs ===================================== @@ -0,0 +1,6 @@ +{-# LANGUAGE TemplateHaskell #-} +module Main where + +import TH + +main = putStrLn $(th_string) ===================================== testsuite/tests/driver/T13729/q/Setup.hs ===================================== @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain ===================================== testsuite/tests/driver/T13729/q/q.cabal ===================================== @@ -0,0 +1,10 @@ +cabal-version: 2.2 +name: B +version: 0.1.0.0 +build-type: Simple + +executable B + main-is: Main.hs + hs-source-dirs: . + build-depends: base >=4.14 && <5, A + default-language: Haskell2010 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/100877c615a5405476a5a7824d64d18… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/100877c615a5405476a5a7824d64d18… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/sjakobi/regression-tests-3] Add regression test for #11141
by Simon Jakobi (＠sjakobi2) 06 Mar '26

06 Mar '26

Simon Jakobi pushed to branch wip/sjakobi/regression-tests-3 at Glasgow Haskell Compiler / GHC Commits: b3d5bc61 by Simon Jakobi at 2026-03-06T14:32:49+01:00 Add regression test for #11141 Closes #11141. - - - - - 3 changed files: - + testsuite/tests/typecheck/should_compile/T11141.hs - + testsuite/tests/typecheck/should_compile/T11141.stderr - testsuite/tests/typecheck/should_compile/all.T Changes: ===================================== testsuite/tests/typecheck/should_compile/T11141.hs ===================================== @@ -0,0 +1,28 @@ +{-# LANGUAGE FunctionalDependencies #-} +{-# LANGUAGE InstanceSigs #-} +{-# LANGUAGE ScopedTypeVariables #-} +module T11141 where + +data F a = F a +instance Show a => Show (F a) where + show :: forall a. Show a => F a -> String + show (F x) = show x + +{- Previously emitted error: + + Could not deduce (Show a0) + from the context (Show a) + bound by the type signature for show :: Show a => F a -> String + at A.hs:8:13-45 + The type variable ‘a0’ is ambiguous + When checking that: + forall a. Show a => forall a1. Show a1 => F a1 -> String + is more polymorphic than: forall a. Show a => F a -> String + When checking that instance signature for ‘show’ + is more general than its signature in the class + Instance sig: forall a. + Show a => + forall a1. Show a1 => F a1 -> String + Class sig: forall a. Show a => F a -> String + In the instance declaration for ‘Show (F a)’ +-} ===================================== testsuite/tests/typecheck/should_compile/T11141.stderr ===================================== @@ -0,0 +1,4 @@ +T11141.hs:8:20: warning: [GHC-63397] [-Wname-shadowing (in -Wall)] + This binding for ‘a’ shadows the existing binding + bound at T11141.hs:7:10 + ===================================== testsuite/tests/typecheck/should_compile/all.T ===================================== @@ -496,6 +496,7 @@ test('T10770b', expect_broken(10770), compile, ['']) test('T10935', normal, compile, ['']) test('T10971a', normal, compile, ['']) test('T11062', [extra_files(['T11062.hs', 'T11062.hs-boot', 'T11062a.hs'])], multimod_compile, ['T11062', '-v0']) +test('T11141', normal, compile, ['-Wname-shadowing']) test('T11237', normal, compile, ['']) test('T10592', normal, compile, ['']) test('T11305', normal, compile, ['']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b3d5bc6112a8ec17ab30e5ac16ee69d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b3d5bc6112a8ec17ab30e5ac16ee69d… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-head
by Cheng Shao (＠TerrorJack) 06 Mar '26

06 Mar '26

Cheng Shao pushed new branch wip/fix-head at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/fix-head You're receiving this email because of your account on gitlab.haskell.org.

1 0