- ghc-commits - Haskell.org

[Git][ghc/ghc] Pushed new branch wip/fix-toRational
by Bodigrim (＠Bodigrim) 15 Jun '25

15 Jun '25

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

1 0

[Git][ghc/ghc][master] Fix EPT enforcement when mixing unboxed tuples and non-tuples
by Marge Bot (＠marge-bot) 15 Jun '25

15 Jun '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: fd998679 by Krzysztof Gogolewski at 2025-06-15T05:48:06-04:00 Fix EPT enforcement when mixing unboxed tuples and non-tuples The code was assuming that an alternative cannot be returning a normal datacon and an unboxed tuple at the same time. However, as seen in #26107, this can happen when using a GADT to refine the representation type. The solution is just to conservatively return TagDunno. - - - - - 3 changed files: - compiler/GHC/Stg/EnforceEpt/Types.hs - + testsuite/tests/rep-poly/T26107.hs - testsuite/tests/rep-poly/all.T Changes: ===================================== compiler/GHC/Stg/EnforceEpt/Types.hs ===================================== @@ -39,8 +39,8 @@ type InferStgAlt = GenStgAlt 'InferTaggedBinders combineAltInfo :: TagInfo -> TagInfo -> TagInfo combineAltInfo TagDunno _ = TagDunno combineAltInfo _ TagDunno = TagDunno -combineAltInfo (TagTuple {}) TagProper = panic "Combining unboxed tuple with non-tuple result" -combineAltInfo TagProper (TagTuple {}) = panic "Combining unboxed tuple with non-tuple result" +combineAltInfo (TagTuple {}) TagProper = TagDunno -- This can happen with rep-polymorphic result, see #26107 +combineAltInfo TagProper (TagTuple {}) = TagDunno -- This can happen with rep-polymorphic result, see #26107 combineAltInfo TagProper TagProper = TagProper combineAltInfo (TagTuple is1) (TagTuple is2) = TagTuple (zipWithEqual combineAltInfo is1 is2) combineAltInfo (TagTagged) ti = ti ===================================== testsuite/tests/rep-poly/T26107.hs ===================================== @@ -0,0 +1,14 @@ +{-# LANGUAGE GADTs, UnboxedTuples #-} +module T26107 where + +import Data.Kind +import GHC.Exts + +type T :: TYPE rep -> Type +data T a where + A :: T Bool + B :: T (# #) + +f :: forall rep (a :: TYPE rep). T a -> a +f A = True +f B = (# #) ===================================== testsuite/tests/rep-poly/all.T ===================================== @@ -41,6 +41,7 @@ test('T23883a', normal, compile_fail, ['']) test('T23883b', normal, compile_fail, ['']) test('T23883c', normal, compile_fail, ['']) test('T23903', normal, compile_fail, ['']) +test('T26107', js_broken(22364), compile, ['-O']) test('EtaExpandDataCon', normal, compile, ['-O']) test('EtaExpandStupid1', normal, compile, ['-Wno-deprecated-flags']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fd9986790de790e3bec7e5a7ac19fc6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fd9986790de790e3bec7e5a7ac19fc6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Revert "Specialise: Don't float out constraint components."
by Marge Bot (＠marge-bot) 15 Jun '25

15 Jun '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: c7aa0c10 by Andreas Klebinger at 2025-06-15T05:47:24-04:00 Revert "Specialise: Don't float out constraint components." This reverts commit c9abb87ccc0c91cd94f42b3e36270158398326ef. Turns out two benchmarks from #19747 regresses by a factor of 7-8x if we do not float those out. - - - - - 1 changed file: - compiler/GHC/Core/Opt/Specialise.hs Changes: ===================================== compiler/GHC/Core/Opt/Specialise.hs ===================================== @@ -64,7 +64,7 @@ import GHC.Unit.Module.ModGuts import GHC.Core.Unfold import Data.List( partition ) --- import Data.List.NonEmpty ( NonEmpty (..) ) +import Data.List.NonEmpty ( NonEmpty (..) ) import GHC.Core.Subst (substTickish) {- @@ -1277,8 +1277,67 @@ specCase :: SpecEnv , OutId , [OutAlt] , UsageDetails) --- We used to float out super class selections here, --- but no longer do so. See Historical Note [Floating dictionaries out of cases] +specCase env scrut' case_bndr [Alt con args rhs] + | -- See Note [Floating dictionaries out of cases] + interestingDict scrut' (idType case_bndr) + , not (isDeadBinder case_bndr && null sc_args') + = do { case_bndr_flt :| sc_args_flt <- mapM clone_me (case_bndr' :| sc_args') + + ; let case_bndr_flt' = case_bndr_flt `addDictUnfolding` scrut' + scrut_bind = mkDB (NonRec case_bndr_flt scrut') + + sc_args_flt' = zipWith addDictUnfolding sc_args_flt sc_rhss + sc_rhss = [ Case (Var case_bndr_flt') case_bndr' (idType sc_arg') + [Alt con args' (Var sc_arg')] + | sc_arg' <- sc_args' ] + cb_set = unitVarSet case_bndr_flt' + sc_binds = [ DB { db_bind = NonRec sc_arg_flt sc_rhs, db_fvs = cb_set } + | (sc_arg_flt, sc_rhs) <- sc_args_flt' `zip` sc_rhss ] + + flt_binds = scrut_bind : sc_binds + + -- Extend the substitution for RHS to map the *original* binders + -- to their floated versions. + mb_sc_flts :: [Maybe DictId] + mb_sc_flts = map (lookupVarEnv clone_env) args' + clone_env = zipVarEnv sc_args' sc_args_flt' + + subst_prs = (case_bndr, Var case_bndr_flt) + : [ (arg, Var sc_flt) + | (arg, Just sc_flt) <- args `zip` mb_sc_flts ] + subst' = se_subst env_rhs + `Core.extendSubstInScopeList` (case_bndr_flt' : sc_args_flt') + `Core.extendIdSubstList` subst_prs + env_rhs' = env_rhs { se_subst = subst' } + + ; (rhs', rhs_uds) <- specExpr env_rhs' rhs + ; let (free_uds, dumped_dbs) = dumpUDs (case_bndr':args') rhs_uds + all_uds = flt_binds `consDictBinds` free_uds + alt' = Alt con args' (wrapDictBindsE dumped_dbs rhs') +-- ; pprTrace "specCase" (ppr case_bndr $$ ppr scrut_bind) $ + ; return (Var case_bndr_flt, case_bndr', [alt'], all_uds) } + where + (env_rhs, (case_bndr':|args')) = substBndrs env (case_bndr:|args) + sc_args' = filter is_flt_sc_arg args' + + clone_me bndr = do { uniq <- getUniqueM + ; return (mkUserLocalOrCoVar occ uniq wght ty loc) } + where + name = idName bndr + wght = idMult bndr + ty = idType bndr + occ = nameOccName name + loc = getSrcSpan name + + arg_set = mkVarSet args' + is_flt_sc_arg var = isId var + && not (isDeadBinder var) + && isDictTy var_ty + && tyCoVarsOfType var_ty `disjointVarSet` arg_set + where + var_ty = idType var + + specCase env scrut case_bndr alts = do { (alts', uds_alts) <- mapAndCombineSM spec_alt alts ; return (scrut, case_bndr', alts', uds_alts) } @@ -1355,36 +1414,36 @@ Note [tryRules: plan (BEFORE)] in the Simplifier (partly) redundant. That is, if we run rules in the specialiser, does it matter if we make rules "win" over inlining in the Simplifier? Yes, it does! See the discussion in #21851. -Historical Note [Floating dictionaries out of cases] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Function `specCase` used to give special treatment to a case-expression -that scrutinised a dictionary, like this: +Note [Floating dictionaries out of cases] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Consider g = \d. case d of { MkD sc ... -> ...(f sc)... } -But actually - -* We never explicitly case-analyse a dictionary; rather the class-op - rules select superclasses from it. (NB: worker/wrapper can unbox - tuple dictionaries -- see (DNB1) in Note [Do not unbox class dictionaries]; - but that's only after worker/wrapper, and specialisation happens before - that.) - -* Calling `interestingDict` on every scrutinee is hardly sensible; - generally `interestingDict` is called only on Constraint-kinded things. - -* It was giving a Lint scope error in !14272 - -So now there is no special case. This Note just records the change -in case we ever want to reinstate it. The original note was -added in - - commit c107a00ccf1e641a2d008939cf477c71caa028d5 - Author: Simon Peyton Jones <simonpj(a)microsoft.com> - Date: Thu Aug 12 13:11:33 2010 +0000 - - Improve the Specialiser, fixing Trac #4203 - -End of Historical Note - +Naively we can't float d2's binding out of the case expression, +because 'sc' is bound by the case, and that in turn means we can't +specialise f, which seems a pity. + +So we invert the case, by floating out a binding +for 'sc_flt' thus: + sc_flt = case d of { MkD sc ... -> sc } +Now we can float the call instance for 'f'. Indeed this is just +what'll happen if 'sc' was originally bound with a let binding, +but case is more efficient, and necessary with equalities. So it's +good to work with both. + +You might think that this won't make any difference, because the +call instance will only get nuked by the \d. BUT if 'g' itself is +specialised, then transitively we should be able to specialise f. + +In general, given + case e of cb { MkD sc ... -> ...(f sc)... } +we transform to + let cb_flt = e + sc_flt = case cb_flt of { MkD sc ... -> sc } + in + case cb_flt of bg { MkD sc ... -> ....(f sc_flt)... } + +The "_flt" things are the floated binds; we use the current substitution +to substitute sc -> sc_flt in the RHS ************************************************************************ * * View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c7aa0c108fce9148eabc91bafbf04d8… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c7aa0c108fce9148eabc91bafbf04d8… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: Improve redundant constraints for instance decls
by Marge Bot (＠marge-bot) 15 Jun '25

