- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: Consolidate all CPU feature handling
by Marge Bot (＠marge-bot) 02 Nov '26

02 Nov '26

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 075ed9d7 by sheaf at 2026-11-02T11:22:33-05:00 Consolidate all CPU feature handling This commit introduces GHC.Platform.CpuFeatures which consolidates all of the logic for implications between CPU feature flags (mainly X86): - DynFlags now only records the set of -m<feature> flags that were passed, as an EnumSet CpuFeature. That keeps it a simple record of the flags the user passed, with no post-processing. - GHC.Platform.CpuFeatures.initCpuFeatures turns this set into a CpuFeatures value, applying all implications and the per-architecture baseline. This is the single home for all of the feature implication logic. Some datatypes were reworked to better reflect the implication structure in the types, e.g. SseAvxVersion has a strategically placed 'FMA' boolean. - The NCG, LLVM backend, StgToCmm, CPP defines and LLVM -mattr flags all consult CpuFeatures, via targetCpuFeatures. See Note [CPU features], which replaces Note [Implications between X86 CPU feature flags]. Behaviour changes: - x86 feature flags (-msse3, -mavx, -mavx512*, -mgfni, ...) passed when targeting a non-x86 architecture no longer cause x86 CPP macros (__SSE3__, __AVX512BW__, __GFNI__, ...) to be defined, nor x86 attributes to be passed to LLVM. - Error messages reported when required CPU features are not enabled now print out the minimal set of flags required (e.g. "-mavx512vl" rather than "-mavx512f -mavx512vl"). - - - - - e98ca9d8 by Luite Stegeman at 2026-11-02T11:22:49-05:00 rts: move stack check to the start of the stg_unpack_cstring thunks fixes a deadlock see #27272 - - - - - de180a5a by Simon Jakobi at 2026-11-02T11:22:50-05:00 Cmm: exclude the entry block from common block elimination a1d8139054c had fixed #27722 only partially, because it didn't prevent elimination of the entry block in later rounds, where the entry block is no longer guaranteed to come first. To close this loophole, we exclude the entry block from the CBE merge logic. See Note [Retain entry block during common block elimination] for details. This also deletes a misleading comment regarding unreachable blocks: the control-flow optimiser doesn't actually guarantee that no unreachable blocks reach CBE. Fixes #27722. Assisted-by: Claude Fable 5.1 - - - - - b50bf52a by Alan Zimmerman at 2026-11-02T11:22:51-05:00 EPA: Use AnnList for GADT declarations Continuing the process of using AnnList to capture parser layout - - - - - 44 changed files: - changelog.d/T27722-cbe-entry-block.md - + changelog.d/caf-deadlock-27272 - compiler/GHC/Cmm/CallConv.hs - compiler/GHC/Cmm/CommonBlockElim.hs - compiler/GHC/CmmToAsm/Config.hs - compiler/GHC/CmmToAsm/X86/CodeGen.hs - compiler/GHC/CmmToAsm/X86/Instr.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/CmmToLlvm/Config.hs - compiler/GHC/Driver/Config/CmmToAsm.hs - compiler/GHC/Driver/Config/CmmToLlvm.hs - compiler/GHC/Driver/Config/StgToCmm.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Pipeline/Execute.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Platform.hs - + compiler/GHC/Platform/CpuFeatures.hs - compiler/GHC/StgToCmm/Config.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/SysTools/Cpp.hs - compiler/ghc.cabal.in - rts/StgStdThunks.cmm - + testsuite/tests/cmm/should_run/T27722.hs - + testsuite/tests/cmm/should_run/T27722_cmm.cmm - testsuite/tests/cmm/should_run/all.T - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/printer/T18791.stderr - + testsuite/tests/rts/T27272.hs - + testsuite/tests/rts/T27272_gen.py - testsuite/tests/rts/all.T - 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/0d9927b949d5ba2e815aa361cbeda7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0d9927b949d5ba2e815aa361cbeda7… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][ghc-9.12] 5 commits: tag inference: don't confuse functions with their return values
by Magnus (＠MangoIV) 02 Nov '26

02 Nov '26

