[Git][ghc/ghc][wip/9.10.3-backports] 15 commits: bump deepseq to 1.5.2.0
Zubin pushed to branch wip/9.10.3-backports at Glasgow Haskell Compiler / GHC Commits: 9eefe6ba by Zubin Duggal at 2025-07-24T23:53:12+05:30 bump deepseq to 1.5.2.0 - - - - - add840dc by Zubin Duggal at 2025-07-24T23:53:12+05:30 bump os-string to 2.0.7 - - - - - b00be995 by Zubin Duggal at 2025-07-24T23:53:13+05:30 bump process to 1.6.26.1 - - - - - f3d00969 by Zubin Duggal at 2025-07-24T23:53:13+05:30 bump unix to 2.8.7.0 - - - - - b3899d42 by Jens Petersen at 2025-07-24T23:53:13+05:30 9.10 hadrian can build with Cabal-3.12.1 fixes #25605 (cherry picked from commit 07f17b6ed1bb0ba7134ee8dfd992036e97552c94) - - - - - 3b1ef0ae by sheaf at 2025-07-24T23:53:13+05:30 Don't cache solved [W] HasCallStack constraints This commit ensures we do not add solved Wanted constraints that mention HasCallStack or HasExceptionContext constraints to the set of solved Wanted dictionary constraints: caching them is invalid, because re-using such cached dictionaries means using an old call-stack instead of constructing a new one, as was reported in #25529. Fixes #25529. (cherry picked from commit 256ac29c8df4f17a1d50ea243408d506ebf395d6) - - - - - 7492d007 by Zubin Duggal at 2025-07-24T23:53:13+05:30 In commit "Don't cache solved [W] HasCallStack constraints" (256ac29c8df4f17a1d50ea243408d506ebf395d6), we attempt to use `tryM` to avoid errors when looking up certain known-key names like CallStack while compiling ghc-prim and ghc-internal. Unfortunately, `tryM` doesn't catch module lookup errors. This manifests as a failure to build ghc-prim in `--make` mode on the GHC 9.10 branch. Instead, we explicitly avoid doing lookups when we are compiling ghc-prim or ghc-internal instead of relying on catching the exception. - - - - - ce5f1782 by Zubin Duggal at 2025-07-24T23:53:13+05:30 Consider `PromotedDataCon` in `tyConStupidTheta` Haddock checks data declarations for the stupid theta so as not to pretty-print them as empty contexts. Type data declarations end up as `PromotedDataCon`s by the time Haddock performs this check, causing a panic. This commit extends `tyConStupidTheta` so that it returns an empty list for `PromotedDataCon`s. This decision was guided by the fact that type data declarations never have data type contexts (see (R1) in Note [Type data declarations]). Fixes #25739. (cherry picked from commit 8d33d048dbe159a045a4c304fa92318365a3dfe2) - - - - - a54ae3d5 by Ryan Hendrickson at 2025-07-24T23:53:13+05:30 haddock: Preserve indentation in multiline examples Intended for use with :{ :}, but doesn't look for those characters. Any consecutive lines with birdtracks will only have initial whitespace stripped up to the column of the first line. (cherry picked from commit 2c73250494fd9f48ebda6d6fe72f0cd03182aff1) - - - - - ccd546a9 by Ryan Hendrickson at 2025-07-24T23:53:13+05:30 haddock: Parse math even after ordinary characters Fixes a bug where math sections were not recognized if preceded by a character that isn't special (like space or a markup character). (cherry picked from commit b790d647c1ccdcc9aa8f166c3e0e42d0a5c29625) - - - - - 6c735ac2 by Ryan Hendrickson at 2025-07-24T23:53:13+05:30 haddock: Fix links to type operators (cherry picked from commit a0adc30d892f14f543f39d5c45faccacbc28afb4) - - - - - 68ce2fde by Ryan Hendrickson at 2025-07-24T23:53:13+05:30 haddock: Document instances from other packages When attaching instances to `Interface`s, it isn't enough just to look for instances in the list of `Interface`s being processed. We also need to look in the modules on which they depend, including those outside of this package. Fixes #25147. Fixes #26079. (cherry picked from commit a26243fde4680271712a3d774e17f6cd6da4a652) - - - - - d23694b3 by Zubin Duggal at 2025-07-24T23:53:13+05:30 haddock: Don't warn about missing link destinations for derived names. Fixes #26114 (cherry picked from commit 5dabc718a04bfc4d277c5ff7f815ee3d6b9670cb) - - - - - 539a44bc by Zubin Duggal at 2025-07-24T23:53:13+05:30 Bump haddock version to 2.31.3 - - - - - 2c48d725 by Zubin Duggal at 2025-07-24T23:53:13+05:30 Prepare 9.10.3 prerelease - - - - - 31 changed files: - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/TyCon.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/Solver/Monad.hs - compiler/GHC/Tc/Solver/Types.hs - configure.ac - + docs/users_guide/9.10.3-notes.rst - hadrian/hadrian.cabal - hadrian/src/Context.hs - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs - hadrian/src/Hadrian/Haskell/Cabal/Type.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/CabalReinstall.hs - hadrian/src/Rules/Register.hs - hadrian/src/Rules/Rts.hs - hadrian/src/Settings/Builders/Ghc.hs - libraries/deepseq - libraries/os-string - libraries/process - libraries/unix - testsuite/driver/testlib.py - testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout - testsuite/tests/driver/T20604/T20604.stdout - testsuite/tests/ghci/scripts/ghci064.stdout - testsuite/tests/plugins/plugins10.stdout - testsuite/tests/plugins/static-plugins.stdout - + testsuite/tests/simplCore/should_compile/T21391.stderr - + testsuite/tests/typecheck/should_run/T25529.hs - + testsuite/tests/typecheck/should_run/T25529.stdout - testsuite/tests/typecheck/should_run/all.T - utils/haddock The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c903b58277328bf21114a5918fc21ce... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c903b58277328bf21114a5918fc21ce... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Zubin (@wz1000)