15 Jun '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 19f20861 by Simon Peyton Jones at 2025-06-13T09:51:11-04:00 Improve redundant constraints for instance decls Addresses #25992, which showed that the default methods of an instance decl could make GHC fail to report redundant constraints. Figuring out how to do this led me to refactor the computation of redundant constraints. See the entirely rewritten Note [Tracking redundant constraints] in GHC.Tc.Solver.Solve - - - - - 1d02798e by Matthew Pickering at 2025-06-13T09:51:54-04:00 Refactor the treatment of nested Template Haskell splices * The difference between a normal splice, a quasiquoter and implicit splice caused by lifting is stored in the AST after renaming. * Information that the renamer learns about splices is stored in the relevant splice extension points (XUntypedSpliceExpr, XQuasiQuote). * Normal splices and quasi quotes record the flavour of splice (exp/pat/dec etc) * Implicit lifting stores information about why the lift was attempted, so if it fails, that can be reported to the user. * After renaming, the decision taken to attempt to implicitly lift a variable is stored in the `XXUntypedSplice` extension field in the `HsImplicitLiftSplice` constructor. * Since all the information is stored in the AST, in `HsUntypedSplice`, the type of `PendingRnSplice` now just stores a `HsUntypedSplice`. * Error messages since the original program can be easily printed, this is noticeable in the case of implicit lifting. * The user-written syntax is directly type-checked. Before, some desugaring took place in the * Fixes .hie files to work better with nested splices (nested splices are not indexed) * The location of the quoter in a quasiquote is now located, so error messages will precisely point to it (and again, it is indexed by hie files) In the future, the typechecked AST should also retain information about the splices and the specific desugaring being left to the desugarer. Also, `runRnSplice` should call `tcUntypedSplice`, otherwise the typechecking logic is duplicated (see the `QQError` and `QQTopError` tests for a difference caused by this). - - - - - f93798ba by Cheng Shao at 2025-06-13T09:52:35-04:00 libffi: update to 3.5.1 Bumps libffi submodule. - - - - - ff9bea63 by Andreas Klebinger at 2025-06-15T00:07:02-04:00 Revert "Specialise: Don't float out constraint components." This reverts commit c9abb87ccc0c91cd94f42b3e36270158398326ef. Turns out two benchmarks from #19747 regresses by a factor of 7-8x if we do not float those out. - - - - - b4b48d5d by Krzysztof Gogolewski at 2025-06-15T00:07:03-04:00 Fix EPT enforcement when mixing unboxed tuples and non-tuples The code was assuming that an alternative cannot be returning a normal datacon and an unboxed tuple at the same time. However, as seen in #26107, this can happen when using a GADT to refine the representation type. The solution is just to conservatively return TagDunno. - - - - - 65 changed files: - compiler/GHC/Builtin/Names/TH.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/Instances.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Lexer.x - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Stg/EnforceEpt/Types.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/ErrCtxt.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Concrete.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/ThLevelIndex.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - libffi-tarballs - testsuite/tests/dependent/should_fail/T13135_simple.stderr - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/linear/should_fail/LinearTHFail.stderr - testsuite/tests/linters/notes.stdout - testsuite/tests/perf/compiler/hard_hole_fits.stderr - testsuite/tests/quasiquotation/T3953.stderr - + testsuite/tests/quotes/QQError.hs - + testsuite/tests/quotes/QQError.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/quotes/all.T - + testsuite/tests/rep-poly/T26107.hs - testsuite/tests/rep-poly/all.T - + testsuite/tests/th/QQInQuote.hs - + testsuite/tests/th/QQTopError.hs - + testsuite/tests/th/QQTopError.stderr - testsuite/tests/th/T10598_TH.stderr - testsuite/tests/th/T14681.stderr - testsuite/tests/th/T17804.stderr - testsuite/tests/th/T5508.stderr - testsuite/tests/th/TH_Lift.stderr - testsuite/tests/th/all.T - testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr - + testsuite/tests/typecheck/should_compile/T25992.hs - + testsuite/tests/typecheck/should_compile/T25992.stderr - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/tcfail097.stderr - utils/check-exact/ExactPrint.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5a2f92be0985b8ee406afc45f03419… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5a2f92be0985b8ee406afc45f03419… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26107] Fix EPT enforcement when mixing unboxed tuples and non-tuples
by Krzysztof Gogolewski (＠monoidal) 15 Jun '25

15 Jun '25

Krzysztof Gogolewski pushed to branch wip/T26107 at Glasgow Haskell Compiler / GHC Commits: f97431c9 by Krzysztof Gogolewski at 2025-06-15T02:01:07+02:00 Fix EPT enforcement when mixing unboxed tuples and non-tuples The code was assuming that an alternative cannot be returning a normal datacon and an unboxed tuple at the same time. However, as seen in #26107, this can happen when using a GADT to refine the representation type. The solution is just to conservatively return TagDunno. - - - - - 3 changed files: - compiler/GHC/Stg/EnforceEpt/Types.hs - + testsuite/tests/rep-poly/T26107.hs - testsuite/tests/rep-poly/all.T Changes: ===================================== compiler/GHC/Stg/EnforceEpt/Types.hs ===================================== @@ -39,8 +39,8 @@ type InferStgAlt = GenStgAlt 'InferTaggedBinders combineAltInfo :: TagInfo -> TagInfo -> TagInfo combineAltInfo TagDunno _ = TagDunno combineAltInfo _ TagDunno = TagDunno -combineAltInfo (TagTuple {}) TagProper = panic "Combining unboxed tuple with non-tuple result" -combineAltInfo TagProper (TagTuple {}) = panic "Combining unboxed tuple with non-tuple result" +combineAltInfo (TagTuple {}) TagProper = TagDunno -- This can happen with rep-polymorphic result, see #26107 +combineAltInfo TagProper (TagTuple {}) = TagDunno -- This can happen with rep-polymorphic result, see #26107 combineAltInfo TagProper TagProper = TagProper combineAltInfo (TagTuple is1) (TagTuple is2) = TagTuple (zipWithEqual combineAltInfo is1 is2) combineAltInfo (TagTagged) ti = ti ===================================== testsuite/tests/rep-poly/T26107.hs ===================================== @@ -0,0 +1,14 @@ +{-# LANGUAGE GADTs, UnboxedTuples #-} +module T26107 where + +import Data.Kind +import GHC.Exts + +type T :: TYPE rep -> Type +data T a where + A :: T Bool + B :: T (# #) + +f :: forall rep (a :: TYPE rep). T a -> a +f A = True +f B = (# #) ===================================== testsuite/tests/rep-poly/all.T ===================================== @@ -41,6 +41,7 @@ test('T23883a', normal, compile_fail, ['']) test('T23883b', normal, compile_fail, ['']) test('T23883c', normal, compile_fail, ['']) test('T23903', normal, compile_fail, ['']) +test('T26107', js_broken(22364), compile, ['-O']) test('EtaExpandDataCon', normal, compile, ['-O']) test('EtaExpandStupid1', normal, compile, ['-Wno-deprecated-flags']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f97431c9b0ea6edb2c62a23aa4d0447… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f97431c9b0ea6edb2c62a23aa4d0447… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/az/ghc-cpp] 141 commits: Hadrian: Add option to generate .hie files for stage1 libraries
by Alan Zimmerman (＠alanz) 14 Jun '25