Magnus pushed to branch ghc-9.12 at Glasgow Haskell Compiler / GHC Commits: af470330 by Luite Stegeman at 2026-10-26T15:26:44+01:00 tag inference: don't confuse functions with their return values inferTagRhs was mixing up taggedness for closures and return values for function closures. We really shouldn't assign TagTuple to a properly tagged function returning a tuple. We fix this by keeping track of functions (TagFun) separately from values (TagVal) and keeping track of their return value. TagFun is also used for join points. fixes #27005 (cherry picked from commit 7fe4f2ec3ce12ea138177c81a019dcfc148fe5d4) - - - - - eb0cc0f1 by Andreas Klebinger at 2026-11-02T11:01:01+01:00 Fix a few tag inference bugs. * Treat bottoming functions and nullary join points as functions. * When generating bytecode don't rely on imported tag sigs. Fixes #27831, #27841 and #27842. (cherry picked from commit 6bbca56943ef68ba32520bcf8712a8faf9021ed6) - - - - - 9e074512 by Phil Hazelden at 2026-11-02T11:01:01+01:00 Fix build with werror on glibc 2.43. We've been defining `_XOPEN_SOURCE` and `_POSIX_C_SOURCE` to the same values as defined in glibc prior to 2.43. But in 2.43, glibc changes them to new values, which means we get a warning when redefining them. By `#undef`ing them first, we no longer get a warning. Closes #27076. (cherry picked from commit 7b9a75f09a0a8d11d843f43e8e938b6608fb5166) - - - - - 17f4f0da by Zubin Duggal at 2026-11-02T11:01:01+01:00 DmdAnal: Make AbsDmd neutral in maxDmd fixes #27845 (cherry picked from commit f76464cff4a9b55bb01e612bffe0dd866a9982e3) - - - - - 551686d5 by Luite Stegeman at 2026-11-02T11:01:02+01:00 rts: move stack check to the start of the stg_unpack_cstring thunks fixes a deadlock see #27272 (cherry picked from commit ff6d941afc5f113f7e8d7487e809584973281c60) - - - - - 57 changed files: - + changelog.d/27845 - + changelog.d/T27831-bottoming-strict-field - + changelog.d/T27842-bytecode-imported-tags - + changelog.d/caf-deadlock-27272 - + changelog.d/tag-inference-27005 - compiler/GHC/Core/Utils.hs - compiler/GHC/Stg/InferTags.hs - compiler/GHC/Stg/InferTags/Rewrite.hs - compiler/GHC/Stg/InferTags/TagSig.hs - compiler/GHC/Stg/InferTags/Types.hs - compiler/GHC/Types/Demand.hs - rts/StgStdThunks.cmm - rts/include/rts/PosixSource.h - + testsuite/tests/bytecode/T27842.hs - + testsuite/tests/bytecode/T27842.stdout - + testsuite/tests/bytecode/T27842A.hs - + testsuite/tests/bytecode/T27842N.hs - testsuite/tests/bytecode/all.T - testsuite/tests/core-to-stg/T14895.stderr - + testsuite/tests/dmdanal/should_run/T27845.hs - + testsuite/tests/dmdanal/should_run/T27845.stdout - + testsuite/tests/dmdanal/should_run/T27845_Lib.hs - + testsuite/tests/dmdanal/should_run/T27845b.hs - + testsuite/tests/dmdanal/should_run/T27845b.stdout - + testsuite/tests/dmdanal/should_run/T27845b_Lib.hs - testsuite/tests/dmdanal/should_run/all.T - testsuite/tests/linters/notes.stdout - + testsuite/tests/rts/T27272.hs - + testsuite/tests/rts/T27272_gen.py - testsuite/tests/rts/all.T - testsuite/tests/simplCore/should_compile/T4201.stdout - + testsuite/tests/simplCore/should_run/T27005.hs - + testsuite/tests/simplCore/should_run/T27005.stdout - + testsuite/tests/simplCore/should_run/T27005_aux.hs - testsuite/tests/simplCore/should_run/all.T - testsuite/tests/simplStg/should_compile/T24806.hs - testsuite/tests/simplStg/should_compile/T24806.stderr - + testsuite/tests/simplStg/should_compile/T27005b.hs - + testsuite/tests/simplStg/should_compile/T27005b.stderr - testsuite/tests/simplStg/should_compile/all.T - testsuite/tests/simplStg/should_compile/inferTags004.hs - testsuite/tests/simplStg/should_compile/inferTags004.stderr - + testsuite/tests/simplStg/should_compile/inferTags005.hs - + testsuite/tests/simplStg/should_compile/inferTags005.stderr - + testsuite/tests/simplStg/should_compile/inferTags006.hs - + testsuite/tests/simplStg/should_compile/inferTags006.stderr - + testsuite/tests/simplStg/should_run/InferTags007_A.hs - testsuite/tests/simplStg/should_run/Makefile - + testsuite/tests/simplStg/should_run/T27005a.hs - + testsuite/tests/simplStg/should_run/T27005a.stdout - + testsuite/tests/simplStg/should_run/T27831.hs - + testsuite/tests/simplStg/should_run/T27831.stdout - + testsuite/tests/simplStg/should_run/T27857.hs - + testsuite/tests/simplStg/should_run/T27857.stdout - testsuite/tests/simplStg/should_run/all.T - + testsuite/tests/simplStg/should_run/inferTags007.hs - + testsuite/tests/simplStg/should_run/inferTags007.stdout The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/087fbaa9bbbedc61b1a4100c7dba76… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/087fbaa9bbbedc61b1a4100c7dba76… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/romes/exec-break-has-resume] interp: Make resumeExec and ExecBreak use `Resume` directly
by Rodrigo Mesquita (＠alt-romes) 02 Nov '26

02 Nov '26

