- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/sjakobi/testsuite-atomic-output] testsuite: Emit each test's output atomically
by Simon Jakobi (＠sjakobi2) 11 Jun '26

11 Jun '26

Simon Jakobi pushed to branch wip/sjakobi/testsuite-atomic-output at Glasgow Haskell Compiler / GHC Commits: 5e4892c2 by Simon Jakobi at 2026-06-11T21:41:49+02:00 testsuite: Emit each test's output atomically Tests run concurrently (as asyncio tasks) and report progress and failures with many separate print() calls, some to stdout and some to stderr. As a result the lines of concurrently failing tests interleave arbitrarily, and since the two streams have different buffering when piped (as in CI), even a single test's lines arrive scrambled relative to each other. CI logs show diff headers separated from their diffs and failure messages wedged between unrelated tests' progress markers. Replace sys.stdout/sys.stderr with proxies that redirect writes into a per-asyncio-task buffer while a test is running (a context variable, following the existing testopts_ctx_var pattern). When the test completes, its accumulated output is written to the real stdout in a single call and flushed, so each test's output appears as one contiguous, correctly ordered block. Routing both streams through one buffer also eliminates the stdout/stderr reordering, and the explicit flush after each test means output now reaches CI logs as tests finish rather than sitting in a block buffer until the end of the run (cf #12934). Writes from contexts without an active buffer (driver preamble and summary, terminal-title updates from timer threads) pass through to the real streams unchanged. Closes #27367. Co-Authored-By: Claude Fable 5 <noreply(a)anthropic.com> - - - - - 2 changed files: - testsuite/driver/runtests.py - testsuite/driver/testlib.py Changes: ===================================== testsuite/driver/runtests.py ===================================== @@ -487,6 +487,7 @@ if config.list_broken: print('') else: # Now run all the tests + install_output_proxies() # avoid interleaved output from concurrent tests try: async def run_parallelTests(): sem = asyncio.Semaphore(config.threads) ===================================== testsuite/driver/testlib.py ===================================== @@ -88,6 +88,61 @@ def get_all_ways() -> Set[WayName]: global testopts_ctx_var testopts_ctx_var = contextvars.ContextVar('testopts_ctx_var') # type: ignore +# Pipe each test's output into a per-test buffer (set up by runTestAtomically) +# to avoid interleaving the output of concurrent tests. Writes from contexts +# with no active buffer pass straight through to the real streams. + +output_buffer_ctx_var = contextvars.ContextVar('output_buffer_ctx_var', default=None) # type: contextvars.ContextVar[Optional[io.StringIO]] + +class _OutputProxyBuffer: + """The .buffer of an _OutputProxy; takes bytes.""" + def __init__(self, real) -> None: + self._real = real + + def write(self, b: bytes) -> None: + buf = output_buffer_ctx_var.get() + if buf is None: + self._real.buffer.write(b) + else: + buf.write(b.decode('utf-8', errors='backslashreplace')) + + def flush(self) -> None: + if output_buffer_ctx_var.get() is None: + self._real.buffer.flush() + +class _OutputProxy: + def __init__(self, real) -> None: + self._real = real + self.buffer = _OutputProxyBuffer(real) + + @property + def encoding(self) -> str: + return self._real.encoding + + def write(self, s: str) -> int: + buf = output_buffer_ctx_var.get() + if buf is None: + return self._real.write(s) + return buf.write(s) + + def flush(self) -> None: + if output_buffer_ctx_var.get() is None: + self._real.flush() + + def isatty(self) -> bool: + return self._real.isatty() + + def fileno(self) -> int: + return self._real.fileno() + +def install_output_proxies() -> None: + # Both streams feed the same per-task buffer, so a test's stdout and + # stderr stay in print order. + if not isinstance(sys.stdout, _OutputProxy): + sys.stdout = _OutputProxy(sys.stdout) + if not isinstance(sys.stderr, _OutputProxy): + sys.stderr = _OutputProxy(sys.stderr) + def getTestOpts() -> TestOptions: return testopts_ctx_var.get() @@ -1502,9 +1557,25 @@ allTestNames = set([]) # type: Set[TestName] async def runTest(sem, opts, name: TestName, func, args): if sem is None: - return await test_common_work(name, opts, func, args) + return await runTestAtomically(opts, name, func, args) async with sem: + return await runTestAtomically(opts, name, func, args) + +async def runTestAtomically(opts, name: TestName, func, args): + # Buffer this test's output and emit it as one block at the end, so that + # concurrent tests' output does not interleave. + buf = io.StringIO() + token = output_buffer_ctx_var.set(buf) + try: return await test_common_work(name, opts, func, args) + finally: + output_buffer_ctx_var.reset(token) + s = buf.getvalue() + if s: + # The event loop is single-threaded and there is no await between + # these calls, so the block is written out atomically. + sys.stdout.write(s) + sys.stdout.flush() # name :: String # setup :: [TestOpt] -> IO () View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5e4892c2a223f99e0b4156e2d212f5f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5e4892c2a223f99e0b4156e2d212f5f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sjakobi/abstractFloats-alloc
by Simon Jakobi (＠sjakobi2) 11 Jun '26

11 Jun '26

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

1 0

[Git][ghc/ghc][master] fix: make T27131 less flaky
by Marge Bot (＠marge-bot) 11 Jun '26

11 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 7ab90288 by Rodrigo Mesquita at 2026-06-11T12:41:11-04:00 fix: make T27131 less flaky It seems that T27131 fails flakily in a race where we check the flag before the capability had the chance to process the mailbox which sets the flag. This seemingly should only happen if the capability ends up being the same for setting and checking the flag. - - - - - 2 changed files: - testsuite/tests/rts/T27131.hs - testsuite/tests/rts/T27131.stdout Changes: ===================================== testsuite/tests/rts/T27131.hs ===================================== @@ -30,16 +30,22 @@ foreign import ccall unsafe "has_local_stop_after_return" main :: IO () main = do setNumCapabilities 2 - checkFlag - "TSO_STOP_NEXT_BREAKPOINT" - rts_enableStopNextBreakpoint - rts_disableStopNextBreakpoint - c_hasLocalStopNextBreakpoint - checkFlag - "TSO_STOP_AFTER_RETURN" - rts_enableStopAfterReturn - rts_disableStopAfterReturn - c_hasLocalStopAfterReturn + -- Bind to capability 0 so it can't float between capabilities while the + -- target thread runs on capability 1. + doneVar <- newEmptyMVar + _ <- forkOn 0 $ do + checkFlag + "TSO_STOP_NEXT_BREAKPOINT" + rts_enableStopNextBreakpoint + rts_disableStopNextBreakpoint + c_hasLocalStopNextBreakpoint + checkFlag + "TSO_STOP_AFTER_RETURN" + rts_enableStopAfterReturn + rts_disableStopAfterReturn + c_hasLocalStopAfterReturn + putMVar doneVar () + takeMVar doneVar checkFlag :: String @@ -58,6 +64,7 @@ checkFlag label enable disable isMyThreadFlagSet = do ThreadId tid# <- forkOn 1 $ do replicateM_ 2 $ do replyVar <- takeMVar targetCheckVar + yield -- make sure we reprocess the mailbox isSet <- (/= 0) <$> isMyThreadFlagSet putMVar replyVar isSet ===================================== testsuite/tests/rts/T27131.stdout ===================================== @@ -1,6 +1,6 @@ -(0,False) +(0,True) TSO_STOP_NEXT_BREAKPOINT set: ok TSO_STOP_NEXT_BREAKPOINT unset: ok -(0,False) +(0,True) TSO_STOP_AFTER_RETURN set: ok TSO_STOP_AFTER_RETURN unset: ok View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7ab9028865d37796a2ad3099b06eed9… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7ab9028865d37796a2ad3099b06eed9… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Fix AArch64 clobbering bug for MUL2
by Marge Bot (＠marge-bot) 11 Jun '26

11 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: c9015f09 by sheaf at 2026-06-11T12:40:28-04:00 Fix AArch64 clobbering bug for MUL2 On AArch64, the code generator could clobber one of the input operands when computing the lower bits of a MUL2 operation. This rendered invalid the subsequent computation of the high bits. This commit fixes that by using a temporary register. The register allocator can remove the redundant move in the common case when the registers do not conflict. Fixes #27046 - - - - - 5 changed files: - + changelog.d/T27046 - compiler/GHC/CmmToAsm/AArch64/CodeGen.hs - + testsuite/tests/codeGen/should_run/T27046.hs - + testsuite/tests/codeGen/should_run/T27046_cmm.cmm - testsuite/tests/codeGen/should_run/all.T Changes: ===================================== changelog.d/T27046 ===================================== @@ -0,0 +1,9 @@ +section: compiler +issues: #27046 +mrs: !16031 +synopsis: + Avoid AArch64 register clobbering bug in MUL2 +description: + Fixes an issue in which, on AArch64, code generation for the MUL2 operation + could clobber one of the input operands when computing the lower bits, which + rendered invalid the subsequent computation of the high bits. ===================================== compiler/GHC/CmmToAsm/AArch64/CodeGen.hs ===================================== @@ -2300,11 +2300,19 @@ genCCall target dest_regs arg_regs = do let lo = getRegisterReg platform (CmmLocal dst_lo) hi = getRegisterReg platform (CmmLocal dst_hi) nd = getRegisterReg platform (CmmLocal dst_needed) + + -- Generate a fresh virtual register for the low word computation. + -- This avoids clobbering reg_a or reg_b in the first MUL instruction, + -- which could for example happen if 'lo' and 'reg_a' are the same + -- virtual register. + tmp_lo <- getNewRegNat II64 + return $ code_x `appOL` code_y `snocOL` - MUL II64 (OpReg W64 lo) (OpReg W64 reg_a) (OpReg W64 reg_b) `snocOL` + MUL II64 (OpReg W64 tmp_lo) (OpReg W64 reg_a) (OpReg W64 reg_b) `snocOL` SMULH (OpReg W64 hi) (OpReg W64 reg_a) (OpReg W64 reg_b) `snocOL` + MOV (OpReg W64 lo) (OpReg W64 tmp_lo) `snocOL` -- Are all high bits equal to the sign bit of the low word? -- nd = (hi == ASR(lo,width-1)) ? 1 : 0 CMP (OpReg W64 hi) (OpRegShift W64 lo SASR (widthInBits w - 1)) `snocOL` ===================================== testsuite/tests/codeGen/should_run/T27046.hs ===================================== @@ -0,0 +1,29 @@ +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE ForeignFunctionInterface, GHCForeignImportPrim, UnliftedFFITypes #-} + +module Main where + +import Control.Monad + ( unless ) +import Data.Bits + ( shiftL ) +import GHC.Exts + ( Int64# ) +import GHC.Int + ( Int64(..) ) + +foreign import prim "test_mul2_clobber" + test_mul2_clobber :: Int64# -> Int64# -> Int64# + +main :: IO () +main = do + let + I64# x = 1 `shiftL` 32 + hi = I64# $ test_mul2_clobber x x + + unless ( hi == 1 ) $ + error $ unlines + [ "Incorrect result for Mul2 operation." + , "Expected high word: 1" + , " Actual high word: " ++ show hi + ] ===================================== testsuite/tests/codeGen/should_run/T27046_cmm.cmm ===================================== @@ -0,0 +1,13 @@ +#include "Cmm.h" + +// Test for #27046 +test_mul2_clobber (bits64 x, bits64 y) +{ + bits64 hi, nd; + + // Deliberately alias the destination 'lo' with the source 'x' + // This forces the NCG to use the same virtual register for both. + (nd, hi, x) = prim %mul2_64(x, y); + + return (hi); +} ===================================== testsuite/tests/codeGen/should_run/all.T ===================================== @@ -260,6 +260,13 @@ test('T25364', normal, compile_and_run, ['']) test('T26061', normal, compile_and_run, ['']) test('T26537', normal, compile_and_run, ['-O2 -fregs-graph']) test('T24016', normal, compile_and_run, ['-O1 -fPIC']) +test('T27046', + [ req_cmm + , when(arch('i386'), skip) # i386 does not support MO_S_Mul2 W64 + , when(arch('wasm32'), skip) + , js_skip + , when(unregisterised(), skip) # pprCallishMachOp_for_C: MO_S_Mul2 W64 not supported + ], compile_and_run, ['T27046_cmm.cmm']) # Check that GHC-generated finalizers run on Darwin. The Apple linker doesn't # support --wrap, so we can't intercept hs_spt_remove directly. Instead we View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c9015f0953e72829e89ac768b6ad9ec… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c9015f0953e72829e89ac768b6ad9ec… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] hadrian: Remove old package.conf files when generating new ones
by Marge Bot (＠marge-bot) 11 Jun '26

11 Jun '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 5ac9ce7d by Zubin Duggal at 2026-06-10T21:26:32+05:30 hadrian: Remove old package.conf files when generating new ones Old package.conf files might exists with different hashes, causing issues like #26661 Fixes #26661 - - - - - 2 changed files: - + changelog.d/hadrian-stale-package-confs-26661 - hadrian/src/Hadrian/Haskell/Cabal/Parse.hs Changes: ===================================== changelog.d/hadrian-stale-package-confs-26661 ===================================== @@ -0,0 +1,6 @@ +section: packaging +synopsis: Hadrian no longer leaves stale `.conf` files in its package databases + when rebuilding in the same build root with different settings (e.g. another + flavour, or when hashes change with +hash-unit-ids). +issues: #26661 +mrs: !15186 ===================================== hadrian/src/Hadrian/Haskell/Cabal/Parse.hs ===================================== @@ -15,6 +15,7 @@ module Hadrian.Haskell.Cabal.Parse ( ) where import Data.Bifunctor +import Data.Char (isDigit) import Data.List.Extra import Development.Shake import qualified Distribution.Compat.Graph as Graph @@ -55,6 +56,8 @@ import Builder import Context import Settings import Distribution.Simple.LocalBuildInfo +import Distribution.Types.LocalBuildInfo (allTargetsInBuildOrder') +import Distribution.Types.TargetInfo (TargetInfo (..)) import qualified Distribution.Simple.Register as C import System.Directory (getCurrentDirectory) import qualified Distribution.InstalledPackageInfo as CP @@ -394,35 +397,48 @@ registerPackage rs context = do -- Note: the @cPath@ is ignored. The path that's used is the 'buildDir' path -- from the local build info @lbi@. lbi <- liftIO $ C.getPersistBuildConfig Nothing (C.makeSymbolicPath cPath) - liftIO $ register db_path pid pd lbi + -- This runs `ghc --abi-hash`, so do it outside the critical section below. + installedPkgInfo <- liftIO $ generateRegistrationInfo pd lbi + + let pkg_name = pkgName (package context) + -- Is this a pkg.conf for a previous build? + -- we want to match "ghc-9.15.1-abcd.conf" but not "ghc-boot-9.15.1.conf" + isPkgConf f = case stripPrefix (pkg_name ++ "-") (takeBaseName f) of + Just (c:_) -> isDigit c + _ -> takeBaseName f == pkg_name + + -- Unlike `ghc-pkg update/register` (used to populate the inplace and stage0 + -- databases), writing the .conf file directly doesn't remove units this + -- package was previously registered under. Stale .conf files from earlier + -- builds make this package's modules ambiguous (#26661), so delete them + -- before writing the new .conf file. + withResources rs $ do + confs <- liftIO $ getDirectoryFilesIO db_path ["*.conf"] + mapM_ (removeFile . (db_path </>)) + [ f | f <- confs, isPkgConf f, takeBaseName f /= pid ] + liftIO $ writeUTF8File (db_path </> pid <.> "conf") + (CP.showInstalledPackageInfo installedPkgInfo) -- Then after the register, which just writes the .conf file, do the recache step. buildWithResources rs $ target context (GhcPkg Recache (stage context)) [] [] -- This is copied and simplified from Cabal, because we want to install the package -- into a different package database to the one it was configured against. -register :: FilePath - -> String -- ^ Package Identifier - -> C.PackageDescription - -> LocalBuildInfo - -> IO () -register pkg_db pid pd lbi - = withLibLBI pd lbi $ \lib clbi -> do - - when reloc $ error "register does not support reloc" - installedPkgInfo <- generateRegistrationInfo pd lbi lib clbi - writeRegistrationFile installedPkgInfo - - where - regFile = pkg_db </> pid <.> "conf" - reloc = relocatable lbi - - generateRegistrationInfo pkg lbi lib clbi = do - abi_hash <- C.mkAbiHash <$> GHC.libAbiHash C.silent pkg lbi lib clbi - return (C.absoluteInstalledPackageInfo pkg abi_hash lib lbi clbi) - - writeRegistrationFile installedPkgInfo = do - writeUTF8File regFile (CP.showInstalledPackageInfo installedPkgInfo) +-- See generateRegistrationInfo in Distribution.Simple.Register. we can't use it +-- directly because it computes the abi-hash using Cabal's internal package +-- database, which hadrian never creates. +generateRegistrationInfo :: C.PackageDescription + -> LocalBuildInfo + -> IO Installed.InstalledPackageInfo +generateRegistrationInfo pd lbi = do + when (relocatable lbi) $ error "register does not support reloc" + case [ (lib, targetCLBI tgt) | tgt <- allTargetsInBuildOrder' pd lbi + , CLib lib <- [targetComponent tgt] ] of + [(lib, clbi)] -> do + abi_hash <- C.mkAbiHash <$> GHC.libAbiHash C.silent pd lbi lib clbi + return (C.absoluteInstalledPackageInfo pd abi_hash lib lbi clbi) + libs -> error $ "generateRegistrationInfo: expected exactly one library for " + ++ C.display (C.package pd) ++ ", got " ++ show (length libs) -- | Build autogenerated files @autogen/cabal_macros.h@ and @autogen/Paths_*.hs@. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5ac9ce7d3821c75e2d2cc17fae00b9e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/5ac9ce7d3821c75e2d2cc17fae00b9e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] Better specification for when to disable defaulting
by Rodrigo Mesquita (＠alt-romes) 11 Jun '26