14 Jun '25

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC Commits: 35826d8b by Matthew Pickering at 2025-06-08T22:00:41+01:00 Hadrian: Add option to generate .hie files for stage1 libraries The +hie_files flavour transformer can be enabled to produce hie files for stage1 libraries. The hie files are produced in the "extra-compilation-artifacts" folder and copied into the resulting bindist. At the moment the hie files are not produced for the release flavour, they add about 170M to the final bindist. Towards #16901 - - - - - e2467dbd by Ryan Hendrickson at 2025-06-09T13:07:05-04:00 Fix various failures to -fprint-unicode-syntax - - - - - 1d99d3e4 by maralorn at 2025-06-12T03:47:39-04:00 Add necessary flag for js linking - - - - - 974d5734 by maralorn at 2025-06-12T03:47:39-04:00 Don’t use additional linker flags to detect presence of -fno-pie in configure.ac This mirrors the behavior of ghc-toolchain - - - - - 1e9eb118 by Andrew Lelechenko at 2025-06-12T03:48:21-04:00 Add HasCallStack to Control.Monad.Fail.fail CLC proposal https://github.com/haskell/core-libraries-committee/issues/327 2% compile-time allocations increase in T3064, likely because `fail` is now marginally more expensive to compile. Metric Increase: T3064 - - - - - 6d12060f by meooow25 at 2025-06-12T14:26:07-04:00 Bump containers submodule to 0.8 Also * Disable -Wunused-imports for containers * Allow containers-0.8 for in-tree packages * Bump some submodules so that they allow containers-0.8. These are not at any particular versions. * Remove unused deps containers and split from ucd2haskell * Fix tests affected by the new containers and hpc-bin - - - - - 537bd233 by Peng Fan at 2025-06-12T14:27:02-04:00 NCG/LA64: Optimize code generation and reduce build-directory size. 1. makeFarBranches: Prioritize fewer instruction sequences. 2. Prefer instructions with immediate numbers to reduce register moves, e.g. andi,ori,xori,addi. 3. Ppr: Remove unnecessary judgments. 4. genJump: Avoid "ld+jr" as much as possible. 5. BCOND and BCOND1: Implement conditional jumps with two jump ranges, with limited choice of the shortest. 6. Implement FSQRT, CLT, CTZ. 7. Remove unnecessary code. - - - - - 19f20861 by Simon Peyton Jones at 2025-06-13T09:51:11-04:00 Improve redundant constraints for instance decls Addresses #25992, which showed that the default methods of an instance decl could make GHC fail to report redundant constraints. Figuring out how to do this led me to refactor the computation of redundant constraints. See the entirely rewritten Note [Tracking redundant constraints] in GHC.Tc.Solver.Solve - - - - - 1d02798e by Matthew Pickering at 2025-06-13T09:51:54-04:00 Refactor the treatment of nested Template Haskell splices * The difference between a normal splice, a quasiquoter and implicit splice caused by lifting is stored in the AST after renaming. * Information that the renamer learns about splices is stored in the relevant splice extension points (XUntypedSpliceExpr, XQuasiQuote). * Normal splices and quasi quotes record the flavour of splice (exp/pat/dec etc) * Implicit lifting stores information about why the lift was attempted, so if it fails, that can be reported to the user. * After renaming, the decision taken to attempt to implicitly lift a variable is stored in the `XXUntypedSplice` extension field in the `HsImplicitLiftSplice` constructor. * Since all the information is stored in the AST, in `HsUntypedSplice`, the type of `PendingRnSplice` now just stores a `HsUntypedSplice`. * Error messages since the original program can be easily printed, this is noticeable in the case of implicit lifting. * The user-written syntax is directly type-checked. Before, some desugaring took place in the * Fixes .hie files to work better with nested splices (nested splices are not indexed) * The location of the quoter in a quasiquote is now located, so error messages will precisely point to it (and again, it is indexed by hie files) In the future, the typechecked AST should also retain information about the splices and the specific desugaring being left to the desugarer. Also, `runRnSplice` should call `tcUntypedSplice`, otherwise the typechecking logic is duplicated (see the `QQError` and `QQTopError` tests for a difference caused by this). - - - - - f93798ba by Cheng Shao at 2025-06-13T09:52:35-04:00 libffi: update to 3.5.1 Bumps libffi submodule. - - - - - 4c469768 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 GHC-CPP: first rough proof of concept Processes #define FOO #ifdef FOO x = 1 #endif Into [ITcppIgnored [L loc ITcppDefine] ,ITcppIgnored [L loc ITcppIfdef] ,ITvarid "x" ,ITequal ,ITinteger (IL {il_text = SourceText "1", il_neg = False, il_value = 1}) ,ITcppIgnored [L loc ITcppEndif] ,ITeof] In time, ITcppIgnored will be pushed into a comment - - - - - 94d52516 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Tidy up before re-visiting the continuation mechanic - - - - - db9f58c9 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Switch preprocessor to continuation passing style Proof of concept, needs tidying up - - - - - 8452c145 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Small cleanup - - - - - c6681522 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Get rid of some cruft - - - - - be02e288 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Starting to integrate. Need to get the pragma recognised and set - - - - - 65c23e60 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Make cppTokens extend to end of line, and process CPP comments - - - - - 93508504 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Remove unused ITcppDefined - - - - - 067d7ca8 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Allow spaces between # and keyword for preprocessor directive - - - - - a4545a17 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Process CPP continuation lines They are emited as separate ITcppContinue tokens. Perhaps the processing should be more like a comment, and keep on going to the end. BUT, the last line needs to be slurped as a whole. - - - - - 321dc532 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Accumulate CPP continuations, process when ready Can be simplified further, we only need one CPP token - - - - - 31c636bb by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Simplify Lexer interface. Only ITcpp We transfer directive lines through it, then parse them from scratch in the preprocessor. - - - - - 42f55a97 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Deal with directive on last line, with no trailing \n - - - - - 37a58edf by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Start parsing and processing the directives - - - - - d8c030dd by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Prepare for processing include files - - - - - fff86bf5 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Move PpState into PreProcess And initParserState, initPragState too - - - - - b38f1dcb by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Process nested include files Also move PpState out of Lexer.x, so it is easy to evolve it in a ghci session, loading utils/check-cpp/Main.hs - - - - - 6edae67e by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Split into separate files - - - - - b4a1c51a by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Starting on expression parser. But it hangs. Time for Text.Parsec.Expr - - - - - 466c4bbc by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Start integrating the ghc-cpp work From https://github.com/alanz/ghc-cpp - - - - - 54a33893 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 WIP - - - - - 1ff0299c by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Fixup after rebase - - - - - 091ccba3 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 WIP - - - - - e209e8a8 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Fixup after rebase, including all tests pass - - - - - 15fc3813 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Change pragma usage to GHC_CPP from GhcCPP - - - - - 7e9ab2d5 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Some comments - - - - - 0f0afba2 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Reformat - - - - - 4612b446 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Delete unused file - - - - - b8d1ded0 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Rename module Parse to ParsePP - - - - - 7e0b984c by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Clarify naming in the parser - - - - - 1142339c by Alan Zimmerman at 2025-06-14T09:55:42+01:00 WIP. Switching to alex/happy to be able to work in-tree Since Parsec is not available - - - - - 64485aeb by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Layering is now correct - GHC lexer, emits CPP tokens - accumulated in Preprocessor state - Lexed by CPP lexer, CPP command extracted, tokens concated with spaces (to get rid of token pasting via comments) - if directive lexed and parsed by CPP lexer/parser, and evaluated - - - - - 56e890df by Alan Zimmerman at 2025-06-14T09:55:42+01:00 First example working Loading Example1.hs into ghci, getting the right results ``` {-# LANGUAGE GHC_CPP #-} module Example1 where y = 3 x = "hello" "bye now" foo = putStrLn x ``` - - - - - 35571286 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 Rebase, and all tests pass except whitespace for generated parser - - - - - cd41e5e9 by Alan Zimmerman at 2025-06-14T09:55:42+01:00 More plumbing. Ready for testing tomorrow. - - - - - f546d56f by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Proress. Renamed module State from Types And at first blush it seems to handle preprocessor scopes properly. - - - - - 5c881727 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Insert basic GHC version macros into parser __GLASGOW_HASKELL__ __GLASGOW_HASKELL_FULL_VERSION__ __GLASGOW_HASKELL_PATCHLEVEL1__ __GLASGOW_HASKELL_PATCHLEVEL2__ - - - - - 47d9fe5d by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Re-sync check-cpp for easy ghci work - - - - - 307f1776 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Get rid of warnings - - - - - 806d7a86 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Rework macro processing, in check-cpp Macros kept at the top level, looked up via name, multiple arity versions per name can be stored - - - - - 7c4b6c1a by Alan Zimmerman at 2025-06-14T09:55:43+01:00 WIP. Can crack arguments for #define Next step it to crack out args in an expansion - - - - - 23184007 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 WIP on arg parsing. - - - - - 464c61c1 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Progress. Still screwing up nested parens. - - - - - 4f597fe8 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Seems to work, but has redundant code - - - - - 4a95075a by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Remove redundant code - - - - - 0991f54c by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Reformat - - - - - a0ed933e by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Expand args, single pass Still need to repeat until fixpoint - - - - - 1d065a9f by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Fixed point expansion - - - - - 7973aa27 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Sync the playground to compiler - - - - - b7544bed by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Working on dumping the GHC_CPP result But We need to keep the BufSpan in a comment - - - - - 4e6aea58 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Keep BufSpan in queued comments in GHC.Parser.Lexer - - - - - 046eef5a by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Getting close to being able to print the combined tokens showing what is in and what is out - - - - - 251ce408 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 First implementation of dumpGhcCpp. Example output First dumps all macros in the state, then the source, showing which lines are in and which are out ------------------------------ - |#define FOO(A,B) A + B - |#define FOO(A,B,C) A + B + C - |#if FOO(1,FOO(3,4)) == 8 - |-- a comment |x = 1 - |#else - |x = 5 - |#endif - - - - - a04a6309 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Clean up a bit - - - - - 9a57ae29 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Add -ddump-ghc-cpp option and a test based on it - - - - - abc294d4 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Restore Lexer.x rules, we need them for continuation lines - - - - - 8f49326d by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Lexer.x: trying to sort out the span for continuations - We need to match on \n at the end of the line - We cannot simply back up for it - - - - - 839a8f8a by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Inserts predefined macros. But does not dump properly Because the cpp tokens have a trailing newline - - - - - c0abd96c by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Remove unnecessary LExer rules We *need* the ones that explicitly match to the end of the line. - - - - - eaa655e0 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Generate correct span for ITcpp Dump now works, except we do not render trailing `\` for continuation lines. This is good enough for use in test output. - - - - - c3c8bdd9 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Reduce duplication in lexer - - - - - 096e7337 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Tweaks - - - - - 65963487 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Insert min_version predefined macros into state The mechanism now works. Still need to flesh out the full set. - - - - - eb6d7b59 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Trying my alternative pragma syntax. It works, but dumpGhcCpp is broken, I suspect from the ITcpp token span update. - - - - - 2e55b7cb by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Pragma extraction now works, with both CPP and GHC_CPP For the following {-# LANGUAGE CPP #-} #if __GLASGOW_HASKELL__ >= 913 {-# LANGUAGE GHC_CPP #-} #endif We will enable GHC_CPP only - - - - - 3eb8b23a by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Remove some tracing - - - - - eced033c by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Fix test exes for changes - - - - - 1c28d9fd by Alan Zimmerman at 2025-06-14T09:55:43+01:00 For GHC_CPP tests, normalise config-time-based macros - - - - - 96f65347 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 WIP - - - - - 2bfc662a by Alan Zimmerman at 2025-06-14T09:55:43+01:00 WIP again. What is wrong? - - - - - 9cb0adf5 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Revert to dynflags for normal not pragma lexing - - - - - 93dd5bec by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Working on getting check-exact to work properly - - - - - 15e4b545 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Passes CppCommentPlacement test - - - - - 0692562f by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Starting on exact printing with GHC_CPP While overriding normal CPP - - - - - d8d49e42 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Correctly store CPP ignored tokens as comments By populating the lexeme string in it, based on the bufpos - - - - - 590c3120 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 WIP - - - - - f0726190 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Simplifying - - - - - 7783f950 by Alan Zimmerman at 2025-06-14T09:55:43+01:00 Update the active state logic - - - - - a2690aca by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Work the new logic into the mainline code - - - - - 611235f1 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Process `defined` operator - - - - - a1c5b380 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Manage lexer state while skipping tokens There is very intricate layout-related state used when lexing. If a CPP directive blanks out some tokens, store this state when the blanking starts, and restore it when they are no longer being blanked. - - - - - ab4578bc by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Track the last token buffer index, for ITCppIgnored We need to attach the source being skipped in an ITCppIgnored token. We cannot simply use its BufSpan as an index into the underlying StringBuffer as it counts unicode chars, not bytes. So we update the lexer state to store the starting StringBuffer location for the last token, and use the already-stored length to extract the correct portion of the StringBuffer being parsed. - - - - - 6104c6cd by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Process the ! operator in GHC_CPP expressions - - - - - 63d74b11 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Predefine a constant when GHC_CPP is being used. - - - - - 997cac00 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 WIP - - - - - 70d3bbf3 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Skip lines directly in the lexer when required - - - - - 81dfffbe by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Properly manage location when accepting tokens again - - - - - 0da22464 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Seems to be working now, for Example9 - - - - - 5c3ad292 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Remove tracing - - - - - b507e7d0 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Fix parsing '*' in block comments Instead of replacing them with '-' - - - - - 2505f769 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Keep the trailing backslash in a ITcpp token - - - - - 4756cef7 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Deal with only enabling one section of a group. A group is an instance of a conditional introduced by #if/#ifdef/#ifndef, and ending at the final #endif, including intermediate #elsif sections - - - - - 38b9960d by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Replace remaining identifiers with 0 when evaluating As per the spec - - - - - de14ee97 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Snapshot before rebase - - - - - 34a6b83e by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Skip non-processed lines starting with # - - - - - c452e5a3 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Export generateMacros so we can use it in ghc-exactprint - - - - - 21f3185b by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Fix rebase - - - - - ff0864f0 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Expose initParserStateWithMacrosString - - - - - f8b5a1ff by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Fix buggy lexer cppSkip It was skipping all lines, not just ones prefixed by # - - - - - 638b98b2 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Fix evaluation of && to use the correct operator - - - - - ee94a6d0 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Deal with closing #-} at the start of a line - - - - - 536a0848 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Add the MIN_VERSION_GLASGOW_HASKELL predefined macro - - - - - dae6a1b8 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Include MIN_VERSION_GLASGOW_HASKELL in GhcCpp01.stderr - - - - - 7b35c213 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Use a strict map for macro defines - - - - - f440fa87 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Process TIdentifierLParen Which only matters at the start of #define - - - - - 5fad2fd7 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Do not provide TIdentifierLParen paren twice - - - - - 67f74250 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Handle whitespace between identifier and '(' for directive only - - - - - efb87e66 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Expose some Lexer bitmap manipulation helpers - - - - - f1d37735 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Deal with line pragmas as tokens Blows up for dumpGhcCpp though - - - - - 43631633 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Allow strings delimited by a single quote too - - - - - 598e6413 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Allow leading whitespace on cpp directives As per https://timsong-cpp.github.io/cppwp/n4140/cpp#1 - - - - - 5ed12e21 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Implement GHC_CPP undef - - - - - c594922e by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Sort out expansion of no-arg macros, in a context with args And make the expansion bottom out, in the case of recursion - - - - - 7d5bec3c by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Fix GhcCpp01 test The LINE pragma stuff works in ghc-exactprint when specifically setting flag to emit ITline_pragma tokens - - - - - e71742fb by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Process comments in CPP directives - - - - - 35005ddf by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Correctly lex pragmas with finel #-} on a newline - - - - - 3c37dd74 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Do not process CPP-style comments - - - - - 35a13235 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Allow cpp-style comments when GHC_CPP enabled - - - - - 18e9be87 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Return other pragmas as cpp ignored when GHC_CPP active - - - - - 48ed6cd4 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Fix exactprinting default decl - - - - - f1e043cd by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Reorganise getOptionsFromFile for use in ghc-exactprint We want to be able to inject predefined macro definitions into the parser preprocessor state for when we do a hackage roundtrip. - - - - - 6d2efd77 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Tweak testing - - - - - 9a8ae7bd by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Only allow unknown cpp pragmas with # in left margin - - - - - 69d3b736 by Alan Zimmerman at 2025-06-14T09:55:44+01:00 Require # against left margin for all GHC_CPP directives - - - - - d7dd65cf by Alan Zimmerman at 2025-06-14T09:55:45+01:00 Fix CPP directives appearing in pragmas And add a test for error reporting for missing `#if` - - - - - d70d9990 by Alan Zimmerman at 2025-06-14T09:55:45+01:00 Starting to report GHC_CPP errors using GHC machinery - - - - - 686d8176 by Alan Zimmerman at 2025-06-14T09:55:45+01:00 More GHC_CPP diagnostic results - - - - - b1466814 by Alan Zimmerman at 2025-06-14T09:55:45+01:00 WIP on converting error calls to GHC diagnostics in GHC_CPP - - - - - ab80737b by Alan Zimmerman at 2025-06-14T09:55:45+01:00 Working on CPP diagnostic reporting - - - - - 9c98015e by Alan Zimmerman at 2025-06-14T13:26:20+01:00 Tweak some tests/lint warnings - - - - - 0d01124b by Alan Zimmerman at 2025-06-14T15:21:13+01:00 More error reporting in Macro - - - - - 207 changed files: - compiler/GHC.hs - compiler/GHC/Builtin/Names/TH.hs - compiler/GHC/Cmm/Lexer.x - compiler/GHC/Cmm/Parser.y - compiler/GHC/Cmm/Parser/Monad.hs - compiler/GHC/CmmToAsm/LA64.hs - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Config/Parser.hs - compiler/GHC/Driver/Downsweep.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Pipeline.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/Instances.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Iface/Type.hs - compiler/GHC/Parser.hs-boot - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Header.hs - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - + compiler/GHC/Parser/PreProcess.hs - + compiler/GHC/Parser/PreProcess/Eval.hs - + compiler/GHC/Parser/PreProcess/Lexer.x - + compiler/GHC/Parser/PreProcess/Macro.hs - + compiler/GHC/Parser/PreProcess/ParsePP.hs - + compiler/GHC/Parser/PreProcess/Parser.y - + compiler/GHC/Parser/PreProcess/ParserM.hs - + compiler/GHC/Parser/PreProcess/State.hs - compiler/GHC/Parser/Utils.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/SysTools/Cpp.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Solve.hs - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/ErrCtxt.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Concrete.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Error/Codes.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/ThLevelIndex.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/ghc.cabal.in - docs/users_guide/debugging.rst - ghc/GHCi/UI.hs - ghc/ghc-bin.cabal.in - hadrian/doc/flavours.md - hadrian/doc/user-settings.md - hadrian/hadrian.cabal - hadrian/src/Context.hs - hadrian/src/Context/Path.hs - hadrian/src/Flavour.hs - hadrian/src/Flavour/Type.hs - hadrian/src/Rules/SourceDist.hs - hadrian/src/Settings/Builders/Ghc.hs - hadrian/src/Settings/Default.hs - hadrian/src/Settings/Flavours/Release.hs - hadrian/src/Settings/Warnings.hs - hadrian/stack.yaml.lock - libffi-tarballs - libraries/base/changelog.md - libraries/base/tests/IO/withBinaryFile002.stderr - libraries/base/tests/IO/withFile002.stderr - libraries/base/tests/IO/withFileBlocking002.stderr - libraries/containers - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-heap/ghc-heap.cabal.in - libraries/ghc-internal/src/GHC/Internal/Control/Monad/Fail.hs - libraries/ghc-internal/src/GHC/Internal/Exception/Type.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO.hs-boot - libraries/ghc-internal/src/GHC/Internal/IO/Exception.hs-boot - libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs - libraries/ghc-internal/tools/ucd2haskell/ucd2haskell.cabal - libraries/ghci/ghci.cabal.in - libraries/haskeline - libraries/hpc - m4/fp_gcc_supports_no_pie.m4 - m4/fptools_set_c_ld_flags.m4 - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/deSugar/should_run/DsDoExprFailMsg.stderr - testsuite/tests/deSugar/should_run/DsMonadCompFailMsg.stderr - testsuite/tests/dependent/should_fail/T13135_simple.stderr - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/driver/T4437.hs - testsuite/tests/ghc-api/T11579.hs - + testsuite/tests/ghc-cpp/GhcCpp01.hs - + testsuite/tests/ghc-cpp/GhcCpp01.stderr - + testsuite/tests/ghc-cpp/GhcCpp02.hs - + testsuite/tests/ghc-cpp/GhcCpp02.stderr - + testsuite/tests/ghc-cpp/all.T - testsuite/tests/ghci/scripts/T12550.stdout - testsuite/tests/ghci/scripts/T8959b.stderr - testsuite/tests/ghci/scripts/all.T - + testsuite/tests/ghci/scripts/print-unicode-syntax.script - + testsuite/tests/ghci/scripts/print-unicode-syntax.stderr - + testsuite/tests/ghci/scripts/print-unicode-syntax.stdout - testsuite/tests/ghci/should_run/T11825.stdout - testsuite/tests/hpc/fork/hpc_fork.stdout - testsuite/tests/hpc/function/tough.stdout - testsuite/tests/hpc/function2/tough2.stdout - testsuite/tests/hpc/simple/hpc001.stdout - testsuite/tests/interface-stability/base-exports.stdout - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/interface-stability/template-haskell-exports.stdout - testsuite/tests/linear/should_fail/LinearTHFail.stderr - testsuite/tests/linters/notes.stdout - testsuite/tests/partial-sigs/should_fail/T10999.stderr - testsuite/tests/perf/compiler/hard_hole_fits.stderr - + testsuite/tests/printer/CppCommentPlacement.hs - testsuite/tests/quasiquotation/T3953.stderr - + testsuite/tests/quotes/QQError.hs - + testsuite/tests/quotes/QQError.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/quotes/all.T - testsuite/tests/rebindable/DoRestrictedM.hs - + testsuite/tests/th/QQInQuote.hs - + testsuite/tests/th/QQTopError.hs - + testsuite/tests/th/QQTopError.stderr - testsuite/tests/th/T10598_TH.stderr - testsuite/tests/th/T14681.stderr - testsuite/tests/th/T15321.stderr - testsuite/tests/th/T17804.stderr - testsuite/tests/th/T5508.stderr - testsuite/tests/th/TH_Lift.stderr - testsuite/tests/th/all.T - testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr - + testsuite/tests/typecheck/should_compile/T25992.hs - + testsuite/tests/typecheck/should_compile/T25992.stderr - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr - testsuite/tests/typecheck/should_compile/valid_hole_fits.stderr - testsuite/tests/typecheck/should_fail/tcfail097.stderr - + utils/check-cpp/.ghci - + utils/check-cpp/.gitignore - + utils/check-cpp/Eval.hs - + utils/check-cpp/Example1.hs - + utils/check-cpp/Example10.hs - + utils/check-cpp/Example11.hs - + utils/check-cpp/Example12.hs - + utils/check-cpp/Example13.hs - + utils/check-cpp/Example2.hs - + utils/check-cpp/Example3.hs - + utils/check-cpp/Example4.hs - + utils/check-cpp/Example5.hs - + utils/check-cpp/Example6.hs - + utils/check-cpp/Example7.hs - + utils/check-cpp/Example8.hs - + utils/check-cpp/Example9.hs - + utils/check-cpp/Lexer.x - + utils/check-cpp/Macro.hs - + utils/check-cpp/Main.hs - + utils/check-cpp/ParsePP.hs - + utils/check-cpp/ParseSimulate.hs - + utils/check-cpp/Parser.y - + utils/check-cpp/ParserM.hs - + utils/check-cpp/PreProcess.hs - + utils/check-cpp/README.md - + utils/check-cpp/State.hs - + utils/check-cpp/run.sh - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Parsers.hs - utils/check-exact/Preprocess.hs - utils/check-exact/Utils.hs - utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Parser.hs - utils/haddock/haddock-api/src/Haddock/Types.hs - utils/haddock/haddock-library/haddock-library.cabal - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/hpc - utils/hsc2hs - utils/iserv/iserv.cabal.in The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dbedd9273bbad78d40bb413a85c14a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dbedd9273bbad78d40bb413a85c14a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/az/ghc-cpp] Working on CPP diagnostic reporting
by Alan Zimmerman (＠alanz) 14 Jun '25