Rodrigo Mesquita pushed to branch wip/romes/exec-break-has-resume at Glasgow Haskell Compiler / GHC Commits: e87649c0 by Rodrigo Mesquita at 2026-11-02T15:03:34+00:00 interp: Make resumeExec and ExecBreak use `Resume` directly Previously, `Resume` contexts were just put directly in the global interactive environment state, so they were only accessible through it. However, in the context of multi-threaded debugging, in that many threads may hit breakpoints, it no longer suffices to have a global linear list of breakpoints hit. We need a per-breakpoint Resume context and need to be able to wield it directly rather than going through a global context. The driving changes of this commit are: - Put the Resume data in ExecBreak - Make resumeExec receive a Resume as an argument This also simplifies the interpreter in that we no longer necessarily rely on the global interactive state to resume a thread. We can do it directly from the ExecBreak. The interactive context still maintains a stack of resumes, but `resumeExec` can no longer pop the resume it resumes off of the breakpoints stack, since it is no longer guaranteed to be resuming the first in that list. Hence, callers of `resumeExec` must update ic_resume on their own. Fixes #28058 - - - - - 5 changed files: - + changelog.d/ghc-api-exec-break-resume - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Eval/Types.hs - ghc/GHCi/UI.hs - ghc/GHCi/UI/Monad.hs Changes: ===================================== changelog.d/ghc-api-exec-break-resume ===================================== @@ -0,0 +1,14 @@ +section: ghc-lib +synopsis: An ``ExecBreak`` now stores its ``Resume`` and ``resumeExec`` receives it explicitly +issues: #28058 +mrs: !16889 + +description: { +- ``ExecBreak`` has a new field ``breakResume :: Resume`` with the context needed + to resume the thread stopped at that breakpoint. +- ``resumeExec`` takes a specific ``Resume`` to continue as an extra argument, + instead of resuming the most recent breakpoint in ``ic_resume``. +- ``resumeExec`` no longer pops the ``Resume`` off ``ic_resume``. Callers that + rely on the ``ic_resume`` stack must now update it themselves, for instance + if if calling ``resumeExec`` on the first ``Resume`` in the context. +} ===================================== compiler/GHC/Runtime/Eval.hs ===================================== @@ -290,7 +290,8 @@ emptyHistory size = nilBL size -- breakpoint if we don't care about that breakpoint (e.g. if using :steplocal -- or :stepmodule, rather than :step, we only care about certain breakpoints). handleRunStatus :: GhcMonad m - => SingleStep -> String + => SingleStep + -> String -> ResumeBindings -> [Id] -> EvalStatus_ [ForeignHValue] [HValueRef] @@ -343,7 +344,7 @@ handleRunStatus step expr bindings final_ids status history0 = do hsc_env2 = pushResume hsc_env1 resume setSession hsc_env2 - return (ExecBreak break_ids Nothing) + return (ExecBreak break_ids Nothing resume) -- EvalBreak (Just ...) case: the interpreter stopped at a breakpoint -- @@ -389,7 +390,7 @@ handleRunStatus step expr bindings final_ids status history0 = do } hsc_env2 = pushResume hsc_env1 resume setSession hsc_env2 - return (ExecBreak break_ids (Just ibi)) + return (ExecBreak break_ids (Just ibi) resume) else do -- resume with the same step type let eval_opts = initEvalOpts dflags (enableGhcStepMode step) @@ -404,65 +405,67 @@ handleRunStatus step expr bindings final_ids status history0 = do tracing | RunAndLogSteps <- step = True | otherwise = False -resumeExec :: GhcMonad m => SingleStep -> Maybe Int +-- | Resume a paused thread given its 'Resume' context. +-- +-- The interactive things in scope are restored to the things available at the +-- time this paused thread hit the breakpoint. +-- +-- This 'Resume' is not popped off the interactive `ic_resume` breakpoint +-- stack, since there's no way to tell which of the breakpoints in the stack is +-- the one we're resuming. +resumeExec :: GhcMonad m + => SingleStep + -> Maybe Int + -> Resume -> m ExecResult -resumeExec step mbCnt - = do - hsc_env <- getSession - let ic = hsc_IC hsc_env - resume = ic_resume ic - - case resume of - [] -> liftIO $ - throwGhcExceptionIO (ProgramError "not stopped at a breakpoint") - (r:rs) -> do - -- unbind the temporary locals by restoring the TypeEnv from - -- before the breakpoint, and drop this Resume from the - -- InteractiveContext. - let (resume_tmp_te,resume_gre_cache) = resumeBindings r - ic' = ic { ic_tythings = resume_tmp_te, - ic_gre_cache = resume_gre_cache, - ic_resume = rs } - setSession hsc_env{ hsc_IC = ic' } - - -- remove any bindings created since the breakpoint from the - -- linker's environment - let old_names = map getName resume_tmp_te - new_names = [ n | thing <- ic_tythings ic - , let n = getName thing - , not (n `elem` old_names) ] - interp = hscInterp hsc_env - dflags = hsc_dflags hsc_env - liftIO $ Loader.deleteFromLoadedHomeEnv interp new_names - - case r of - Resume { resumeStmt = expr - , resumeContext = fhv - , resumeBindings = bindings - , resumeFinalIds = final_ids - , resumeApStack = apStack - , resumeBreakpointId = mb_brkpt - , resumeSpan = span - , resumeHistory = hist } -> - do - -- When the user specified a break ignore count, set it - -- in the interpreter - case (mb_brkpt, mbCnt) of - (Just brkpt, Just cnt) -> setupBreakpoint interp brkpt cnt - _ -> return () - - let eval_opts = initEvalOpts dflags (enableGhcStepMode step) - status <- liftIO $ GHCi.resumeStmt interp eval_opts fhv - let prevHistoryLst = fromListBL 50 hist - hug = hsc_HUG hsc_env - hist' = case mb_brkpt of - Nothing -> pure prevHistoryLst - Just bi - | breakHere False step span -> do - hist1 <- liftIO (mkHistory hug apStack bi) - return $ hist1 `consBL` fromListBL 50 hist - | otherwise -> pure prevHistoryLst - handleRunStatus step expr bindings final_ids status =<< hist' +resumeExec step mbCnt r = do + hsc_env <- getSession + let ic = hsc_IC hsc_env + -- unbind the temporary locals by restoring the TypeEnv from + -- before the breakpoint + let (resume_tmp_te,resume_gre_cache) = resumeBindings r + ic' = ic { ic_tythings = resume_tmp_te, + ic_gre_cache = resume_gre_cache } + setSession hsc_env{ hsc_IC = ic' } + + -- remove any bindings created since the breakpoint from the + -- linker's environment + let old_names = map getName resume_tmp_te + new_names = [ n | thing <- ic_tythings ic + , let n = getName thing + , not (n `elem` old_names) ] + interp = hscInterp hsc_env + dflags = hsc_dflags hsc_env + liftIO $ Loader.deleteFromLoadedHomeEnv interp new_names + + case r of + Resume { resumeStmt = expr + , resumeContext = fhv + , resumeBindings = bindings + , resumeFinalIds = final_ids + , resumeApStack = apStack + , resumeBreakpointId = mb_brkpt + , resumeSpan = span + , resumeHistory = hist } -> + do + -- When the user specified a break ignore count, set it + -- in the interpreter + case (mb_brkpt, mbCnt) of + (Just brkpt, Just cnt) -> setupBreakpoint interp brkpt cnt + _ -> return () + + let eval_opts = initEvalOpts dflags (enableGhcStepMode step) + status <- liftIO $ GHCi.resumeStmt interp eval_opts fhv + let prevHistoryLst = fromListBL 50 hist + hug = hsc_HUG hsc_env + hist' = case mb_brkpt of + Nothing -> pure prevHistoryLst + Just bi + | breakHere False step span -> do + hist1 <- liftIO (mkHistory hug apStack bi) + return $ hist1 `consBL` fromListBL 50 hist + | otherwise -> pure prevHistoryLst + handleRunStatus step expr bindings final_ids status =<< hist' setupBreakpoint :: GhcMonad m => Interp -> InternalBreakpointId -> Int -> m () -- #19157 setupBreakpoint interp ibi cnt = do ===================================== compiler/GHC/Runtime/Eval/Types.hs ===================================== @@ -162,6 +162,8 @@ data ExecResult | ExecBreak { breakNames :: [Id] , breakPointId :: Maybe InternalBreakpointId + , breakResume :: Resume + -- ^ to resume this thread blocked on this break } -- | Essentially a GlobalRdrEnv, but with additional cached values to allow ===================================== ghc/GHCi/UI.hs ===================================== @@ -1618,7 +1618,7 @@ runStmt input step = do m_result <- GhciMonad.runStmt stmt input step case m_result of Nothing -> return Nothing - Just result -> Just <$> afterRunStmt step (RunStmtResult result) + Just result -> Just <$> afterRunStmt (RunStmtResult result) -- `x = y` (a declaration) should be treated as `let x = y` (a statement). -- The reason is because GHCi wasn't designed to support `x = y`, but then @@ -1650,7 +1650,7 @@ runStmt input step = do _ <- liftIO $ tryIO $ hFlushAll stdin m_result <- GhciMonad.runDecls' decls forM m_result $ \result -> do - afterRunStmt step (RunDeclsResult result) + afterRunStmt (RunDeclsResult result) mk_stmt :: SrcSpan -> HsBind GhcPs -> GhciLStmt GhcPs mk_stmt loc bind = @@ -1671,10 +1671,9 @@ data RunResult | RunDeclsResult [TyThing] -- | Clean up the GHCi environment after a statement has run -afterRunStmt :: GhciMonad m => SingleStep {-^ Type of step we took just before -} - -> RunResult -> m RunResult -afterRunStmt step run_result = do - resumes <- GHC.getResumeContext +afterRunStmt :: GhciMonad m + => RunResult -> m RunResult +afterRunStmt run_result = do case run_result of RunDeclsResult things -> do show_types <- isOptionSet ShowType @@ -1685,20 +1684,15 @@ afterRunStmt step run_result = do Right ids -> do show_types <- isOptionSet ShowType when show_types $ printTypeOfIds ids - RunStmtResult (GHC.ExecBreak ids mb_info) - | first_resume : _ <- resumes - -> do mb_id_loc <- toBreakIdAndLocation mb_info - let bCmd = maybe "" ( \(_,l) -> onBreakCmd l ) mb_id_loc - if (null bCmd) - then printStoppedAtBreakInfo first_resume ids - else enqueueCommands [bCmd] - -- run the command set with ":set stop <cmd>" - st <- getGHCiState - enqueueCommands [stop st] - return () - - | otherwise -> resume step Nothing >>= - afterRunStmt step . RunStmtResult >> return () + RunStmtResult (GHC.ExecBreak ids mb_info resume) -> do + mb_id_loc <- toBreakIdAndLocation mb_info + let bCmd = maybe "" ( \(_,l) -> onBreakCmd l ) mb_id_loc + if (null bCmd) + then printStoppedAtBreakInfo resume ids + else enqueueCommands [bCmd] + -- run the command set with ":set stop <cmd>" + st <- getGHCiState + enqueueCommands [stop st] flushInterpBuffers withSignalHandlers $ do @@ -4401,7 +4395,7 @@ doContinue step = doContinue' step Nothing doContinue' :: GhciMonad m => SingleStep -> Maybe Int -> m () doContinue' step mbCnt= do runResult <- resume step mbCnt - _ <- afterRunStmt step (RunStmtResult runResult) + _ <- afterRunStmt (RunStmtResult runResult) return () abandonCmd :: GhciMonad m => String -> m () ===================================== ghc/GHCi/UI/Monad.hs ===================================== @@ -38,6 +38,7 @@ import GHCi.UI.Info (ModInfo) import qualified GHC import GHC.Driver.Monad hiding (liftIO) import GHC.Utils.Outputable +import GHC.Utils.Panic import qualified GHC.Driver.Ppr as Ppr import GHC.Types.Name.Occurrence import GHC.Driver.Session @@ -412,7 +413,12 @@ resume step mbIgnoreCnt = do withProgName (progname st) $ withArgs (args st) $ reflectGHCi x $ do - GHC.resumeExec step mbIgnoreCnt + GHC.getResumeContext >>= \case + [] -> liftIO $ + throwGhcExceptionIO (GHC.ProgramError "not stopped at a breakpoint") + (r:rs) -> do + modifySession $ \env -> env{hsc_IC = (hsc_IC env){ ic_resume = rs }} + GHC.resumeExec step mbIgnoreCnt r -- -------------------------------------------------------------------------- -- timing & statistics View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e87649c0c4416c68e885d37165d8200… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e87649c0c4416c68e885d37165d8200… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/davide/rts-public_baseline] DO NOT MERGE add per CI job golden test for rts DSO symbols
by David Eichmann (＠DavidEichmann) 02 Nov '26

