Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: b5883cee by Lauren Yim at 2025-06-17T16:46:12-04:00 fix some typos in the warnings page in the user guide - - - - - 4b0c0cd1 by Rodrigo Mesquita at 2025-06-17T16:46:13-04:00 Add a frozen callstack to throwGhcException Fixes #25956 - - - - - 2 changed files: - compiler/GHC/Utils/Panic.hs - docs/users_guide/using-warnings.rst Changes: ===================================== compiler/GHC/Utils/Panic.hs ===================================== @@ -177,7 +177,7 @@ showGhcException ctx = showPlainGhcException . \case PprProgramError str sdoc -> PlainProgramError $ concat [str, "\n\n", renderWithContext ctx sdoc] -throwGhcException :: GhcException -> a +throwGhcException :: HasCallStack => GhcException -> a throwGhcException = Exception.throw throwGhcExceptionIO :: GhcException -> IO a @@ -192,7 +192,7 @@ pprPanic s doc = withFrozenCallStack $ panicDoc s (doc $$ callStackDoc) -- | Throw an exception saying "bug in GHC" panicDoc :: HasCallStack => String -> SDoc -> a -panicDoc x doc = throwGhcException (PprPanic x doc) +panicDoc x doc = withFrozenCallStack $ throwGhcException (PprPanic x doc) -- | Throw an exception saying "this isn't finished yet" sorryDoc :: String -> SDoc -> a ===================================== docs/users_guide/using-warnings.rst ===================================== @@ -2536,7 +2536,7 @@ of ``-W(no-)*``. :since: 9.8.1 - Ino accordance with `GHC Proposal #134 + In accordance with `GHC Proposal #134 https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0134-de...`__, it is now possible to deprecate certain exports of a name without deprecating the name itself. @@ -2556,8 +2556,8 @@ of ``-W(no-)*``. ) import A - When :ghc-flag:`-Wincomplete-export-warnings` is enabled, GHC warns about exports - that are not deprecating a name that is deprecated with another export in that module. + When :ghc-flag:`-Wincomplete-export-warnings` is enabled, GHC warns about exports + that are not deprecating a name that is deprecated with another export in that module. .. ghc-flag:: -Wbadly-levelled-types :shortdesc: warn when type binding is used at the wrong Template Haskell level. @@ -2630,7 +2630,7 @@ of ``-W(no-)*``. :since: 9.10.1 Introduced in GHC 9.10.1 with the introduction of an implicit - :base-ref:`Control.Exception.Context.ExceptionContext`` context to + :base-ref:`Control.Exception.Context.ExceptionContext` context to :base-ref:`Control.Exception.SomeException`. To preserve compatibility with earlier compilers, this constraints is implicitly defaulted to :base-ref:`Control.Exception.Context.emptyExceptionContext` when no other View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6c833f3ea06403ea09db19937b9a00a... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6c833f3ea06403ea09db19937b9a00a... You're receiving this email because of your account on gitlab.haskell.org.