14 Jun '25

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC Commits: dbedd927 by Alan Zimmerman at 2025-06-14T09:51:38+01:00 Working on CPP diagnostic reporting - - - - - 3 changed files: - compiler/GHC/Parser/PreProcess/Macro.hs - testsuite/tests/ghc-cpp/GhcCpp02.hs - testsuite/tests/ghc-cpp/GhcCpp02.stderr Changes: ===================================== compiler/GHC/Parser/PreProcess/Macro.hs ===================================== @@ -34,6 +34,7 @@ details import Data.Map qualified as Map import Data.Maybe +import Data.List (intercalate) import Data.Semigroup qualified as S import GHC.Parser.PreProcess.Eval @@ -74,7 +75,7 @@ expand loc s str = do addGhcCPPError loc ( hang - (text "Error evaluating CPP condition1:") -- AZ:TODO remove 1 + (text "Error evaluating CPP condition:") 2 (text err <+> text "of" $+$ text str) ) @@ -88,7 +89,6 @@ maxExpansions = 15 expandToks :: SrcSpan -> Int -> MacroDefines -> [Token] -> PP [Token] expandToks loc 0 _ ts = do - -- error $ "macro_expansion limit (" ++ show maxExpansions ++ ") hit, aborting. ts=" ++ show ts addGhcCPPError loc ( hang @@ -110,21 +110,35 @@ doExpandToks loc ed s (TIdentifierLParen n : ts) = -- restore it to its constituent tokens doExpandToks loc ed s (TIdentifier (init n) : TOpenParen "(" : ts) doExpandToks loc _ s (TIdentifier "defined" : ts) = do - let - -- See Note: [defined unary operator] below - - rest = case getExpandArgs ts of - (Just [[TIdentifier macro_name]], rest0) -> - case Map.lookup macro_name s of - Nothing -> TInteger "0" : rest0 - Just _ -> TInteger "1" : rest0 - (Nothing, TIdentifier macro_name : ts0) -> - case Map.lookup macro_name s of - Nothing -> TInteger "0" : ts0 - Just _ -> TInteger "1" : ts0 - (Nothing, _) -> error $ "defined: expected an identifier, got:" ++ show ts - (Just args, _) -> error $ "defined: expected a single arg, got:" ++ show args - return (True, rest) + -- See Note: ['defined' unary operator] below + case getExpandArgs ts of + (Just [[TIdentifier macro_name]], rest0) -> + case Map.lookup macro_name s of + Nothing -> return (True, TInteger "0" : rest0) + Just _ -> return (True, TInteger "1" : rest0) + (Nothing, TIdentifier macro_name : ts0) -> + case Map.lookup macro_name s of + Nothing -> return (True, TInteger "0" : ts0) + Just _ -> return (True, TInteger "1" : ts0) + (Nothing, _) -> do + addGhcCPPError + loc + ( hang + (text "CPP defined: expected an identifier, got:") + 2 + (text (concatMap t_str ts)) + ) + return (False, []) + (Just args, _) -> do + -- error $ "defined: expected a single arg, got:" ++ show args + addGhcCPPError + loc + ( hang + (text "CPP defined: expected a single arg, got:") + 2 + (text (intercalate "," (map (concatMap t_str) args))) + ) + return (False, []) doExpandToks loc ed s (TIdentifier n : ts) = do let (ed', expanded, ts') = case Map.lookup n s of @@ -144,8 +158,8 @@ doExpandToks loc ed s (t : ts) = do return (ed', t : r) {- -Note: [defined unary operator] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Note: ['defined' unary operator] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From https://timsong-cpp.github.io/cppwp/n4140/cpp#cond-1 ===================================== testsuite/tests/ghc-cpp/GhcCpp02.hs ===================================== @@ -12,3 +12,14 @@ foo = #if EXISTENT_MACRO(4) bar = 3 #endif + +#define FOO(X) FOO(X) +#if FOO(3) + +#endif + +#if defined 34 +#endif + +#if defined(A,B) +#endif ===================================== testsuite/tests/ghc-cpp/GhcCpp02.stderr ===================================== @@ -7,3 +7,27 @@ GhcCpp02.hs:12:1: error: [GHC-93098] Parse error at line 1, column 23 of 2 + NONEXISTENT_MACRO ( 4 ) +GhcCpp02.hs:17:1: error: [GHC-93098] + Error evaluating CPP condition: + Parse error at line 1, column 4 of + FOO( 3 ) + +GhcCpp02.hs:17:1: error: [GHC-93098] + CPP macro expansion limit hit: FOO( 3 ) + +GhcCpp02.hs:21:1: error: [GHC-93098] + Error evaluating CPP condition: + Parse error at line 1, column 0 of + + +GhcCpp02.hs:21:1: error: [GHC-93098] + CPP defined: expected an identifier, got: 34 + +GhcCpp02.hs:24:1: error: [GHC-93098] + Error evaluating CPP condition: + Parse error at line 1, column 0 of + + +GhcCpp02.hs:24:1: error: [GHC-93098] + CPP defined: expected a single arg, got: A,B + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dbedd9273bbad78d40bb413a85c14a9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/dbedd9273bbad78d40bb413a85c14a9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/T26115] 15 commits: Bump containers submodule to 0.8
by Simon Peyton Jones (＠simonpj) 14 Jun '25

14 Jun '25

Simon Peyton Jones pushed to branch wip/T26115 at Glasgow Haskell Compiler / GHC Commits: 6d12060f by meooow25 at 2025-06-12T14:26:07-04:00 Bump containers submodule to 0.8 Also * Disable -Wunused-imports for containers * Allow containers-0.8 for in-tree packages * Bump some submodules so that they allow containers-0.8. These are not at any particular versions. * Remove unused deps containers and split from ucd2haskell * Fix tests affected by the new containers and hpc-bin - - - - - 537bd233 by Peng Fan at 2025-06-12T14:27:02-04:00 NCG/LA64: Optimize code generation and reduce build-directory size. 1. makeFarBranches: Prioritize fewer instruction sequences. 2. Prefer instructions with immediate numbers to reduce register moves, e.g. andi,ori,xori,addi. 3. Ppr: Remove unnecessary judgments. 4. genJump: Avoid "ld+jr" as much as possible. 5. BCOND and BCOND1: Implement conditional jumps with two jump ranges, with limited choice of the shortest. 6. Implement FSQRT, CLT, CTZ. 7. Remove unnecessary code. - - - - - 19f20861 by Simon Peyton Jones at 2025-06-13T09:51:11-04:00 Improve redundant constraints for instance decls Addresses #25992, which showed that the default methods of an instance decl could make GHC fail to report redundant constraints. Figuring out how to do this led me to refactor the computation of redundant constraints. See the entirely rewritten Note [Tracking redundant constraints] in GHC.Tc.Solver.Solve - - - - - 1d02798e by Matthew Pickering at 2025-06-13T09:51:54-04:00 Refactor the treatment of nested Template Haskell splices * The difference between a normal splice, a quasiquoter and implicit splice caused by lifting is stored in the AST after renaming. * Information that the renamer learns about splices is stored in the relevant splice extension points (XUntypedSpliceExpr, XQuasiQuote). * Normal splices and quasi quotes record the flavour of splice (exp/pat/dec etc) * Implicit lifting stores information about why the lift was attempted, so if it fails, that can be reported to the user. * After renaming, the decision taken to attempt to implicitly lift a variable is stored in the `XXUntypedSplice` extension field in the `HsImplicitLiftSplice` constructor. * Since all the information is stored in the AST, in `HsUntypedSplice`, the type of `PendingRnSplice` now just stores a `HsUntypedSplice`. * Error messages since the original program can be easily printed, this is noticeable in the case of implicit lifting. * The user-written syntax is directly type-checked. Before, some desugaring took place in the * Fixes .hie files to work better with nested splices (nested splices are not indexed) * The location of the quoter in a quasiquote is now located, so error messages will precisely point to it (and again, it is indexed by hie files) In the future, the typechecked AST should also retain information about the splices and the specific desugaring being left to the desugarer. Also, `runRnSplice` should call `tcUntypedSplice`, otherwise the typechecking logic is duplicated (see the `QQError` and `QQTopError` tests for a difference caused by this). - - - - - f93798ba by Cheng Shao at 2025-06-13T09:52:35-04:00 libffi: update to 3.5.1 Bumps libffi submodule. - - - - - c4f8250e by Simon Peyton Jones at 2025-06-13T23:38:49+01:00 Renaming around predicate types .. we were (as it turned out) abstracting over type-class selectors in SPECIALISATION rules! Wibble isEqPred - - - - - 5eddea74 by Simon Peyton Jones at 2025-06-13T23:40:08+01:00 This increment adds tryTcS to support shortCutSolver * Make short-cut solver invoke the real solver, so that it works for type families. * Use the short-cut solver for quantified constraints too. * Use prepareSpecLHS for the old route too. Leave decomposeRuleLhs for RULES only. - - - - - ea39c9e9 by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 wibbles - - - - - bd760673 by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 Wibble imports - - - - - c59b8cf9 by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 Refactor for Specialise.hs [skip ci] - - - - - 833fed2d by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 More - - - - - 6dc9a307 by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 More wibbles - - - - - 37123721 by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 Add debug call-stacks - - - - - bef83be0 by Simon Peyton Jones at 2025-06-13T23:40:25+01:00 More wibbles - - - - - a1c855b4 by Simon Peyton Jones at 2025-06-14T01:16:46+01:00 Wibble - - - - - 106 changed files: - compiler/GHC/Builtin/Names/TH.hs - compiler/GHC/CmmToAsm/LA64.hs - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/Core/Make.hs - compiler/GHC/Core/Opt/Specialise.hs - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/Rules.hs - compiler/GHC/Core/Subst.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/Unfold/Make.hs - compiler/GHC/Core/Utils.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Expr.hs-boot - compiler/GHC/Hs/Instances.hs - compiler/GHC/HsToCore/Binds.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Lexer.x - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Gen/App.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/Sig.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Gen/Splice.hs-boot - compiler/GHC/Tc/Solver.hs - compiler/GHC/Tc/Solver/Default.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/InertSet.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Rewrite.hs - compiler/GHC/Tc/Solver/Solve.hs - + compiler/GHC/Tc/Solver/Solve.hs-boot - compiler/GHC/Tc/TyCl/Instance.hs - compiler/GHC/Tc/TyCl/PatSyn.hs - compiler/GHC/Tc/Types/Constraint.hs - compiler/GHC/Tc/Types/ErrCtxt.hs - compiler/GHC/Tc/Types/Evidence.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Types/TH.hs - compiler/GHC/Tc/Utils/Concrete.hs - compiler/GHC/Tc/Utils/Instantiate.hs - compiler/GHC/Tc/Utils/Monad.hs - compiler/GHC/Tc/Utils/TcMType.hs - compiler/GHC/Tc/Utils/TcType.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Name/Reader.hs - compiler/GHC/Types/ThLevelIndex.hs - compiler/GHC/Types/Var.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/ghc.cabal.in - ghc/ghc-bin.cabal.in - hadrian/hadrian.cabal - hadrian/src/Settings/Warnings.hs - libffi-tarballs - libraries/containers - libraries/ghc-boot/ghc-boot.cabal.in - libraries/ghc-heap/ghc-heap.cabal.in - libraries/ghc-internal/tools/ucd2haskell/ucd2haskell.cabal - libraries/ghci/ghci.cabal.in - libraries/haskeline - libraries/hpc - testsuite/tests/dependent/should_fail/T13135_simple.stderr - testsuite/tests/diagnostic-codes/codes.stdout - testsuite/tests/hpc/fork/hpc_fork.stdout - testsuite/tests/hpc/function/tough.stdout - testsuite/tests/hpc/function2/tough2.stdout - testsuite/tests/hpc/simple/hpc001.stdout - testsuite/tests/linear/should_fail/LinearTHFail.stderr - testsuite/tests/linters/notes.stdout - testsuite/tests/partial-sigs/should_fail/T10999.stderr - testsuite/tests/perf/compiler/hard_hole_fits.stderr - testsuite/tests/quasiquotation/T3953.stderr - + testsuite/tests/quotes/QQError.hs - + testsuite/tests/quotes/QQError.stderr - testsuite/tests/quotes/T10384.stderr - testsuite/tests/quotes/TH_localname.stderr - testsuite/tests/quotes/all.T - testsuite/tests/rebindable/DoRestrictedM.hs - + testsuite/tests/th/QQInQuote.hs - + testsuite/tests/th/QQTopError.hs - + testsuite/tests/th/QQTopError.stderr - testsuite/tests/th/T10598_TH.stderr - testsuite/tests/th/T14681.stderr - testsuite/tests/th/T17804.stderr - testsuite/tests/th/T5508.stderr - testsuite/tests/th/TH_Lift.stderr - testsuite/tests/th/all.T - testsuite/tests/th/overloaded/TH_overloaded_constraints_fail.stderr - + testsuite/tests/typecheck/should_compile/T25992.hs - + testsuite/tests/typecheck/should_compile/T25992.stderr - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/typecheck/should_fail/tcfail097.stderr - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-library/haddock-library.cabal - utils/hpc - utils/hsc2hs - utils/iserv/iserv.cabal.in The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3405e84ed1b7d4afd30b577c38b2bb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3405e84ed1b7d4afd30b577c38b2bb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-ar
by Cheng Shao (＠TerrorJack) 13 Jun '25

13 Jun '25

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

1 0

[Git][ghc/ghc][wip/module_graph_mode] Move ModuleGraph into UnitEnv
by Rodrigo Mesquita (＠alt-romes) 13 Jun '25

13 Jun '25

Rodrigo Mesquita pushed to branch wip/module_graph_mode at Glasgow Haskell Compiler / GHC Commits: a27803fa by Matthew Pickering at 2025-06-13T20:14:56+01:00 Move ModuleGraph into UnitEnv The ModuleGraph is a piece of information associated with the ExternalPackageState and HomeUnitGraph. Therefore we should store it inside the HomeUnitEnv. - - - - - 12 changed files: - compiler/GHC.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Driver/Backpack.hs - compiler/GHC/Driver/Env.hs - compiler/GHC/Driver/Env/Types.hs - compiler/GHC/Driver/Main.hs - compiler/GHC/Driver/Make.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Unit/Env.hs - ghc/GHCi/UI.hs Changes: ===================================== compiler/GHC.hs ===================================== @@ -859,6 +859,7 @@ setProgramDynFlags_ invalidate_needed dflags = do , ue_namever = ghcNameVersion dflags1 , ue_home_unit_graph = home_unit_graph , ue_current_unit = ue_currentUnit old_unit_env + , ue_module_graph = ue_module_graph old_unit_env , ue_eps = ue_eps old_unit_env } modifySession $ \h -> hscSetFlags dflags1 h{ hsc_unit_env = unit_env } @@ -916,6 +917,7 @@ setProgramHUG_ invalidate_needed new_hug0 = do , ue_home_unit_graph = home_unit_graph , ue_current_unit = ue_currentUnit unit_env0 , ue_eps = ue_eps unit_env0 + , ue_module_graph = ue_module_graph unit_env0 } modifySession $ \h -> -- hscSetFlags takes care of updating the logger as well. @@ -996,7 +998,7 @@ setProgramHUG_ invalidate_needed new_hug0 = do -- invalidateModSummaryCache :: GhcMonad m => m () invalidateModSummaryCache = - modifySession $ \h -> h { hsc_mod_graph = mapMG inval (hsc_mod_graph h) } + modifySession $ \hsc_env -> setModuleGraph (mapMG inval (hsc_mod_graph hsc_env)) hsc_env where inval ms = ms { ms_hs_hash = fingerprint0 } ===================================== compiler/GHC/Core/Opt/Pipeline.hs ===================================== @@ -97,10 +97,11 @@ core2core hsc_env guts@(ModGuts { mg_module = mod where dflags = hsc_dflags hsc_env logger = hsc_logger hsc_env + unit_env = hsc_unit_env hsc_env extra_vars = interactiveInScope (hsc_IC hsc_env) home_pkg_rules = hugRulesBelow hsc_env (moduleUnitId mod) (GWIB { gwib_mod = moduleName mod, gwib_isBoot = NotBoot }) - name_ppr_ctx = mkNamePprCtx ptc (hsc_unit_env hsc_env) rdr_env + name_ppr_ctx = mkNamePprCtx ptc unit_env rdr_env ptc = initPromotionTickContext dflags -- mod: get the module out of the current HscEnv so we can retrieve it from the monad. -- This is very convienent for the users of the monad (e.g. plugins do not have to ===================================== compiler/GHC/Driver/Backpack.hs ===================================== @@ -457,6 +457,7 @@ addUnit u = do (homeUnitId home_unit) (HUG.mkHomeUnitEnv unit_state (Just dbs) dflags (ue_hpt old_unit_env) (Just home_unit)) , ue_eps = ue_eps old_unit_env + , ue_module_graph = ue_module_graph old_unit_env } setSession $ hscSetFlags dflags $ hsc_env { hsc_unit_env = unit_env } ===================================== compiler/GHC/Driver/Env.hs ===================================== @@ -2,6 +2,8 @@ module GHC.Driver.Env ( Hsc(..) , HscEnv (..) + , hsc_mod_graph + , setModuleGraph , hscUpdateFlags , hscSetFlags , hsc_home_unit @@ -130,6 +132,9 @@ hsc_HUE = ue_currentHomeUnitEnv . hsc_unit_env hsc_HUG :: HscEnv -> HomeUnitGraph hsc_HUG = ue_home_unit_graph . hsc_unit_env +hsc_mod_graph :: HscEnv -> ModuleGraph +hsc_mod_graph = ue_module_graph . hsc_unit_env + hsc_all_home_unit_ids :: HscEnv -> Set.Set UnitId hsc_all_home_unit_ids = HUG.allUnits . hsc_HUG @@ -139,6 +144,9 @@ hscInsertHPT hmi hsc_env = UnitEnv.insertHpt hmi (hsc_unit_env hsc_env) hscUpdateHUG :: (HomeUnitGraph -> HomeUnitGraph) -> HscEnv -> HscEnv hscUpdateHUG f hsc_env = hsc_env { hsc_unit_env = updateHug f (hsc_unit_env hsc_env) } +setModuleGraph :: ModuleGraph -> HscEnv -> HscEnv +setModuleGraph mod_graph hsc_env = hsc_env { hsc_unit_env = (hsc_unit_env hsc_env) { ue_module_graph = mod_graph } } + {- Note [Target code interpreter] @@ -220,15 +228,15 @@ hscEPS hsc_env = readIORef (euc_eps (ue_eps (hsc_unit_env hsc_env))) -- | Find all rules in modules that are in the transitive closure of the given -- module. hugRulesBelow :: HscEnv -> UnitId -> ModuleNameWithIsBoot -> IO RuleBase -hugRulesBelow hsc uid mn = foldr (flip extendRuleBaseList) emptyRuleBase <$> - hugSomeThingsBelowUs (md_rules . hm_details) False hsc uid mn +hugRulesBelow hsc_env uid mn = foldr (flip extendRuleBaseList) emptyRuleBase <$> + hugSomeThingsBelowUs (md_rules . hm_details) False hsc_env uid mn -- | Get annotations from all modules "below" this one (in the dependency -- sense) within the home units. If the module is @Nothing@, returns /all/ -- annotations in the home units. hugAnnsBelow :: HscEnv -> UnitId -> ModuleNameWithIsBoot -> IO AnnEnv -hugAnnsBelow hsc uid mn = foldr (flip extendAnnEnvList) emptyAnnEnv <$> - hugSomeThingsBelowUs (md_anns . hm_details) False hsc uid mn +hugAnnsBelow hsc_env uid mn = foldr (flip extendAnnEnvList) emptyAnnEnv <$> + hugSomeThingsBelowUs (md_anns . hm_details) False hsc_env uid mn -- | Find all COMPLETE pragmas in modules that are in the transitive closure of the -- given module. @@ -260,7 +268,8 @@ hugInstancesBelow hsc_env uid mnwib = do hugSomeThingsBelowUs :: (HomeModInfo -> [a]) -> Bool -> HscEnv -> UnitId -> ModuleNameWithIsBoot -> IO [[a]] -- An explicit check to see if we are in one-shot mode to avoid poking the ModuleGraph thunk -- These things are currently stored in the EPS for home packages. (See #25795 for --- progress in removing these kind of checks) +-- progress in removing these kind of checks; and making these functions of +-- `UnitEnv` rather than `HscEnv`) -- See Note [Downsweep and the ModuleGraph] hugSomeThingsBelowUs _ _ hsc_env _ _ | isOneShot (ghcMode (hsc_dflags hsc_env)) = return [] hugSomeThingsBelowUs extract include_hi_boot hsc_env uid mn ===================================== compiler/GHC/Driver/Env/Types.hs ===================================== @@ -18,7 +18,6 @@ import GHC.Types.Name.Cache import GHC.Types.Target import GHC.Types.TypeEnv import GHC.Unit.Finder.Types -import GHC.Unit.Module.Graph import GHC.Unit.Env import GHC.Utils.Logger import GHC.Utils.TmpFs @@ -65,10 +64,6 @@ data HscEnv hsc_targets :: [Target], -- ^ The targets (or roots) of the current session - hsc_mod_graph :: ModuleGraph, - -- ^ The module graph of the current session - -- See Note [Downsweep and the ModuleGraph] for when this is constructed. - hsc_IC :: InteractiveContext, -- ^ The context for evaluating interactive statements @@ -113,3 +108,4 @@ data HscEnv , hsc_llvm_config :: !LlvmConfigCache -- ^ LLVM configuration cache. } + ===================================== compiler/GHC/Driver/Main.hs ===================================== @@ -332,7 +332,6 @@ newHscEnvWithHUG top_dir top_dynflags cur_unit home_unit_graph = do return HscEnv { hsc_dflags = top_dynflags , hsc_logger = setLogFlags logger (initLogFlags top_dynflags) , hsc_targets = [] - , hsc_mod_graph = emptyMG , hsc_IC = emptyInteractiveContext dflags , hsc_NC = nc_var , hsc_FC = fc_var ===================================== compiler/GHC/Driver/Make.hs ===================================== @@ -190,12 +190,12 @@ depanalE diag_wrapper msg excluded_mods allow_dup_roots = do all_errs <- liftIO $ HUG.unitEnv_foldWithKey one_unit_messages (return emptyMessages) (hsc_HUG hsc_env) logDiagnostics (GhcDriverMessage <$> all_errs) - setSession hsc_env { hsc_mod_graph = mod_graph } + setSession (setModuleGraph mod_graph hsc_env) pure (emptyMessages, mod_graph) else do -- We don't have a complete module dependency graph, -- The graph may be disconnected and is unusable. - setSession hsc_env { hsc_mod_graph = emptyMG } + setSession (setModuleGraph emptyMG hsc_env) pure (errs, emptyMG) @@ -616,7 +616,7 @@ load' mhmi_cache how_much diag_wrapper mHscMessage mod_graph = do -- for any client who might interact with GHC via load'. -- See Note [Timing of plugin initialization] initializeSessionPlugins - modifySession $ \hsc_env -> hsc_env { hsc_mod_graph = mod_graph } + modifySession (setModuleGraph mod_graph) guessOutputFile hsc_env <- getSession ===================================== compiler/GHC/Driver/Pipeline/Execute.hs ===================================== @@ -768,8 +768,9 @@ runHscPhase pipe_env hsc_env0 input_fn src_flavour = do -- files. See GHC.Tc.Utils.TcGblEnv.tcg_type_env_var. -- See also Note [hsc_type_env_var hack] type_env_var <- newIORef emptyNameEnv - let hsc_env' = hsc_env { hsc_type_env_vars = knotVarsFromModuleEnv (mkModuleEnv [(mod, type_env_var)]) - , hsc_mod_graph = mg } + let hsc_env' = + setModuleGraph mg + hsc_env { hsc_type_env_vars = knotVarsFromModuleEnv (mkModuleEnv [(mod, type_env_var)]) } ===================================== compiler/GHC/Iface/Load.hs ===================================== @@ -671,7 +671,7 @@ dontLeakTheHUG thing_inside = do -- oneshot mode does not support backpack -- and we want to avoid prodding the hsc_mod_graph thunk | isOneShot (ghcMode (hsc_dflags hsc_env)) = False - | mgHasHoles (hsc_mod_graph hsc_env) = True + | mgHasHoles (ue_module_graph old_unit_env) = True | otherwise = False pruneHomeUnitEnv hme = do -- NB: These are empty HPTs because Iface/Load first consults the HPT @@ -683,19 +683,19 @@ dontLeakTheHUG thing_inside = do | otherwise = do hug' <- traverse pruneHomeUnitEnv (ue_home_unit_graph old_unit_env) + let !new_mod_graph = emptyMG { mg_mss = panic "cleanTopEnv: mg_mss" + , mg_graph = panic "cleanTopEnv: mg_graph" + , mg_has_holes = keepFor20509 } return old_unit_env { ue_home_unit_graph = hug' + , ue_module_graph = new_mod_graph } in do !unit_env <- unit_env_io -- mg_has_holes will be checked again, but nothing else about the module graph - let !new_mod_graph = emptyMG { mg_mss = panic "cleanTopEnv: mg_mss" - , mg_graph = panic "cleanTopEnv: mg_graph" - , mg_has_holes = keepFor20509 } pure $ hsc_env { hsc_targets = panic "cleanTopEnv: hsc_targets" - , hsc_mod_graph = new_mod_graph , hsc_IC = panic "cleanTopEnv: hsc_IC" , hsc_type_env_vars = case maybe_type_vars of Just vars -> vars ===================================== compiler/GHC/Tc/Module.hs ===================================== @@ -2109,7 +2109,7 @@ for the unit portion of the graph, if it's not already been performed. withInteractiveModuleNode :: HscEnv -> TcM a -> TcM a withInteractiveModuleNode hsc_env thing_inside = do mg <- liftIO $ downsweepInteractiveImports hsc_env (hsc_IC hsc_env) - updTopEnv (\env -> env { hsc_mod_graph = mg }) thing_inside + updTopEnv (setModuleGraph mg) thing_inside runTcInteractive :: HscEnv -> TcRn a -> IO (Messages TcRnMessage, Maybe a) ===================================== compiler/GHC/Unit/Env.hs ===================================== @@ -23,21 +23,22 @@ -- ┌▽────────────┐ │ │ -- │HomeUnitGraph│ │ │ -- └┬────────────┘ │ │ --- ┌▽─────────────────▽┐ │ --- │UnitEnv │ │ --- └┬──────────────────┘ │ --- ┌▽───────────────────────────────────────▽┐ --- │HscEnv │ --- └─────────────────────────────────────────┘ +-- ┌▽─────────────────▽─────────────────────▽┐ +-- │UnitEnv │ +-- └┬─────────────-──────────────────────────┘ +-- │ +-- │ +-- ┌▽──────────────────────────────────────▽┐ +-- │HscEnv │ +-- └────────────────────────────────────────┘ -- @ -- --- The 'UnitEnv' references both the 'HomeUnitGraph' (with all the home unit --- modules) and the 'ExternalPackageState' (information about all --- non-home/external units). The 'HscEnv' references this 'UnitEnv' and the --- 'ModuleGraph' (which describes the relationship between the modules being --- compiled). The 'HomeUnitGraph' has one 'HomePackageTable' for every unit. --- --- TODO: Arguably, the 'ModuleGraph' should be part of 'UnitEnv' rather than being in the 'HscEnv'. +-- The 'UnitEnv' references the 'HomeUnitGraph' (with all the home unit +-- modules), the 'ExternalPackageState' (information about all +-- non-home/external units), and the 'ModuleGraph' (which describes the +-- relationship between the modules being compiled). +-- The 'HscEnv' references this 'UnitEnv'. +-- The 'HomeUnitGraph' has one 'HomePackageTable' for every unit. module GHC.Unit.Env ( UnitEnv (..) , initUnitEnv @@ -119,6 +120,7 @@ import GHC.Unit.Home.ModInfo import GHC.Unit.Home.PackageTable import GHC.Unit.Home.Graph (HomeUnitGraph, HomeUnitEnv) import qualified GHC.Unit.Home.Graph as HUG +import GHC.Unit.Module.Graph import GHC.Platform import GHC.Settings @@ -163,6 +165,10 @@ data UnitEnv = UnitEnv , ue_current_unit :: UnitId + , ue_module_graph :: !ModuleGraph + -- ^ The module graph of the current session + -- See Note [Downsweep and the ModuleGraph] for when this is constructed. + , ue_home_unit_graph :: !HomeUnitGraph -- See Note [Multiple Home Units] @@ -182,6 +188,7 @@ initUnitEnv cur_unit hug namever platform = do return $ UnitEnv { ue_eps = eps , ue_home_unit_graph = hug + , ue_module_graph = emptyMG , ue_current_unit = cur_unit , ue_platform = platform , ue_namever = namever ===================================== ghc/GHCi/UI.hs ===================================== @@ -4680,7 +4680,7 @@ clearHPTs = do let pruneHomeUnitEnv hme = liftIO $ do emptyHpt <- emptyHomePackageTable pure hme{ homeUnitEnv_hpt = emptyHpt } - discardMG hsc = hsc { hsc_mod_graph = GHC.emptyMG } + discardMG hsc = setModuleGraph GHC.emptyMG hsc modifySessionM $ \hsc_env -> do hug' <- traverse pruneHomeUnitEnv $ hsc_HUG hsc_env pure $ discardMG $ discardIC $ hscUpdateHUG (const hug') hsc_env View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a27803fa7ab18582f61558aaf3799d9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a27803fa7ab18582f61558aaf3799d9… You're receiving this email because of your account on gitlab.haskell.org.

1 0