02 Nov '26

David Eichmann pushed to branch wip/davide/rts-public_baseline at Glasgow Haskell Compiler / GHC Commits: c13de886 by David Eichmann at 2026-11-02T14:56:56+00:00 DO NOT MERGE add per CI job golden test for rts DSO symbols A full dump of global symbols is made for all RTS DSOs over all CI jobs. This does not use an ignore list like the curent rts-check-symbols test. - - - - - 4 changed files: - testsuite/tests/rts/symbols/Main.hs - testsuite/tests/rts/symbols/all.T - + testsuite/tests/rts/symbols/expected/.gitkeep - testsuite/tests/rts/symbols/rts-check-symbols.sh Changes: ===================================== testsuite/tests/rts/symbols/Main.hs ===================================== @@ -3,6 +3,8 @@ import qualified Data.Set as S import Data.List (isSuffixOf, stripPrefix) import Data.Maybe (mapMaybe) import System.Environment (getArgs) +import System.FilePath +import System.Directory -- Symbols to be ignored. These are symbols that are gated on CPP ant not correctly -- specified in RtsSymbols.c. This means the symbol will sometimes appear in the @@ -154,6 +156,12 @@ main = do -- writeFile "<ghc root>/testsuite/tests/rts/symbols/rts-check-symbols.stdout" putStrLn diffStr + -- Formats all symbols from readelf output + ["full-dump", observedSymbolsFile] -> do + observedSymbolsStr <- readFile observedSymbolsFile + let observedSymbols = parseReadelf observedSymbolsStr + putStrLn $ unlines [symbol ++ " " ++ show codeOrData | (symbol, codeOrData) <- M.toList observedSymbols] + _ -> fail ("Unexpected arguments: " ++ show args) foreign import ccall "dumpDeclaredSymbols" ===================================== testsuite/tests/rts/symbols/all.T ===================================== @@ -10,7 +10,8 @@ test('rts-check-symbols', [ extra_files([ 'dumpDeclaredSymbols.c', 'Main.hs', - 'rts-check-symbols.sh' + 'rts-check-symbols.sh', + 'expected/' ])], makefile_test, [] ===================================== testsuite/tests/rts/symbols/expected/.gitkeep ===================================== ===================================== testsuite/tests/rts/symbols/rts-check-symbols.sh ===================================== @@ -2,6 +2,8 @@ $TEST_HC $TEST_HC_OPTS \ -package containers \ + -package directory \ + -package filepath \ -dynamic \ dumpDeclaredSymbols.c \ -I$TOP/../rts \ @@ -37,3 +39,19 @@ RTS_DYLIB_PATH=$(ldd ./Main | awk '/^[[:space:]]*libHSrts-.* => .+$/ { readelf -W --dyn-syms "$RTS_DYLIB_PATH" > $OBSERVED_SYMBOLS ./Main diff $DECLARED_SYMBOLS $OBSERVED_SYMBOLS + + +# +# Full dump/diff +# + +DUMP=$CI_JOB_NAME-$(basename $RTS_DYLIB_PATH).dump +./Main full-dump $OBSERVED_SYMBOLS > $DUMP +if [ -f "expected/$DUMP" ]; then + diff "$DUMP" "expected/$DUMP" +else + echo "# No expected dump file: expected/$DUMP" + echo "" + cat "$DUMP" +fi + View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c13de88693687deb594650b910844ab… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c13de88693687deb594650b910844ab… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/davide/rts-public_baseline
by David Eichmann (＠DavidEichmann) 02 Nov '26

02 Nov '26

David Eichmann pushed new branch wip/davide/rts-public_baseline at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/davide/rts-public_baseline You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/davide/rts-public
by David Eichmann (＠DavidEichmann) 02 Nov '26

02 Nov '26

David Eichmann pushed new branch wip/davide/rts-public at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/davide/rts-public You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/romes/exec-break-has-resume] 19 commits: Don't report -XStrict-generated bangs under -Wredundant-bang-patterns
by Rodrigo Mesquita (＠alt-romes) 02 Nov '26

02 Nov '26

Rodrigo Mesquita pushed to branch wip/romes/exec-break-has-resume at Glasgow Haskell Compiler / GHC Commits: cc533b66 by Sasha Bogicevic at 2026-10-31T09:18:15-04:00 Don't report -XStrict-generated bangs under -Wredundant-bang-patterns The -XStrict flag causes the desugarer to insert bang patterns. These are not user-written, so -Wredundant-bang-patterns must not report them. To achieve this, the desugarer now tracks whether it is desugaring compiler-generated code (similar to the typechecker's 'tcl_in_gen_code'). Bangs inserted by -XStrict are given generated spans, which suppresses the "redundant bang" warnings without otherwise affecting pattern-match warnings. Fixes #27323 - - - - - 13d38047 by Luite Stegeman at 2026-10-31T09:19:11-04:00 rts: tombstone Weak# copies that lose an evacuation race (#23160) Mark the losing copy of a Weak# during an evacuation race in parallel GC with stg_DEAD_WEAK_info. This ensures that the nonmoving GC doesn't follow dangling pointers, leading to crashes. Fixes #23160 - - - - - 63347328 by Zubin Duggal at 2026-10-31T09:19:52-04:00 ghci: Drop GHCi's exception context when rethrowing in ghc -e Fixes #27847. - - - - - a85fef3f by Zubin Duggal at 2026-10-31T09:19:52-04:00 base: Preserve exception context in modifyIOError Fixes #27851. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/446 - - - - - 1d60b591 by Zubin Duggal at 2026-10-31T09:19:52-04:00 base: Preserve exception context in mapException Fixes #27851. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/446 - - - - - 3c029a1b by Zubin Duggal at 2026-10-31T09:19:52-04:00 base: Preserve exception context when rethrowing exceptions in Handle reads Fixes #27875. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/447 - - - - - ab2b317a by Zubin Duggal at 2026-10-31T09:19:52-04:00 base: Preserve exception context when rethrowing exceptions in hClose Fixes #27875. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/447 - - - - - f5abf277 by Zubin Duggal at 2026-10-31T09:19:52-04:00 base: Preserve exception context when rethrowing exceptions in Windows openFile Fixes #27875. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/447 - - - - - d842c672 by Zubin Duggal at 2026-10-31T09:19:52-04:00 base: Preserve exception context when rethrowing exceptions in executablePath Fixes #27875. CLC proposal: https://github.com/haskell/core-libraries-committee/issues/447 - - - - - c5a8bb9f by Simon Peyton Jones at 2026-10-31T09:20:34-04:00 Simplify a tc-trace which could crash the compiler The trace formatted an error message, which prematurely read the ExpType in a FunResCtxt. Solution: don't put call the error message formatting when tc-tracing. - - - - - ab49b1d2 by Simon Peyton Jones at 2026-10-31T09:20:34-04:00 Tiny comment change to uniqAway - - - - - 6efe4ba3 by Simon Peyton Jones at 2026-10-31T09:20:34-04:00 Make niFixSubst idempotent I discovered (when fixing #27994) that `niFixSubst` didn't actually generate an idempotent subsitution despite its claims. It could return a substitution that mentions domain variables on in its range, when those variables are hidden inside the kind of a type variable occurrence. As a result it can generate ill-kinded types. Boo! The fix is simple, and uses deep substitution. See Note [Finding the substitution fixpoint] I don't think it actually /caused/ any bugs, so there is no regression test. - - - - - 3b60ae7e by Simon Peyton Jones at 2026-10-31T09:20:34-04:00 Fix a nasty bug in fundeps This MR fixes #27994, which turned out to be very tricky. See Note [Exploiting closed type famililes], especially (CF7). I was ending up with TyVars (not TcTyVars) in the solver, because the substitution computed in `getRelevantBranches` mixed the two. The code was just too clever. I ended up simplifying it quite a bit. For /closed/ families we no longer call `trimQtvs` (was `trim_qtvs`). Open families still do use `trimQtvs`. See Note [trimQTvs] This patch also fixes one other buglet in the same code. * Over-saturated type families were being mis-handled. See the new use of `saturatedFamApp_maybe`. - - - - - e4610f2d by Facundo Domínguez at 2026-10-31T09:21:24-04:00 Have haddock --incremental look for the module in -this-unit-id - - - - - bc6c0db6 by sheaf at 2026-10-31T09:22:20-04:00 mightBeFunTy: hotfix for #27979 ce01ccb6 refactored 'GHC.Types.RepType.mightBeFunTy' to look through unary classes. That change introduced the helper function 'unwrap_type' which was supposed to always return an unwrapped type, but its fallback equation mistakenly returned the original type. This caused the subsequent 'tyConAppTyCon_maybe' to fail in cases where it should succeed (e.g. looking through foralls). In this commit, we move all the unary class unwrapping logic into 'unwrapType' where it belonged from the start, and update the documentation of 'unwrapType' to better explain what it should be used for (#26695). Fixes #27979 #26695 ------------------------- Metric Increase: T5642 ------------------------- - - - - - 233cce46 by Alan Zimmerman at 2026-10-31T09:23:01-04:00 EPA: Tidy up ExactPrint.markAnnListA' It takes an action which can modify the AnnList, but this is never used. So remove it. - - - - - 3594a908 by Sylvain Henry at 2026-10-31T09:23:51-04:00 gitmodules: ignore dirty libffi-clib submodule (#26785) `./boot` runs autoreconf in libraries/libffi-clib, which leaves `configure~` behind and rewrites the tracked `aclocal.m4` whenever the local automake version differs from the one that generated it. Every checkout then looks dirty. Ignore working-tree changes in the submodule (`ignore = dirty`); a changed submodule commit is still reported. Co-Authored-By: Claude Fable 5.1 <noreply(a)anthropic.com> - - - - - 341223c0 by Rodrigo Mesquita at 2026-10-31T09:24:33-04:00 refactor: Keep the interactive Ids directly rather than Name Removes things like names <- map idName ids map (\i -> let id = find (\x -> i==idName x) names) idso and is more straightforward because there's less state going around (no more updating HscEnv as an output) It also kills `printTypeOfNames` completely, since now we just have the Ids. No longer `lookupName` names to get back the ids... ``` printTypeOfName :: GHC.GhcMonad m => Name -> m () printTypeOfName n = do maybe_tything <- GHC.lookupName n case maybe_tything of Nothing -> return () Just thing -> printTyThing thing ``` now is just `printTyThing . AnId` Also: ```diff - tythings <- catMaybes `liftM` mapM GHC.lookupName namesSorted - docs <- mapM pprTypeAndContents [i | AnId i <- tythings] + docs <- mapM pprTypeAndContents idsSorted ``` (and yes, in ExecBreaks there are only Ids, no TyThings, bc they are only constructed by the interpreter execution which can only bind ids. for TyThings use runDecls which doesn't return execBreaks.) There's some care to be had to make sure we use the "most refined" Ids, whereas when using `Name`s we'd always fetch the most refined Id from scratch. Fixes #28052 - - - - - 6b7a7364 by Rodrigo Mesquita at 2026-11-02T13:57:14+00:00 interp: Make resumeExec and ExecBreak use `Resume` directly Previously, `Resume` contexts were just put directly in the global interactive environment state, so they were only accessible through it. However, in the context of multi-threaded debugging, in that many threads may hit breakpoints, it no longer suffices to have a global linear list of breakpoints hit. We need a per-breakpoint Resume context and need to be able to wield it directly rather than going through a global context. The driving changes of this commit are: - Put the Resume data in ExecBreak - Make resumeExec receive a Resume as an argument This also simplifies the interpreter in that we no longer necessarily rely on the global interactive state to resume a thread. We can do it directly from the ExecBreak. The interactive context still maintains a stack of resumes, but `resumeExec` can no longer pop the resume it resumes off of the breakpoints stack, since it is no longer guaranteed to be resuming the first in that list. Hence, callers of `resumeExec` must update ic_resume on their own. - - - - - 84 changed files: - .gitmodules - + changelog.d/T27323 - + changelog.d/T27847 - + changelog.d/T27979 - + changelog.d/T27994 - + changelog.d/clc-446 - + changelog.d/clc-447 - + changelog.d/fix-nonmoving-weak-evacuation-race-23160 - + changelog.d/ghc-api-exec-break-resume - + changelog.d/ghc-api-interactive-ids - compiler/GHC/Core/Coercion/Axiom.hs - compiler/GHC/Core/Predicate.hs - compiler/GHC/Core/TyCo/FVs.hs - compiler/GHC/Core/TyCo/Subst.hs - compiler/GHC/Core/Type.hs - compiler/GHC/Core/Unify.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Monad.hs - compiler/GHC/HsToCore/Pmc.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Types.hs - compiler/GHC/HsToCore/Utils.hs - compiler/GHC/Runtime/Context.hs - compiler/GHC/Runtime/Debugger.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/Runtime/Eval/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Tc/Instance/Family.hs - compiler/GHC/Tc/Solver/FunDeps.hs - compiler/GHC/Tc/Utils/Unify.hs - compiler/GHC/Types/RepType.hs - compiler/GHC/Types/Var/Env.hs - ghc/GHCi/UI.hs - ghc/GHCi/UI/Monad.hs - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/Control/Exception/Base.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Internals.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Windows.hs - libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc - libraries/ghc-internal/src/GHC/Internal/System/IO/Error.hs - rts/sm/Evac.c - + testsuite/tests/codeGen/should_compile/T27979.hs - + testsuite/tests/codeGen/should_compile/T27979.stderr - testsuite/tests/codeGen/should_compile/all.T - testsuite/tests/count-deps/CountDepsParser.stdout - + testsuite/tests/exceptions/T27851.hs - + testsuite/tests/exceptions/T27851.stderr - + testsuite/tests/exceptions/T27851b.hs - + testsuite/tests/exceptions/T27851b.stderr - + testsuite/tests/exceptions/T27851c.hs - + testsuite/tests/exceptions/T27851c.stdout - + testsuite/tests/exceptions/T27851d.hs - + testsuite/tests/exceptions/T27851d.stdout - + testsuite/tests/exceptions/T27851d.stdout-javascript-unknown-ghcjs - testsuite/tests/exceptions/all.T - testsuite/tests/ghc-e/should_fail/T18441fail7.stderr - testsuite/tests/ghc-e/should_run/ghc-e005.stderr - + testsuite/tests/ghci.debugger/scripts/RttiSharedTyVar.hs - + testsuite/tests/ghci.debugger/scripts/RttiSharedTyVar.script - + testsuite/tests/ghci.debugger/scripts/RttiSharedTyVar.stdout - testsuite/tests/ghci.debugger/scripts/all.T - + testsuite/tests/haddock/haddock_testsuite/IncrementalUnitId.hs - testsuite/tests/haddock/haddock_testsuite/Makefile - testsuite/tests/haddock/haddock_testsuite/all.T - + testsuite/tests/haddock/haddock_testsuite/haddockIncrementalUnitId.stdout - + testsuite/tests/pmcheck/should_compile/T27323.hs - + testsuite/tests/pmcheck/should_compile/T27323b.hs - testsuite/tests/pmcheck/should_compile/all.T - + testsuite/tests/rts/T23160.hs - + testsuite/tests/rts/T23160.stdout - testsuite/tests/rts/all.T - + testsuite/tests/typecheck/should_compile/T27994.hs - + testsuite/tests/typecheck/should_compile/T27994a.hs - + testsuite/tests/typecheck/should_compile/T27994b.hs - testsuite/tests/typecheck/should_compile/all.T - testsuite/tests/warnings/should_compile/Overflow.stderr-ws-32 - testsuite/tests/warnings/should_compile/Overflow.stderr-ws-64 - testsuite/tests/warnings/should_compile/T13256.stderr-ws-32 - testsuite/tests/warnings/should_compile/T13256.stderr-ws-64 - utils/check-exact/ExactPrint.hs - utils/haddock/CHANGES.md - utils/haddock/haddock-api/src/Haddock/Interface.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/02d460909a997e9ba4d24d320dccda… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/02d460909a997e9ba4d24d320dccda… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/romes/async-rpc] fixup! interp: single-threaded sendTHComputation
by Andrea Vezzosi (＠trac-Saizan) 02 Nov '26