11 Jun '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: ac878ff3 by Rodrigo Mesquita at 2026-06-11T17:16:09+01:00 Better specification for when to disable defaulting - - - - - 2 changed files: - compiler/GHC/Builtin.hs - compiler/GHC/Tc/Utils/Env.hs Changes: ===================================== compiler/GHC/Builtin.hs ===================================== @@ -372,6 +372,11 @@ Wrinkles keeps types and classes in the global type envt, but `Id`s in the local type envt. (Ids move to the global type env during zonking; see `zonkTopDecls`.) +(KN5) If we are not using -frebindable-known-names, yet GHC.Essentials is still not + in scope, then we don't add the `default Num (Integer, Double)` declaration + to the module being compiled. This relaxation makes it possible for a library + which does not use any known-key at all (namely: `composition`) to compile + successfully without a dependency on base nor ghc-internal. Note [Recipe for adding a known-occ name] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== compiler/GHC/Tc/Utils/Env.hs ===================================== @@ -1121,6 +1121,7 @@ tcGetDefaultTys = do { dflags <- getDynFlags ; hsc_env <- getTopEnv ; let ovl_strings = xopt LangExt.OverloadedStrings dflags + rebindable_kn = gopt Opt_RebindableKnownNames dflags extended_defaults = xopt LangExt.ExtendedDefaultRules dflags -- See also #1974 builtinDefaults cls tys = ClassDefaults{ cd_class = cls @@ -1133,9 +1134,9 @@ tcGetDefaultTys ; this_module <- tcg_mod <$> getGblEnv ; let this_unit = moduleUnit this_module ; found_essentials <- liftIO $ findImportedModule hsc_env eSSENTIALS_NAME NoPkgQual - ; case found_essentials of - NotFound{} -> - -- If GHC.Essentials isn't available at all (e.g. -hide-all-packages), + ; case (found_essentials, rebindable_kn) of + (NotFound{}, False) -> -- See Wrinkle (KN5) in Note [Overview of known entities] + -- If GHC.Essentials isn't available at all when -fno-rebindable-known-names -- don't add the built-in defaulting, bc e.g. Num is a known-entity. return (user_defaults, extended_defaults) _ | this_unit == ghcInternalUnit -> View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ac878ff32e63933b1f4268c7005129e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ac878ff32e63933b1f4268c7005129e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/davide/ghc-toolchain-throw-less] ghc-toolchain: don't throw when candidate executables are not found
by David Eichmann (＠DavidEichmann) 11 Jun '26

11 Jun '26

David Eichmann pushed to branch wip/davide/ghc-toolchain-throw-less at Glasgow Haskell Compiler / GHC Commits: d89b7075 by David Eichmann at 2026-06-11T17:17:38+01:00 ghc-toolchain: don't throw when candidate executables are not found Fixes #27369 - - - - - 2 changed files: - utils/ghc-toolchain/src/GHC/Toolchain/Program.hs - utils/ghc-toolchain/src/GHC/Toolchain/Utils.hs Changes: ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Program.hs ===================================== @@ -148,12 +148,14 @@ findProgram description userSpec candidates Just prefix -> map (prefix++) candidates Nothing -> [] candidates' = prefixedCandidates ++ candidates - err = - [ "Failed to find " ++ description ++ "." - , "Looked for one of " ++ show candidates' ++ " in the system search path." - ] - path <- oneOf' err (map findExecutableErr candidates') - return Program { prgPath = path, prgFlags = fromMaybe [] (poFlags userSpec) } + pathMay <- findM doesExecutableExist candidates' + case pathMay of + Nothing -> throwEs + [ "Failed to find " ++ description ++ "." + , "Looked for one of " ++ show candidates' ++ " in the system search path." + ] + Just path -> + return Program { prgPath = path, prgFlags = fromMaybe [] (poFlags userSpec) } -- Note that @configure.ac@ checks these llvm version constants (using @sed@) to -- ensure they are the same as the @$LlvmMinVersion@ and @$LlvmMaxVersion@ @@ -222,21 +224,18 @@ maybeFindProgramFromProgOpts :: String -> ProgOpt -> Maybe (M Program) maybeFindProgramFromProgOpts description userSpec = case poPath userSpec of Nothing -> Nothing Just path -> Just $ do - let err = - [ "Failed to find " ++ description ++ "." - , "Looked for user-specified program '" ++ path ++ "' in the system search path." - ] - path' <- findExecutableErr path <|> throwEs err - return Program { prgPath = path', prgFlags = fromMaybe [] (poFlags userSpec) } - -findExecutableErr :: String -> M FilePath -findExecutableErr name = do - r <- liftIO $ findExecutable name - case r of - Nothing -> throwE $ name ++ " not found in search path" - -- Use the given `prgPath` or candidate name rather than the - -- absolute path returned by `findExecutable`. - Just _x -> return name + exists <- doesExecutableExist path + unless exists $ throwEs + [ "Failed to find " ++ description ++ "." + , "Looked for user-specified program '" ++ path ++ "' in the system search path." + ] + return Program { prgPath = path, prgFlags = fromMaybe [] (poFlags userSpec) } + +doesExecutableExist + :: String -- ^ executable name + -> M Bool +doesExecutableExist name = isJust <$> liftIO (findExecutable name) + -------------------- Compiling utilities -------------------- ===================================== utils/ghc-toolchain/src/GHC/Toolchain/Utils.hs ===================================== @@ -9,6 +9,7 @@ module GHC.Toolchain.Utils , oneOf' , isSuccess , lastLine + , findM ) where import Control.Exception @@ -69,3 +70,10 @@ isSuccess = \case lastLine :: String -> String lastLine = maybe "" snd . unsnoc . lines + +findM :: Monad m => (a -> m Bool) -> [a] -> m (Maybe a) +findM f = \case + [] -> return Nothing + a:as -> do + found <- f a + if found then return (Just a) else findM f as View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d89b707583592614950324e76a5fc18… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d89b707583592614950324e76a5fc18… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] 2 commits: T27013d tests recompilation checking of Composition.hs which uses -hide-all-packages
by Rodrigo Mesquita (＠alt-romes) 11 Jun '26

11 Jun '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: 23da209f by Rodrigo Mesquita at 2026-06-11T16:14:14+01:00 T27013d tests recompilation checking of Composition.hs which uses -hide-all-packages - - - - - a7b14581 by Rodrigo Mesquita at 2026-06-11T17:07:01+01:00 Revert "use lookupKnownKeyModule for defaulting check too" This reverts commit 5943ac8c8e7d9fc5dd5e25d118282f80ac1e0ab6. Oh no, doing this meant we would disable defaulting when rebindable known-keys was on; that's not what we want. - - - - - 5 changed files: - compiler/GHC/Tc/Utils/Env.hs - + testsuite/tests/cabal/T27013d/Composition.hs - + testsuite/tests/cabal/T27013d/Makefile - + testsuite/tests/cabal/T27013d/T27013d.stdout - + testsuite/tests/cabal/T27013d/all.T Changes: ===================================== compiler/GHC/Tc/Utils/Env.hs ===================================== @@ -83,6 +83,7 @@ import GHC.Driver.DynFlags import GHC.Builtin( isUnboundName ) import GHC.Builtin.KnownKeys import GHC.Builtin.WiredIn.Types +import GHC.Builtin.Modules ( eSSENTIALS_NAME ) import GHC.Runtime.Context @@ -115,6 +116,7 @@ import GHC.Unit.Home import GHC.Unit.Home.Graph import GHC.Unit.Home.ModInfo import GHC.Unit.External +import GHC.Unit.Finder import GHC.Utils.Outputable import GHC.Utils.Panic @@ -137,6 +139,7 @@ import GHC.Types.Id import GHC.Types.Id.Info ( RecSelParent(..) ) import GHC.Types.Name.Reader import GHC.Types.TyThing +import GHC.Types.PkgQual import GHC.Types.Unique.Set ( nonDetEltsUniqSet ) import qualified GHC.LanguageExtensions as LangExt @@ -1129,9 +1132,9 @@ tcGetDefaultTys ; user_defaults <- getDeclaredDefaultTys -- User-supplied defaults ; this_module <- tcg_mod <$> getGblEnv ; let this_unit = moduleUnit this_module - ; essentials_mod <- liftIO $ lookupKnownKeysModule hsc_env dflags - ; case essentials_mod of - Nothing -> + ; found_essentials <- liftIO $ findImportedModule hsc_env eSSENTIALS_NAME NoPkgQual + ; case found_essentials of + NotFound{} -> -- If GHC.Essentials isn't available at all (e.g. -hide-all-packages), -- don't add the built-in defaulting, bc e.g. Num is a known-entity. return (user_defaults, extended_defaults) ===================================== testsuite/tests/cabal/T27013d/Composition.hs ===================================== @@ -0,0 +1,150 @@ +-- | This module is for convenience and demonstrative purposes +-- more than it is for providing actual value. +-- I do not recommend that you rely on this module +-- for performance-sensitive code. +-- Because this module is not based on Prelude's (.), +-- some chances at optimization might be missed by your compiler. +module Data.Composition ( + -- * Math + (∘) + + -- * Colons and dots + , (.:) + , (.:.) + , (.::) + , (.::.) + , (.:::) + , (.:::.) + , (.::::) + , (.::::.) + + -- * Asterisks + , (.*) + , (.**) + , (.***) + , (.****) + , (.*****) + , (.******) + , (.*******) + , (.********) + + -- * composeN + , compose1 + , compose2 + , compose3 + , compose4 + , compose5 + , compose6 + , compose7 + , compose8 + , compose9 + + ) where + +-- Not exported. This is defined here to remove the dependency on base +(.) :: (b -> c) -> (a -> b) -> a -> c +(f . g) x = f (g x) + +infixr 9 . + +-- | The mathematical symbol for function composition. +(∘) :: (b -> c) -> (a -> b) -> a -> c +(∘) = (.) + +infixr 9 ∘ + +-- | Compose two functions. @f .: g@ is similar to @f . g@ +-- except that @g@ will be fed /two/ arguments instead of one +-- before handing its result to @f@. +-- +-- This function is defined as +-- +-- > (f .: g) x y = f (g x y) +-- +-- Example usage: +-- +-- > concatMap :: (a -> [b]) -> [a] -> [b] +-- > concatMap = concat .: map +-- +-- Notice how /two/ arguments +-- (the function /and/ the list) +-- will be given to @map@ before the result +-- is passed to @concat@. This is equivalent to: +-- +-- > concatMap f xs = concat (map f xs) +(.:) :: (c -> d) -> (a -> b -> c) -> a -> b -> d +(f .: g) x y = f (g x y) + +infixr 8 .: + +-- | Equivalent to '.:' +-- +-- The pattern of appending asterisks is +-- straightforward to extend to similar functions: +-- (compose2 = .*, compose3 = .**, etc). +-- However, @.:@ has been commonly adopted amongst Haskellers, +-- and the need for compose3 and beyond is rare in practice. +(.*) :: (c -> d) -> (a -> b -> c) -> a -> b -> d +(.*) = (.) . (.) + +infixr 8 .* + +(.**) :: (d -> e) -> (a -> b -> c -> d) -> a -> b -> c -> e +(.**) = (.) . (.*) + +(.***) = (.) . (.**) +(.****) = (.) . (.***) +(.*****) = (.) . (.****) +(.******) = (.) . (.*****) +(.*******) = (.) . (.******) +(.********) = (.) . (.*******) + +infixr 8 .** +infixr 8 .*** +infixr 8 .**** +infixr 8 .***** +infixr 8 .****** +infixr 8 .******* +infixr 8 .******** + + +-- | @composeN f g@ means give @g@ @N@ inputs +-- and then pass its result to @f@. +compose1 :: (b -> c) -> (a -> b) -> a -> c +compose1 = (.) + +compose2 :: (c -> d) -> (a -> b -> c) -> a -> b -> d +compose2 = (.*) + +compose3 :: (d -> e) -> (a -> b -> c -> d) -> a -> b -> c -> e +compose3 = (.**) + +compose4 = (.***) +compose5 = (.****) +compose6 = (.*****) +compose7 = (.******) +compose8 = (.*******) +compose9 = (.********) + +-- | One compact pattern for composition operators is to +-- "count the dots after the first one", +-- which begins with the common '.:', and proceeds by first +-- appending another @.@ and then replacing it with @:@ +(.:.) :: (d -> e) -> (a -> b -> c -> d) -> a -> b -> c -> e +(.:.) = (.**) + +(.::) = (.***) +(.::.) = (.****) +(.:::) = (.*****) +(.:::.) = (.******) +(.::::) = (.*******) +(.::::.) = (.********) + +infixr 8 .:. +infixr 8 .:: +infixr 8 .::. +infixr 8 .::: +infixr 8 .:::. +infixr 8 .:::: +infixr 8 .::::. + ===================================== testsuite/tests/cabal/T27013d/Makefile ===================================== @@ -0,0 +1,16 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +# Test that compiling Data.Composition without implicit Prelude does not +# recompile the second or third time. The `composition` package's +# Data.Composition uses NoImplicitPrelude and depends on neither base nor +# ghc-internal. In !15899, it was recompiled because of an incorrect +# "GHC.Essentials package changed". +clean: + rm -f *.o *.hi + +T27013d: clean + '$(TEST_HC)' $(TEST_HC_OPTS) Composition.hs -XNoImplicitPrelude -hide-all-packages + '$(TEST_HC)' $(TEST_HC_OPTS) Composition.hs -XNoImplicitPrelude -hide-all-packages + '$(TEST_HC)' $(TEST_HC_OPTS) Composition.hs -XNoImplicitPrelude -hide-all-packages ===================================== testsuite/tests/cabal/T27013d/T27013d.stdout ===================================== @@ -0,0 +1 @@ +[1 of 1] Compiling Data.Composition ( Composition.hs, Composition.o ) ===================================== testsuite/tests/cabal/T27013d/all.T ===================================== @@ -0,0 +1,2 @@ +test('T27013d', [extra_files(['Composition.hs'])], + makefile_test, []) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5943ac8c8e7d9fc5dd5e25d118282f… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/5943ac8c8e7d9fc5dd5e25d118282f… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/27370] compiler: mark tool messages as errors/warnings depending on the exit code
by Zubin (＠wz1000) 11 Jun '26

11 Jun '26

Zubin pushed to branch wip/27370 at Glasgow Haskell Compiler / GHC Commits: 07b6d55c by Zubin Duggal at 2026-06-11T20:39:32+05:30 compiler: mark tool messages as errors/warnings depending on the exit code Fixes #27370 - - - - - 7 changed files: - + changelog.d/tool-messages-27370 - compiler/GHC/SysTools/Process.hs - + testsuite/tests/driver/T27370/Makefile - + testsuite/tests/driver/T27370/T27370.hs - + testsuite/tests/driver/T27370/T27370.pp - + testsuite/tests/driver/T27370/T27370.stderr - + testsuite/tests/driver/T27370/all.T Changes: ===================================== changelog.d/tool-messages-27370 ===================================== @@ -0,0 +1,6 @@ +section: compiler +synopsis: Mark messages from external tools as errors or warnings depending on + the tool's exit code. Previously, output printed to stderr by tools was + unconditionally reported as errors. +issues: #27370 +mrs: !16170 ===================================== compiler/GHC/SysTools/Process.hs ===================================== @@ -26,8 +26,9 @@ import GHC.Utils.Logger import GHC.Utils.TmpFs import GHC.Utils.CliOption -import GHC.Driver.Errors (reportError) +import GHC.Driver.Errors (reportDiagnostic) +import GHC.Types.Error ( DiagnosticReason(..) ) import GHC.Types.SrcLoc ( SrcLoc, mkSrcLoc, mkSrcSpan ) import GHC.Data.FastString @@ -271,9 +272,10 @@ builderMainLoop logger filter_fn pgm real_args mb_cwd mb_env = withPipe $ \ (rea getLocaleEncoding >>= hSetEncoding readEnd hSetNewlineMode readEnd nativeNewlineMode hSetBuffering readEnd LineBuffering - messages <- parseBuildMessages . filter_fn . lines <$> hGetContents readEnd - mapM_ processBuildMessage messages - waitForProcess hProcess + messages <- parseBuildMessages . filter_fn . lines <$> hGetContents' readEnd + code <- waitForProcess hProcess + mapM_ (processBuildMessage code) messages + return code hClose hStdIn case r of Left (SomeException e) -> do @@ -282,13 +284,16 @@ builderMainLoop logger filter_fn pgm real_args mb_cwd mb_env = withPipe $ \ (rea Right s -> do return s where - processBuildMessage :: BuildMessage -> IO () - processBuildMessage msg = do + processBuildMessage :: ExitCode -> BuildMessage -> IO () + processBuildMessage code msg = do case msg of BuildMsg msg -> do logInfo logger $ withPprStyle defaultUserStyle msg BuildError loc msg -> do - reportError logger neverQualify emptyDiagOpts (mkSrcSpan loc loc) msg + let reason = case code of + ExitSuccess -> WarningWithoutFlag + ExitFailure{} -> ErrorWithoutFlag + reportDiagnostic logger neverQualify emptyDiagOpts (mkSrcSpan loc loc) reason msg parseBuildMessages :: [String] -> [BuildMessage] parseBuildMessages str = loop str Nothing ===================================== testsuite/tests/driver/T27370/Makefile ===================================== @@ -0,0 +1,7 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +T27370: + chmod +x ./T27370.pp + '$(TEST_HC)' $(TEST_HC_OPTS) -c T27370.hs ===================================== testsuite/tests/driver/T27370/T27370.hs ===================================== @@ -0,0 +1,2 @@ +{-# OPTIONS_GHC -F -pgmF ./T27370.pp #-} +module T27370 where ===================================== testsuite/tests/driver/T27370/T27370.pp ===================================== @@ -0,0 +1,5 @@ +#!/bin/sh +cp "$2" "$3" +echo "$1:2:8: a located warning from an external tool" +echo " with a continuation line" +echo "an unlocated line from an external tool" ===================================== testsuite/tests/driver/T27370/T27370.stderr ===================================== @@ -0,0 +1,5 @@ +T27370.hs:2:8: warning: + a located warning from an external tool + with a continuation line + +an unlocated line from an external tool ===================================== testsuite/tests/driver/T27370/all.T ===================================== @@ -0,0 +1,4 @@ +test('T27370', + [extra_files(['T27370.hs', 'T27370.pp']), + when(opsys('mingw32'), skip)], + makefile_test, ['T27370']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/07b6d55c59fbfa6b4d3adac717d99a3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/07b6d55c59fbfa6b4d3adac717d99a3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/spj-reinstallable-base2] 7 commits: fix indentation
by Rodrigo Mesquita (＠alt-romes) 11 Jun '26

11 Jun '26

Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: a2ef5577 by Rodrigo Mesquita at 2026-06-09T17:22:09+01:00 fix indentation - - - - - 79bcda2c by Rodrigo Mesquita at 2026-06-09T17:22:45+01:00 attempt at saving when ESSENTIALS is used - - - - - 17bc7b47 by Rodrigo Mesquita at 2026-06-09T17:22:48+01:00 Revert "attempt at saving when ESSENTIALS is used" This reverts commit 79bcda2c218c8179b663cb2ab0bfe9754021b68f. - - - - - ab9c2bc4 by Rodrigo Mesquita at 2026-06-11T11:52:46+01:00 Make sure to add a direct package dependency unless -frebindable-known-names We already add an implicit edge to the module graph. We better include an edge in the Iface information too, for consistency and recompilation checking to work properly Fixes T27013b - - - - - 12153266 by Rodrigo Mesquita at 2026-06-11T11:54:36+01:00 T27013c, where x = x makes recompilation checkng still broken - - - - - 88fe754d by Rodrigo Mesquita at 2026-06-11T16:02:05+01:00 Unconditionally add the GHC.Essentials module to the direct pkg deps, unless -frebindable-known-names; this matches the logic that always adds a module graph edge to GHC.Essentials because we'll need to look up that module unless -frebindable-known-names. To fix defaulting, just make defaulting not happen if the GHC.Essentials module is not found (meaning we'll never try to load the rebindable name bc we don't enter the branch at all) Fixes T27013{a,b,c} - - - - - 5943ac8c by Rodrigo Mesquita at 2026-06-11T16:06:53+01:00 use lookupKnownKeyModule for defaulting check too - - - - - 13 changed files: - changelog.d/refactor-known-names - compiler/GHC/HsToCore.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Make.hs - compiler/GHC/Parser/Header.hs - compiler/GHC/Tc/Module.hs - compiler/GHC/Tc/Utils/Env.hs - compiler/GHC/Unit/External.hs - compiler/GHC/Unit/Module/Deps.hs - + testsuite/tests/driver/T27013c/Makefile - + testsuite/tests/driver/T27013c/T27013c.stdout - + testsuite/tests/driver/T27013c/X.hs - + testsuite/tests/driver/T27013c/all.T Changes: ===================================== changelog.d/refactor-known-names ===================================== @@ -5,7 +5,13 @@ synopsis: Completely refactor the handling of "known entities". The goal is to itself. This is a major step along the path to making `base` into an ordinary re-installable library. - Mostly this change is only visible to authors of modules in `ghc-internal` or - `base`. + Mostly this change is only visible to authors of modules in `ghc-internal` or `base`. + + Since the known-names are no longer fully wired in to the compiler, GHCi must + be able to find `base` for all the known-names like `print` and `IO` to be + available. Therefore `ghci -hide-all-packages`, which hides `base` from ghci, + no longer works. One must use `ghci -hide-all-packages -package base` to + bring in the known-names from base. + issues: #27013 mrs: !15899 ===================================== compiler/GHC/HsToCore.hs ===================================== @@ -99,7 +99,7 @@ import Data.IORef import GHC.Iface.Make (mkRecompUsageInfo) import GHC.Runtime.Interpreter (interpreterProfiled) import GHC.Types.Unique.FM -import GHC.Iface.Load (KnownEntitySource(..), lookupKnownKeyName) +import GHC.Iface.Load (KnownEntitySource(..), lookupKnownKeyName, lookupKnownKeysModule) import GHC.HsToCore.Types (DsGblEnv(..)) {- @@ -220,11 +220,13 @@ deSugar hsc_env ; endPassHscEnvIO hsc_env name_ppr_ctx CoreDesugar ds_binds ds_rules_for_imps ; let pluginModules = map lpModule (loadedPlugins (hsc_plugins hsc_env)) - home_unit = hsc_home_unit hsc_env + home_unit = hsc_home_unit hsc_env + ; essentials_mod <- liftIO $ lookupKnownKeysModule hsc_env dflags ; let deps = mkDependencies home_unit (tcg_mod tcg_env) (tcg_imports tcg_env) (map mi_module pluginModules) + (moduleUnitId <$> essentials_mod) ; safe_mode <- finalSafeMode dflags tcg_env ===================================== compiler/GHC/Iface/Load.hs ===================================== @@ -24,7 +24,7 @@ module GHC.Iface.Load ( lookupKnownKeyThing, lookupKnownKeyName, lookupKnownOccThing, lookupKnownOccName, loadKnownKeyOccMaps, lookupKnownGRE, - lookupKnownKeysMap, + lookupKnownKeysMap, lookupKnownKeysModule, -- RnM/TcM functions loadModuleInterface, loadModuleInterfaces, @@ -283,7 +283,7 @@ loadKnownKeyOccMaps :: IfM lcl KnownKeyNameMaps loadKnownKeyOccMaps = do { eps <- getEps ; case eps_known_keys eps of { - Just kk_maps -> return kk_maps ; + Just (kk_maps, _) -> return kk_maps ; Nothing -> -- We don't have a KnownKeyOccMap yet, so create it @@ -310,7 +310,7 @@ loadKnownKeyOccMaps , nm <- availNames avail ] -- Record the KnownKeyOccMap in the EPS, so we will find it next time - ; updateEps_ (\eps -> eps { eps_known_keys = Just (kk_map, occ_map) }) + ; updateEps_ (\eps -> eps { eps_known_keys = Just ((kk_map, occ_map), mi_module iface) }) #ifdef DEBUG ; case checkKnownKeyNamesIface kk_map of @@ -355,6 +355,17 @@ checkKnownKeyNamesIface known_key_names_occ_map Just name -> getOccName name /= occ #endif +-- | Lookup the module exporting the canonical known-entities definitions (GHC.Essentials) +lookupKnownKeysModule :: HscEnv -> DynFlags {-^ Module dyn flags -} -> IO (Maybe Module) +lookupKnownKeysModule hsc_env dflags = do + found_essentials <- findImportedModule hsc_env eSSENTIALS_NAME NoPkgQual + let rebindable_kn = gopt Opt_RebindableKnownNames dflags + let essentials_uid + | rebindable_kn = Nothing + | Found _ mod <- found_essentials = Just mod + | otherwise = Nothing + return essentials_uid + {- ********************************************************************* * * * Global things ===================================== compiler/GHC/Iface/Make.hs ===================================== @@ -238,16 +238,18 @@ mkIfaceTc hsc_env safe_mode mod_details mod_summary mb_program tcg_fix_env = fix_env, tcg_warns = warns } - = do - let pluginModules = map lpModule (loadedPlugins (hsc_plugins hsc_env)) - let home_unit = hsc_home_unit hsc_env + = do let pluginModules = map lpModule (loadedPlugins (hsc_plugins hsc_env)) + let home_unit = hsc_home_unit hsc_env + let dflags = ms_hspp_opts mod_summary + essentials_mod <- liftIO $ lookupKnownKeysModule hsc_env dflags let deps = mkDependencies home_unit (tcg_mod tc_result) (tcg_imports tc_result) (map mi_module pluginModules) + (moduleUnitId <$> essentials_mod) usage <- mkRecompUsageInfo hsc_env tc_result - docs <- extractDocs (ms_hspp_opts mod_summary) tc_result + docs <- extractDocs dflags tc_result self_recomp <- traverse (mkSelfRecomp hsc_env this_mod (ms_hs_hash mod_summary)) usage let partial_iface = mkIface_ hsc_env ===================================== compiler/GHC/Parser/Header.hs ===================================== @@ -126,7 +126,7 @@ getImportEdges dflags buf filename source_filename = do mkPrelImports :: ModuleName -> Bool -> [LImportDecl GhcPs] -> [LImportDecl GhcPs] --- Construct the implicit declaration "import Prelude" (or not) +-- ^ Construct the implicit declaration "import Prelude" (or not) -- -- NB: opt_NoImplicitPrelude is slightly different to import Prelude (); -- because the former doesn't even look at Prelude.hi for instance ===================================== compiler/GHC/Tc/Module.hs ===================================== @@ -473,28 +473,28 @@ tcRnImports hsc_env import_decls ; gbl_env <- getGblEnv ; let unitId = homeUnitId $ hsc_home_unit hsc_env mnwib = GWIB (moduleName this_mod)(hscSourceToIsBoot (tcg_src gbl_env)) - ; -- We want instance declarations from all home-package - -- modules below this one, including boot modules, except - -- ourselves. The 'except ourselves' is so that we don't - -- get the instances from this module's hs-boot file. This - -- filtering also ensures that we don't see instances from - -- modules batch (@--make@) compiled before this one, but - -- which are not below this one. - ; (home_insts, home_fam_insts) <- liftIO $ - hugInstancesBelow hsc_env unitId mnwib - - -- We use 'unsafeInterleaveIO' to avoid redundant memory allocations - -- See Note [Lazily loading COMPLETE pragmas] from GHC.HsToCore.Monad - -- and see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/14274#note_620545 - ; completeSigsBelow <- liftIO $ unsafeInterleaveIO $ - hugCompleteSigsBelow hsc_env unitId mnwib - - -- Record boot-file info in the EPS, so that it's - -- visible to loadHiBootInterface in tcRnSrcDecls, - -- and any other incrementally-performed imports - ; when (isOneShot (ghcMode (hsc_dflags hsc_env))) $ do { - updateEps_ $ \eps -> eps { eps_is_boot = imp_boot_mods imports } - } + -- We want instance declarations from all home-package + -- modules below this one, including boot modules, except + -- ourselves. The 'except ourselves' is so that we don't + -- get the instances from this module's hs-boot file. This + -- filtering also ensures that we don't see instances from + -- modules batch (@--make@) compiled before this one, but + -- which are not below this one. + ; (home_insts, home_fam_insts) <- liftIO $ + hugInstancesBelow hsc_env unitId mnwib + + -- We use 'unsafeInterleaveIO' to avoid redundant memory allocations + -- See Note [Lazily loading COMPLETE pragmas] from GHC.HsToCore.Monad + -- and see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/14274#note_620545 + ; completeSigsBelow <- liftIO $ unsafeInterleaveIO $ + hugCompleteSigsBelow hsc_env unitId mnwib + + -- Record boot-file info in the EPS, so that it's + -- visible to loadHiBootInterface in tcRnSrcDecls, + -- and any other incrementally-performed imports + ; when (isOneShot (ghcMode (hsc_dflags hsc_env))) $ do { + updateEps_ $ \eps -> eps { eps_is_boot = imp_boot_mods imports } + } -- Update the gbl env ; updGblEnv ( \ gbl -> ===================================== compiler/GHC/Tc/Utils/Env.hs ===================================== @@ -217,7 +217,7 @@ lookupKnownKeyGlobal hsc_env key = do eps <- hscEPS hsc_env case eps_known_keys eps of Nothing -> pprPanic "lookupKnownKeyGlobal" (text "eps_known_keys not initialized") - Just (kk_map, _) -> case lookupKnownKeysMap kk_map key of + Just ((kk_map, _), _) -> case lookupKnownKeysMap kk_map key of Succeeded name -> lookupGlobal hsc_env name Failed err -> pprPanic "lookupKnownKeyGlobal" (pprDiagnostic err) @@ -1116,6 +1116,7 @@ tcGetDefaultTys :: TcM (DefaultEnv, -- Default classes and types Bool) -- True <=> Use extended defaulting rules tcGetDefaultTys = do { dflags <- getDynFlags + ; hsc_env <- getTopEnv ; let ovl_strings = xopt LangExt.OverloadedStrings dflags extended_defaults = xopt LangExt.ExtendedDefaultRules dflags -- See also #1974 @@ -1128,11 +1129,17 @@ tcGetDefaultTys ; user_defaults <- getDeclaredDefaultTys -- User-supplied defaults ; this_module <- tcg_mod <$> getGblEnv ; let this_unit = moduleUnit this_module - ; if this_unit == ghcInternalUnit -- if we wanted, this needn't be about ghc-internal - -- see Remark [No built-in defaults in ghc-internal] - -- in Note [Builtin class defaults] in GHC.Tc.Utils.Env - then return (user_defaults, extended_defaults) - else do + ; essentials_mod <- liftIO $ lookupKnownKeysModule hsc_env dflags + ; case essentials_mod of + Nothing -> + -- If GHC.Essentials isn't available at all (e.g. -hide-all-packages), + -- don't add the built-in defaulting, bc e.g. Num is a known-entity. + return (user_defaults, extended_defaults) + _ | this_unit == ghcInternalUnit -> + -- see Remark [No built-in defaults in ghc-internal] + -- in Note [Builtin class defaults] in GHC.Tc.Utils.Env + return (user_defaults, extended_defaults) + _ -> do -- Not one of the built-in units -- @default Num (Integer, Double)@, plus extensions { extDef <- if extended_defaults ===================================== compiler/GHC/Unit/External.hs ===================================== @@ -153,7 +153,9 @@ data ExternalPackageState -- See Note [Interface Files with Core Definitions] eps_iface_bytecode :: !(ModuleEnv (IO Linkable)), - eps_known_keys :: Maybe KnownKeyNameMaps, -- ^ See Note [Overview of known entities] + eps_known_keys :: Maybe (KnownKeyNameMaps, Module), + -- ^ See Note [Overview of known entities]. + -- Caches the 'Module' where known entities are defined. eps_inst_env :: !PackageInstEnv, -- ^ The total 'InstEnv' accumulated -- from all the external-package modules ===================================== compiler/GHC/Unit/Module/Deps.hs ===================================== @@ -174,8 +174,9 @@ instance Outputable IfaceImportLevel where -- a dependencies information for the module being compiled. -- -- The fourth argument is a list of plugin modules. -mkDependencies :: HomeUnit -> Module -> ImportAvails -> [Module] -> Dependencies -mkDependencies home_unit mod imports plugin_mods = +-- The fifth argument is the unit-id of GHC.Essentials, unless -frebindable-known-names. +mkDependencies :: HomeUnit -> Module -> ImportAvails -> [Module] -> Maybe UnitId -> Dependencies +mkDependencies home_unit mod imports plugin_mods messentials_pkg = let (home_plugins, external_plugins) = partition (isHomeUnit home_unit . moduleUnit) plugin_mods plugin_units = Set.fromList (map (toUnitId . moduleUnit) external_plugins) all_direct_mods = foldr (\(s, mn) m -> extendInstalledModuleEnv m mn (s, (GWIB (moduleName mn) NotBoot))) @@ -202,7 +203,14 @@ mkDependencies home_unit mod imports plugin_mods = -- We must also remove self-references from imp_orphs. See -- Note [Module self-dependency] - direct_pkgs = Set.map (\(lvl, uid) -> (IfaceImportLevel lvl, uid)) (imp_dep_direct_pkgs imports) + direct_pkgs = add_essentials_pkg $ + Set.map (\(lvl, uid) -> (IfaceImportLevel lvl, uid)) (imp_dep_direct_pkgs imports) + + -- Add the GHC.Essentials package to direct deps unless -frebindable-known-names is on + -- (the modgraph has edges to GHC.Essentials similarly, see `getImportEdges` in GHC.Parser.Header) + add_essentials_pkg = case messentials_pkg of + Nothing -> id + Just essentials_uid -> Set.insert (IfaceImportLevel NormalLevel, essentials_uid) -- Set the packages required to be Safe according to Safe Haskell. -- See Note [Tracking Trust Transitively] in GHC.Rename.Names ===================================== testsuite/tests/driver/T27013c/Makefile ===================================== @@ -0,0 +1,14 @@ +TOP=../../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk + +# Test that compiling X.hs without implicit Prelude does not recompile X the +# second time or third time. In !15899, X.hs was recompiled because of an +# incorrect "GHC.Essentials package changed" +clean: + rm -f *.o *.hi + +T27013c: clean + '$(TEST_HC)' $(TEST_HC_OPTS) --make X.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make X.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make X.hs ===================================== testsuite/tests/driver/T27013c/T27013c.stdout ===================================== @@ -0,0 +1 @@ +[1 of 1] Compiling X ( X.hs, X.o ) ===================================== testsuite/tests/driver/T27013c/X.hs ===================================== @@ -0,0 +1,3 @@ +{-# LANGUAGE NoImplicitPrelude #-} +module X where +x = x ===================================== testsuite/tests/driver/T27013c/all.T ===================================== @@ -0,0 +1,2 @@ +test('T27013c', [extra_files(['X.hs'])], + makefile_test, []) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/48c0a754c26b319bd2df0c8d04f9e4… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/48c0a754c26b319bd2df0c8d04f9e4… You're receiving this email because of your account on gitlab.haskell.org.

1 0