02 Nov '26

Andrea Vezzosi pushed to branch wip/romes/async-rpc at Glasgow Haskell Compiler / GHC Commits: b24e78a8 by Andrea Vezzosi at 2026-11-02T14:20:44+01:00 fixup! interp: single-threaded sendTHComputation - - - - - 1 changed file: - libraries/ghci/GHCi/Message/Async.hs Changes: ===================================== libraries/ghci/GHCi/Message/Async.hs ===================================== @@ -304,47 +304,46 @@ handleAsyncReq pipe getit mii k = mask $ \restore -> do ack <- newEmptyMVar -- Block waiting for request - mbreq <- atomically $ do + (uq,bs) <- atomically $ do readTVar (pipeWriteClosed pipe) >>= \case -- We will not be able to write the reply, so no point in continuiting. True -> throwSTM PipeWriteClosedException False -> pure () - isClosed <- readTVar (pipeReadClosed pipe) taken <- case mii of Nothing -> tryReadTQueue $ requestsQueue am Just ii -> tryReadTQueue =<< getMailbox am ii case taken of - Just req@(uq,_) -> pure (Just req) - Nothing | isClosed -> pure Nothing -- empty and closed - | otherwise -> retry -- wait for msg - - case mbreq of - Nothing -> throwIO PipeReadClosedException -- can't expect reqs - Just (uq, bs) -> do - let reply p = do - b <- atomically $ doneHandling am uq - when b $ writePipe pipe (Reply uq (bimap toSerializableException runPut p)) - putMVar ack () - -- Run the continuation which must reply exactly once with 'writeReply' - case runGetOrFail getit bs of - Left (_, _, err) -> do - let exc = DecodeAsyncReqException err - reply (Left (toException exc)) - throwIO exc - Right (_, _, it) -> - restore (k (WriteReply reply) (setActive am uq) it) - - -- If there's an exception before the reply is sent, reply with an error instead. - `catch` \(e :: SomeException) -> do - - tryTakeMVar ack >>= \case - Just () -> - -- Already replied - throwIO e - Nothing -> do - -- Reply with an error - reply (Left e) - throwIO e + Just req -> pure req + Nothing -> readTVar (pipeReadClosed pipe) >>= \case + True -> throwSTM PipeReadClosedException -- can't expect reqs + False -> retry + + let + reply p = do + b <- atomically $ doneHandling am uq + when b $ writePipe pipe (Reply uq (bimap toSerializableException runPut p)) + putMVar ack () + + -- Run the continuation which must reply exactly once with 'writeReply' + case runGetOrFail getit bs of + Left (_, _, err) -> do + let exc = DecodeAsyncReqException err + reply (Left (toException exc)) + throwIO exc + Right (_, _, it) -> + restore (k (WriteReply reply) (setActive am uq) it) + + -- If there's an exception before the reply is sent, reply with an error instead. + `catch` \(e :: SomeException) -> do + + tryTakeMVar ack >>= \case + Just () -> + -- Already replied + throwIO e + Nothing -> do + -- Reply with an error + reply (Left e) + throwIO e -- | 'handleSyncReq' failed to decode an incoming request payload using the given @'Get' a@ View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b24e78a8f67e5ca3a03b29880fd0d71… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b24e78a8f67e5ca3a03b29880fd0d71… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/T28062
by Simon Peyton Jones (＠simonpj) 02 Nov '26

02 Nov '26

Simon Peyton Jones pushed new branch wip/T28062 at Glasgow Haskell Compiler / GHC -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/tree/wip/T28062 You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/romes/async-rpc] 2 commits: interp: test: no deadlock when handleTHMessage throws.
by Andrea Vezzosi (＠trac-Saizan) 02 Nov '26

02 Nov '26

Andrea Vezzosi pushed to branch wip/romes/async-rpc at Glasgow Haskell Compiler / GHC Commits: f38d805c by Andrea Vezzosi at 2026-11-02T12:10:05+01:00 interp: test: no deadlock when handleTHMessage throws. it used to be that handleTHMessage throwing would neglect to notify and/or tear down the external interpreter, causing it to deadlock (or fail with blocked indefinitely). Now we reply with the exception, before rethrowing it, so the external interpreter can shutdown cleanly. - - - - - c507c7fe by Andrea Vezzosi at 2026-11-02T12:50:28+01:00 interp: test: panic in handleTHMessage does not deadlock similar to TH_ReifyModuleFail but with a plugin. - - - - - 8 changed files: - testsuite/tests/plugins/all.T - + testsuite/tests/plugins/static-plugin-interp-panic-module.hs - + testsuite/tests/plugins/static-plugin-interp-panic.hs - + testsuite/tests/plugins/static-plugin-interp-panic.stderr - + testsuite/tests/plugins/static-plugin-interp-panic.stdout - + testsuite/tests/th/TH_ReifyModuleFail.hs - + testsuite/tests/th/TH_ReifyModuleFail.stderr - testsuite/tests/th/all.T Changes: ===================================== testsuite/tests/plugins/all.T ===================================== @@ -374,6 +374,14 @@ test('plugins-external', when(opsys('mingw32') or (opsys('linux') and not ghc_dynamic()), fragile(20706))], makefile_test, []) +test('static-plugin-interp-panic', + [extra_files(['static-plugin-interp-panic-module.hs']), + unless(config.have_RTS_linker, skip), + extra_run_opts('"' + config.libdir + '"'), + req_th], + compile_and_run, + ['-package ghc -j1']) + test('test-phase-hooks-plugin', [extra_files(['hooks-plugin/']), pre_cmd('$MAKE -s --no-print-directory -C hooks-plugin package.test-phase-hooks-plugin TOP={top}'), ===================================== testsuite/tests/plugins/static-plugin-interp-panic-module.hs ===================================== @@ -0,0 +1,14 @@ +{-# LANGUAGE TemplateHaskell #-} + +-- reifyModule forces a fresh interface load from inside the ReifyModule +-- THMessage handler, which is where the plugin hook panics. ghc-internal is +-- wired in, so its unit id carries no version. +module StaticPluginInterpPanicModule where + +import Language.Haskell.TH +import Language.Haskell.TH.Syntax (Module(..), PkgName(..), ModName(..), reifyModule) + +x :: Int +x = $(do _ <- reifyModule (Module (PkgName "ghc-internal") + (ModName "GHC.Internal.Real")) + litE (integerL 42)) ===================================== testsuite/tests/plugins/static-plugin-interp-panic.hs ===================================== @@ -0,0 +1,46 @@ +-- Tests panic in handleTHMessage is handled properly. +-- Plugin is just a convenient way to inject a panic. +module Main where + +import Control.Monad.IO.Class (liftIO) +import System.Environment (getArgs) + +import GHC +import GHC.Driver.Env (hsc_plugins) +import GHC.Driver.Monad (modifySession) +import GHC.Driver.Plugins +import GHC.Driver.Session (defaultFatalMessager, defaultFlushOut, gopt_set) +import GHC.Tc.Types (IfM) +import GHC.Unit.Module.ModIface (ModIface, mi_module) +import GHC.Utils.Panic (panic) + +main :: IO () +main = do + libdir:_ <- getArgs + defaultErrorHandler defaultFatalMessager defaultFlushOut $ + runGhc (Just libdir) $ do + dflags <- getSessionDynFlags + setSessionDynFlags (gopt_set dflags Opt_ExternalInterpreter) + { ghcLink = LinkInMemory } + + modifySession $ \hsc_env -> + hsc_env { hsc_plugins = (hsc_plugins hsc_env) + { staticPlugins = [StaticPlugin (PluginWithArgs panicPlugin []) False] } } + + target <- guessTarget "static-plugin-interp-panic-module.hs" Nothing Nothing + setTargets [target] + ok <- load LoadAllTargets + liftIO $ putStrLn ("load succeeded: " ++ show (succeeded ok)) + +panicPlugin :: Plugin +panicPlugin = defaultPlugin + { interfaceLoadAction = ifaceAction + , pluginRecompile = purePlugin + } + +ifaceAction :: [CommandLineOption] -> ModIface -> IfM lcl ModIface +ifaceAction _ iface + | modName == "GHC.Internal.Real" = panic ("static-plugin-interp-panic: panic loading " ++ modName) + | otherwise = return iface + where + modName = moduleNameString (moduleName (mi_module iface)) ===================================== testsuite/tests/plugins/static-plugin-interp-panic.stderr ===================================== @@ -0,0 +1,19 @@ +static-plugin-interp-panic-module.hs:12:5: error: [GHC-87897] + • Exception when trying to run compile-time code: + panic! (the 'impossible' happened) + GHC version 10.1.20261027: + static-plugin-interp-panic: panic loading GHC.Internal.Real + +Please report this as a GHC bug: https://www.haskell.org/ghc/reportabug + + Code: (do _ <- reifyModule + (Module (PkgName "ghc-internal") (ModName "GHC.Internal.Real")) + litE (integerL 42)) + • In the untyped splice: + $(do _ <- reifyModule + (Module (PkgName "ghc-internal") (ModName "GHC.Internal.Real")) + litE (integerL 42)) + | +12 | x = $(do _ <- reifyModule (Module (PkgName "ghc-internal") + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... + ===================================== testsuite/tests/plugins/static-plugin-interp-panic.stdout ===================================== @@ -0,0 +1 @@ +load succeeded: False ===================================== testsuite/tests/th/TH_ReifyModuleFail.hs ===================================== @@ -0,0 +1,15 @@ +{-# LANGUAGE TemplateHaskell #-} + +-- A TH splice whose ReifyModule request fails on the GHC side. +-- +-- `reifyModule` on a non-existing module/package should result into a clean +-- error message on both internal and external interpreter, and no deadlocks. +module TH_ReifyModuleFail where + +import Language.Haskell.TH +import Language.Haskell.TH.Syntax (Module(..), PkgName(..), ModName(..), reifyModule) + +x :: Int +x = $(do _ <- reifyModule (Module (PkgName "no-such-package-0") + (ModName "No.Such.Module")) + litE (integerL 1)) ===================================== testsuite/tests/th/TH_ReifyModuleFail.stderr ===================================== @@ -0,0 +1,12 @@ +TH_ReifyModuleFail.hs:13:5: error: [GHC-87897] + • Exception when trying to run compile-time code: + Failed to load interface for ‘No.Such.Module’. +no unit id matching ‘no-such-package-0’ was found + Code: (do _ <- reifyModule + (Module (PkgName "no-such-package-0") (ModName "No.Such.Module")) + litE (integerL 1)) + • In the untyped splice: + $(do _ <- reifyModule + (Module (PkgName "no-such-package-0") (ModName "No.Such.Module")) + litE (integerL 1)) + ===================================== testsuite/tests/th/all.T ===================================== @@ -667,4 +667,5 @@ test('TH_cvt_RecGadtNoCons', normal, compile_fail, ['-v0']) test('TH_cvt_InvalidCCallImpent', normal, compile_fail, ['-v0']) test('TH_cvt_SumAltArityExceeded', normal, compile_fail, ['-v0']) test('TH_cvt_IllegalSumAlt', normal, compile_fail, ['-v0']) +test('TH_ReifyModuleFail', normal, compile_fail, ['-v0']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b784216f6ebe314dc63b3ad82c0089… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b784216f6ebe314dc63b3ad82c0089… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0