- ghc-commits - Haskell.org

[Git][ghc/ghc][master] ghc-internal: fix redundant import in GHC.Internal.Event.Windows.ManagedThreadPool
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 7e31367c by Cheng Shao at 2026-03-06T06:32:46-05:00 ghc-internal: fix redundant import in GHC.Internal.Event.Windows.ManagedThreadPool This patch fixes redundant import in `GHC.Internal.Event.Windows.ManagedThreadPool` that causes a compilation error when building windows target with validate flavours and bootstrapping from 9.14. Fixes #26976. - - - - - 1 changed file: - libraries/ghc-internal/src/GHC/Internal/Event/Windows/ManagedThreadPool.hs Changes: ===================================== libraries/ghc-internal/src/GHC/Internal/Event/Windows/ManagedThreadPool.hs ===================================== @@ -31,7 +31,6 @@ import GHC.Internal.Control.Concurrent.MVar import GHC.Internal.Data.Maybe import GHC.Internal.Base import GHC.Internal.Num ((-), (+)) -import GHC.Internal.Real (fromIntegral) import qualified GHC.Internal.Event.Array as A import GHC.Internal.IO.Handle.Internals (debugIO) import GHC.Internal.Conc.Sync (ThreadId(..)) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e31367c832225f2d7b277077444c2a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7e31367c832225f2d7b277077444c2a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] compiler: avoid unneeded traversals in GHC.Unit.State
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 148d36f3 by Cheng Shao at 2026-03-06T06:32:01-05:00 compiler: avoid unneeded traversals in GHC.Unit.State Following !15591, this patch avoids unneeded traversals in `reportCycles`/`reportUnusable` when log verbosity is below given threshold. Also applies `logVerbAtLeast` when appropriate. Co-authored-by: Codex <codex(a)openai.com> - - - - - 2 changed files: - compiler/GHC/Unit/State.hs - compiler/GHC/Utils/Error.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -1279,7 +1279,7 @@ pprReason pref reason = case reason of nest 2 (hsep (map ppr deps)) reportCycles :: Logger -> [SCC UnitInfo] -> IO () -reportCycles logger sccs = mapM_ report sccs +reportCycles logger sccs = when (logVerbAtLeast logger 2) $ mapM_ report sccs where report (AcyclicSCC _) = return () report (CyclicSCC vs) = @@ -1288,7 +1288,7 @@ reportCycles logger sccs = mapM_ report sccs nest 2 (hsep (map (ppr . unitId) vs)) reportUnusable :: Logger -> UnusableUnits -> IO () -reportUnusable logger pkgs = mapM_ report (nonDetUniqMapToList pkgs) +reportUnusable logger pkgs = when (logVerbAtLeast logger 2) $ mapM_ report (nonDetUniqMapToList pkgs) where report (ipid, (_, reason)) = debugTraceMsg logger 2 $ @@ -1389,7 +1389,7 @@ mergeDatabases logger = foldM merge (emptyUniqMap, emptyUniqMap) . zip [1..] merge (pkg_map, prec_map) (i, UnitDatabase db_path db) = do debugTraceMsg logger 2 $ text "loading package database" <+> ppr db_path - when (log_verbosity (logFlags logger) >= 2) $ + when (logVerbAtLeast logger 2) $ forM_ (Set.toList override_set) $ \pkg -> debugTraceMsg logger 2 $ text "package" <+> ppr pkg <+> ===================================== compiler/GHC/Utils/Error.hs ===================================== @@ -463,7 +463,7 @@ withTiming' logger what force_result prtimings action debugTraceMsg :: Logger -> Int -> SDoc -> IO () debugTraceMsg logger val msg = - when (log_verbosity (logFlags logger) >= val) $ + when (logVerbAtLeast logger val) $ logInfo logger (withPprStyle defaultDumpStyle msg) {-# INLINE debugTraceMsg #-} -- see Note [INLINE conditional tracing utilities] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/148d36f36711a58fbb7e6b569786916… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/148d36f36711a58fbb7e6b569786916… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] compiler: fix redundant import of GHC.Hs.Lit
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 3b59f158 by Cheng Shao at 2026-03-06T06:31:16-05:00 compiler: fix redundant import of GHC.Hs.Lit This patch removes a redundant import of `GHC.Hs.Lit` which causes a ghc build failure with validate flavours when bootstrapping from 9.14. Fixes #26972. - - - - - 1 changed file: - compiler/GHC/Hs/Type.hs Changes: ===================================== compiler/GHC/Hs/Type.hs ===================================== @@ -117,7 +117,6 @@ import GHC.Core.Ppr ( pprOccWithTick) import GHC.Core.Type import GHC.Core.Multiplicity( pprArrowWithMultiplicity ) import GHC.Hs.Doc -import GHC.Hs.Lit (pprHsStringLit) import GHC.Generics (Generic, Generically(..)) import GHC.Types.Basic import GHC.Types.SrcLoc View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3b59f15865652edbe873a380f73be46… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3b59f15865652edbe873a380f73be46… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Linker: implement support for COMMON symbols (#6107)
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: ad25af90 by Sylvain Henry at 2026-03-06T06:30:33-05:00 Linker: implement support for COMMON symbols (#6107) Add some support for COMMON symbols. We don't support common symbols having different sizes where the larger one is allocated after the smaller one. The linker will fail with an appropriate error message if it happens. - - - - - 11 changed files: - rts/Linker.c - rts/LinkerInternals.h - rts/linker/Elf.c - rts/linker/MachO.c - rts/linker/PEi386.c - testsuite/tests/rts/linker/Makefile - + testsuite/tests/rts/linker/T6107.hs - + testsuite/tests/rts/linker/T6107.stdout - + testsuite/tests/rts/linker/T6107_sym1.s - + testsuite/tests/rts/linker/T6107_sym2.s - testsuite/tests/rts/linker/all.T Changes: ===================================== rts/Linker.c ===================================== @@ -268,6 +268,7 @@ int ghciInsertSymbolTable( SymbolAddr* data, SymStrength strength, SymType type, + unsigned long size, ObjectCode *owner) { RtsSymbolInfo *pinfo = lookupStrHashTable(table, key); @@ -278,6 +279,7 @@ int ghciInsertSymbolTable( pinfo->owner = owner; pinfo->strength = strength; pinfo->type = type; + pinfo->size = size; insertStrHashTable(table, key, pinfo); return 1; } @@ -290,6 +292,7 @@ int ghciInsertSymbolTable( pinfo->owner = owner; pinfo->strength = strength; pinfo->type = type; + pinfo->size = size; return 1; } /* We were asked to discard the symbol on duplicates, do so quietly. */ @@ -318,6 +321,7 @@ int ghciInsertSymbolTable( /* The existing symbol is weak with a zero value; replace it with the new symbol. */ pinfo->value = data; pinfo->owner = owner; + pinfo->size = size; return 1; } else if (strength == STRENGTH_WEAK) @@ -336,6 +340,7 @@ int ghciInsertSymbolTable( pinfo->value = data; pinfo->owner = owner; pinfo->strength = strength; + pinfo->size = size; return 1; } else if ( pinfo->owner @@ -360,6 +365,7 @@ int ghciInsertSymbolTable( pinfo->value = data; pinfo->owner = owner; pinfo->strength = strength; + pinfo->size = size; } return 1; @@ -477,7 +483,7 @@ initLinker_ (int retain_cafs) IF_DEBUG(linker, debugBelch("initLinker: inserting rts symbol %s, %p\n", sym->lbl, sym->addr)); if (! ghciInsertSymbolTable(WSTR("(GHCi built-in symbols)"), symhash, sym->lbl, sym->addr, - sym->strength, sym->type, NULL)) { + sym->strength, sym->type, 0, NULL)) { barf("ghciInsertSymbolTable failed"); } } @@ -495,7 +501,7 @@ initLinker_ (int retain_cafs) IF_DEBUG(linker, debugBelch("initLinker: inserting extra rts symbol %s, %p\n", sym->lbl, sym->addr)); if (! ghciInsertSymbolTable(WSTR("(GHCi built-in symbols)"), symhash, sym->lbl, sym->addr, - sym->strength, sym->type, NULL)) { + sym->strength, sym->type, 0, NULL)) { barf("ghciInsertSymbolTable failed"); } } @@ -506,7 +512,7 @@ initLinker_ (int retain_cafs) if (! ghciInsertSymbolTable(WSTR("(GHCi built-in symbols)"), symhash, MAYBE_LEADING_UNDERSCORE_STR("newCAF"), retain_cafs ? newRetainedCAF : newGCdCAF, - HS_BOOL_FALSE, SYM_TYPE_CODE, NULL)) { + HS_BOOL_FALSE, SYM_TYPE_CODE, 0, NULL)) { barf("ghciInsertSymbolTable failed"); } @@ -778,7 +784,7 @@ HsBool removeLibrarySearchPath(HsPtr dll_path_index) HsInt insertSymbol(pathchar* obj_name, SymbolName* key, SymbolAddr* data) { return ghciInsertSymbolTable(obj_name, symhash, key, data, HS_BOOL_FALSE, - SYM_TYPE_CODE, NULL); + SYM_TYPE_CODE, 0, NULL); } /* ----------------------------------------------------------------------------- @@ -1623,7 +1629,7 @@ int ocTryLoad (ObjectCode* oc) { && !ghciInsertSymbolTable(oc->fileName, symhash, symbol.name, symbol.addr, isSymbolWeak(oc, symbol.name), - symbol.type, oc)) { + symbol.type, 0, oc)) { return 0; } } ===================================== rts/LinkerInternals.h ===================================== @@ -418,6 +418,7 @@ typedef struct _RtsSymbolInfo { ObjectCode *owner; SymStrength strength; SymType type; + unsigned long size; // symbol size: only used for COMMON symbols } RtsSymbolInfo; #include "BeginPrivate.h" @@ -441,6 +442,7 @@ int ghciInsertSymbolTable( SymbolAddr* data, SymStrength weak, SymType type, + unsigned long size, ObjectCode *owner); /* Lock-free version of lookupSymbol. When 'dependent' is not NULL, adds it as a ===================================== rts/linker/Elf.c ===================================== @@ -961,7 +961,11 @@ ocGetNames_ELF ( ObjectCode* oc ) for (size_t j = 0; j < symTab->n_symbols; j++) { ElfSymbol *symbol = &symTab->symbols[j]; if (SHN_COMMON == symTab->symbols[j].elf_sym->st_shndx) { - common_size += symbol->elf_sym->st_size; + /* Skip COMMON symbols already defined by a previously-loaded + * object; we will reuse the existing allocation. */ + if (!lookupStrHashTable(symhash, symTab->symbols[j].name)) { + common_size += symbol->elf_sym->st_size; + } } } } @@ -1006,17 +1010,35 @@ ocGetNames_ELF ( ObjectCode* oc ) /* Figure out if we want to add it; if so, set ad to its address. Otherwise leave ad == NULL. */ + bool common_already_defined = false; if (shndx == SHN_COMMON) { isLocal = false; - CHECK(common_used < common_size); - CHECK(common_mem); - symbol->addr = (void*)((uintptr_t)common_mem + common_used); - common_used += symbol->elf_sym->st_size; - CHECK(common_used <= common_size); - - IF_DEBUG(linker_verbose, - debugBelch("COMMON symbol, size %llu name %s allocated at %p\n", - (long long unsigned int) symbol->elf_sym->st_size, nm, symbol->addr)); + RtsSymbolInfo *existing = lookupStrHashTable(symhash, nm); + if (existing != NULL) { + /* COMMON symbol already allocated by a previously-loaded + * object; reuse that address so relocations resolve to + * the same storage. */ + if(symbol->elf_sym->st_size > existing->size) { + barf("linker: trying to link COMMON symbols %s with incompatible sizes: previous size %llu, new size %llu\n", + nm, + (long long unsigned int) existing->size, + (long long unsigned int) symbol->elf_sym->st_size); + } + symbol->addr = existing->value; + common_already_defined = true; + IF_DEBUG(linker_verbose, + debugBelch("COMMON symbol, size %llu name %s reusing address %p\n", + (long long unsigned int) symbol->elf_sym->st_size, nm, symbol->addr)); + } else { + CHECK(common_used < common_size); + CHECK(common_mem); + symbol->addr = (void*)((uintptr_t)common_mem + common_used); + common_used += symbol->elf_sym->st_size; + CHECK(common_used <= common_size); + IF_DEBUG(linker_verbose, + debugBelch("COMMON symbol, size %llu name %s allocated at %p\n", + (long long unsigned int) symbol->elf_sym->st_size, nm, symbol->addr)); + } /* Pointless to do addProddableBlock() for this area, since the linker should never poke around in it. */ @@ -1080,13 +1102,13 @@ ocGetNames_ELF ( ObjectCode* oc ) if (symbol->addr != NULL) { CHECK(nm != NULL); /* Acquire! */ - if (!isLocal) { + if (!isLocal && !common_already_defined) { if (isWeak == HS_BOOL_TRUE) { setWeakSymbol(oc, nm); } if (!ghciInsertSymbolTable(oc->fileName, symhash, - nm, symbol->addr, isWeak, sym_type, oc) + nm, symbol->addr, isWeak, sym_type, symbol->elf_sym->st_size, oc) ) { goto fail; } ===================================== rts/linker/MachO.c ===================================== @@ -1421,8 +1421,13 @@ ocGetNames_MachO(ObjectCode* oc) if((oc->info->nlist[i].n_type & N_TYPE) == N_UNDF && (oc->info->nlist[i].n_value != 0)) { - commonSize += oc->info->nlist[i].n_value; oc->n_symbols++; + /* Only allocate space for COMMON symbols not already + * defined by a previously-loaded object. */ + SymbolName *nm_c = oc->info->macho_symbols[i].name; + if (!lookupStrHashTable(symhash, nm_c)) { + commonSize += oc->info->nlist[i].n_value; + } } else if((oc->info->nlist[i].n_type & N_TYPE) == N_SECT) oc->n_symbols++; @@ -1436,7 +1441,7 @@ ocGetNames_MachO(ObjectCode* oc) */ IF_DEBUG(linker, debugBelch("ocGetNames_MachO: %d external symbols\n", oc->n_symbols)); - oc->symbols = stgMallocBytes(oc->n_symbols * sizeof(Symbol_t), + oc->symbols = stgCallocBytes(oc->n_symbols, sizeof(Symbol_t), "ocGetNames_MachO(oc->symbols)"); if (oc->info->symCmd) { @@ -1467,6 +1472,7 @@ ocGetNames_MachO(ObjectCode* oc) , addr , HS_BOOL_FALSE , sym_type + , 0 , oc); oc->symbols[curSymbol].name = nm; @@ -1488,8 +1494,10 @@ ocGetNames_MachO(ObjectCode* oc) } /* setup the common storage */ - commonStorage = stgCallocBytes(1,commonSize,"ocGetNames_MachO(common symbols)"); - commonCounter = (unsigned long)commonStorage; + if (commonSize > 0) { + commonStorage = stgCallocBytes(1, commonSize, "ocGetNames_MachO(common symbols)"); + commonCounter = (unsigned long)commonStorage; + } if (oc->info->symCmd) { for (size_t i = 0; i < oc->info->n_macho_symbols; i++) { @@ -1499,22 +1507,47 @@ ocGetNames_MachO(ObjectCode* oc) && (nlist->n_type & N_EXT) && (nlist->n_value != 0)) { unsigned long sz = nlist->n_value; - - nlist->n_value = commonCounter; - - /* also set the final address to the macho_symbol */ - oc->info->macho_symbols[i].addr = (void*)commonCounter; /* TODO: Figure out how to determine this from object */ SymType sym_type = SYM_TYPE_CODE; - IF_DEBUG(linker_verbose, debugBelch("ocGetNames_MachO: inserting common symbol: %s\n", nm)); - ghciInsertSymbolTable(oc->fileName, symhash, nm, - (void*)commonCounter, HS_BOOL_FALSE, sym_type, oc); - oc->symbols[curSymbol].name = nm; - oc->symbols[curSymbol].addr = oc->info->macho_symbols[i].addr; - curSymbol++; + RtsSymbolInfo *existing = lookupStrHashTable(symhash, nm); + if (existing != NULL) { + /* COMMON symbol already allocated by a previously-loaded + * object; reuse that address so relocations resolve to + * the same storage. */ + if (sz > existing->size) { + barf("linker: trying to link COMMON symbols %s with" + " incompatible sizes: previous size %llu," + " new size %lu\n", + nm, + (long long unsigned int) existing->size, + sz); + } + nlist->n_value = (unsigned long)existing->value; + oc->info->macho_symbols[i].addr = existing->value; + IF_DEBUG(linker_verbose, + debugBelch("ocGetNames_MachO: COMMON symbol %s" + " reusing address %p\n", + nm, existing->value)); + /* Don't add to oc->symbols: not the owner */ + } else { + nlist->n_value = commonCounter; + /* also set the final address to the macho_symbol */ + oc->info->macho_symbols[i].addr = (void*)commonCounter; - commonCounter += sz; + IF_DEBUG(linker_verbose, + debugBelch("ocGetNames_MachO: inserting common symbol: %s\n", nm)); + ghciInsertSymbolTable(oc->fileName, symhash, nm, + (void*)commonCounter, HS_BOOL_FALSE, + sym_type, + sz, oc); + oc->symbols[curSymbol].name = nm; + oc->symbols[curSymbol].addr = oc->info->macho_symbols[i].addr; + oc->symbols[curSymbol].type = sym_type; + curSymbol++; + + commonCounter += sz; + } } } } ===================================== rts/linker/PEi386.c ===================================== @@ -573,7 +573,7 @@ void initLinker_PEi386(void) if (!ghciInsertSymbolTable(WSTR("(GHCi/Ld special symbols)"), symhash, "__image_base__", GetModuleHandleW (NULL), HS_BOOL_TRUE, - SYM_TYPE_CODE, NULL)) { + SYM_TYPE_CODE, 0, NULL)) { barf("ghciInsertSymbolTable failed"); } @@ -1186,7 +1186,7 @@ bool checkAndLoadImportLibrary( pathchar* arch_name, char* member_name, FILE* f SymType symType = SYM_TYPE_DUP_DISCARD | SYM_TYPE_HIDDEN; symType |= hdr.Type == IMPORT_OBJECT_CODE ? SYM_TYPE_CODE : SYM_TYPE_DATA; - if (!ghciInsertSymbolTable(dll, symhash, symbol, sym, false, symType, NULL)) + if (!ghciInsertSymbolTable(dll, symhash, symbol, sym, false, symType, 0, NULL)) return false; return true; @@ -1825,7 +1825,12 @@ ocGetNames_PEi386 ( ObjectCode* oc ) if (getSymSectionNumber (info, sym) == PE_SECTION_UNDEFINED && getSymValue (info, sym) > 0 && getSymStorageClass (info, sym) != IMAGE_SYM_CLASS_SECTION) { - globalBssSize += getSymValue (info, sym); + /* Only count COMMON symbols not already defined by a + * previously-loaded object; we will reuse their allocation. */ + SymbolName *nm = get_sym_name (getSymShortName (info, sym), oc); + if (!lookupStrHashTable(symhash, nm)) { + globalBssSize += getSymValue (info, sym); + } } i += getSymNumberOfAuxSymbols (info, sym); } @@ -1859,6 +1864,8 @@ ocGetNames_PEi386 ( ObjectCode* oc ) uint8_t symStorageClass = getSymStorageClass (info, sym); SymbolAddr *addr = NULL; bool isWeak = false; + bool common_already_defined = false; + unsigned long symSize = 0; SymbolName *sname = get_sym_name (getSymShortName (info, sym), oc); uint32_t secNumber = getSymSectionNumber (info, sym); @@ -1959,10 +1966,31 @@ ocGetNames_PEi386 ( ObjectCode* oc ) } else if ( secNumber == IMAGE_SYM_UNDEFINED && symValue > 0) { /* This symbol isn't in any section at all, ie, global bss. - Allocate zeroed space for it from the BSS section */ - addr = bss; - bss = (SymbolAddr*)((StgWord)bss + (StgWord)symValue); - IF_DEBUG(linker_verbose, debugBelch("bss symbol @ %p %u\n", addr, symValue)); + Allocate zeroed space for it from the BSS section, unless a + previously-loaded object already allocated storage for it. */ + RtsSymbolInfo *existing = lookupStrHashTable(symhash, sname); + if (existing != NULL) { + /* COMMON symbol already allocated by a previously-loaded + * object; reuse that address so relocations resolve to + * the same storage. */ + if (symValue > existing->size) { + barf("linker: trying to link COMMON symbols %s with" + " incompatible sizes: previous size %llu," + " new size %u\n", + sname, + (long long unsigned int) existing->size, + symValue); + } + addr = existing->value; + common_already_defined = true; + IF_DEBUG(linker_verbose, + debugBelch("bss symbol reusing @ %p %u\n", addr, symValue)); + } else { + addr = bss; + bss = (SymbolAddr*)((StgWord)bss + (StgWord)symValue); + symSize = (unsigned long)symValue; + IF_DEBUG(linker_verbose, debugBelch("bss symbol @ %p %u\n", addr, symValue)); + } } else if (section && section->kind == SECTIONKIND_BFD_IMPORT_LIBRARY) { /* Disassembly of section .idata$5: @@ -1990,7 +2018,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) type = has_code_section ? SYM_TYPE_CODE : SYM_TYPE_DATA; type |= SYM_TYPE_DUP_DISCARD; if (!ghciInsertSymbolTable(oc->fileName, symhash, sname, - addr, false, type, oc)) { + addr, false, type, 0, oc)) { releaseOcInfo (oc); stgFree (oc->image); oc->image = NULL; @@ -2073,7 +2101,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) type |= SYM_TYPE_HIDDEN; if (!ghciInsertSymbolTable(oc->fileName, symhash, sname, - addr, false, type, oc)) + addr, false, type, 0, oc)) return false; break; @@ -2083,6 +2111,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) } if ((addr != NULL || isWeak) + && !common_already_defined && (!section || (section && section->kind != SECTIONKIND_IMPORT))) { /* debugBelch("addSymbol %p `%s' Weak:%lld \n", addr, sname, isWeak); */ sname = strdup (sname); @@ -2098,7 +2127,7 @@ ocGetNames_PEi386 ( ObjectCode* oc ) } if (! ghciInsertSymbolTable(oc->fileName, symhash, sname, addr, - isWeak, type, oc)) + isWeak, type, symSize, oc)) return false; } else { /* We're skipping the symbol, but if we ever load this ===================================== testsuite/tests/rts/linker/Makefile ===================================== @@ -152,3 +152,10 @@ T25191: "$(TEST_HC)" -c T25191_foo2.c -o foo2.o -v0 "$(TEST_HC)" T25191.hs -v0 ./T25191 + +.PHONY: T6107 +T6107: + "$(TEST_HC)" -c T6107_sym1.s -o T6107_sym1.o -v0 + "$(TEST_HC)" -c T6107_sym2.s -o T6107_sym2.o -v0 + "$(TEST_HC)" $(TEST_HC_OPTS) T6107.hs -o T6107 -v0 + ./T6107 ===================================== testsuite/tests/rts/linker/T6107.hs ===================================== @@ -0,0 +1,29 @@ +{-# LANGUAGE ForeignFunctionInterface, CPP #-} +-- Test that the RTS linker merges COMMON symbols from multiple object files. +-- Without the fix, loadObj of the second .o fails with a duplicate symbol error. +import Foreign.C.String +import Control.Monad + +-- Type of paths is different on Windows +#if defined(mingw32_HOST_OS) +type PathString = CWString +withPathString = withCWString +#else +type PathString = CString +withPathString = withCString +#endif + +main :: IO () +main = do + initLinker + r1 <- withPathString "T6107_sym1.o" loadObj + when (r1 /= 1) $ error "loadObj T6107_sym1.o failed" + r2 <- withPathString "T6107_sym2.o" loadObj + when (r2 /= 1) $ error "loadObj T6107_sym2.o failed" + r <- resolveObjs + when (r /= 1) $ error "resolveObjs failed" + putStrLn "OK" + +foreign import ccall "initLinker" initLinker :: IO () +foreign import ccall "loadObj" loadObj :: PathString -> IO Int +foreign import ccall "resolveObjs" resolveObjs :: IO Int ===================================== testsuite/tests/rts/linker/T6107.stdout ===================================== @@ -0,0 +1 @@ +OK ===================================== testsuite/tests/rts/linker/T6107_sym1.s ===================================== @@ -0,0 +1 @@ +.comm shared_var, 4 ===================================== testsuite/tests/rts/linker/T6107_sym2.s ===================================== @@ -0,0 +1 @@ +.comm shared_var, 4 ===================================== testsuite/tests/rts/linker/all.T ===================================== @@ -181,3 +181,11 @@ test('T25191', when(opsys('mingw32'), expect_broken(25191)) # not supported in the PE linker yet ], makefile_test, ['T25191']) + + +# Test that COMMON symbols from multiple object files are merged correctly +test('T6107', + [req_rts_linker, + extra_files(['T6107_sym1.s', 'T6107_sym2.s']) + ], + makefile_test, ['T6107']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ad25af90bdbf1269ff9febbcbc9fffa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ad25af90bdbf1269ff9febbcbc9fffa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] ghc-internal: delete Version hs-boot loop
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: d29800e0 by Teo Camarasu at 2026-03-06T06:28:46-05:00 ghc-internal: delete Version hs-boot loop Version has a Read instance which needs Unicode but part of the Unicode interface is the unicode version. This is easy to resolve. We simply don't re-export the version from the Unicode module. Resolves #26940 - - - - - 6 changed files: - libraries/base/src/GHC/Unicode.hs - libraries/ghc-internal/ghc-internal.cabal.in - − libraries/ghc-internal/src/GHC/Internal/Data/Version.hs-boot - libraries/ghc-internal/src/GHC/Internal/Unicode.hs - libraries/ghc-internal/src/GHC/Internal/Unicode/Version.hs - libraries/ghc-internal/tools/ucd2haskell/exe/UCD2Haskell/ModuleGenerators.hs Changes: ===================================== libraries/base/src/GHC/Unicode.hs ===================================== @@ -44,3 +44,4 @@ module GHC.Unicode ) where import GHC.Internal.Unicode +import GHC.Internal.Unicode.Version ===================================== libraries/ghc-internal/ghc-internal.cabal.in ===================================== @@ -316,6 +316,7 @@ Library GHC.Internal.TypeNats GHC.Internal.TypeNats.Internal GHC.Internal.Unicode + GHC.Internal.Unicode.Version GHC.Internal.Weak GHC.Internal.Weak.Finalize GHC.Internal.Word @@ -381,7 +382,6 @@ Library GHC.Internal.Unicode.Char.UnicodeData.SimpleLowerCaseMapping GHC.Internal.Unicode.Char.UnicodeData.SimpleTitleCaseMapping GHC.Internal.Unicode.Char.UnicodeData.SimpleUpperCaseMapping - GHC.Internal.Unicode.Version GHC.Internal.System.Environment.ExecutablePath ===================================== libraries/ghc-internal/src/GHC/Internal/Data/Version.hs-boot deleted ===================================== @@ -1,20 +0,0 @@ -{-# LANGUAGE NoImplicitPrelude #-} - -module GHC.Internal.Data.Version - ( Version - , makeVersion - ) where - -import GHC.Internal.Types - - --- The generated module GHC.Internal.Unicode.Version depends on --- GHC.Internal.Base.build via built-in list syntax, and its only --- import is this hs-boot file, so until someone fixes the generator, --- this import has to stay here to ensure sound build ordering. See also --- W1 of Note [Tracking dependencies on primitives] in GHC.Internal.Base. -import GHC.Internal.Base () - -data Version - -makeVersion :: [Int] -> Version ===================================== libraries/ghc-internal/src/GHC/Internal/Unicode.hs ===================================== @@ -20,7 +20,6 @@ ----------------------------------------------------------------------------- module GHC.Internal.Unicode ( - unicodeVersion, GeneralCategory (..), generalCategory, isAscii, isLatin1, isControl, isAsciiUpper, isAsciiLower, @@ -36,7 +35,6 @@ import GHC.Internal.Real import GHC.Internal.Enum ( Enum (..), Bounded (..) ) import GHC.Internal.Ix ( Ix (..) ) import GHC.Internal.Num -import GHC.Internal.Unicode.Version import qualified GHC.Internal.Unicode.Char.DerivedCoreProperties as DCP import qualified GHC.Internal.Unicode.Char.UnicodeData.GeneralCategory as GC import qualified GHC.Internal.Unicode.Char.UnicodeData.SimpleLowerCaseMapping as C ===================================== libraries/ghc-internal/src/GHC/Internal/Unicode/Version.hs ===================================== @@ -15,7 +15,7 @@ module GHC.Internal.Unicode.Version (unicodeVersion) where -import {-# SOURCE #-} GHC.Internal.Data.Version +import GHC.Internal.Data.Version -- | Version of Unicode standard used by @base@: -- [17.0.0](https://www.unicode.org/versions/Unicode17.0.0/). ===================================== libraries/ghc-internal/tools/ucd2haskell/exe/UCD2Haskell/ModuleGenerators.hs ===================================== @@ -144,7 +144,7 @@ genUnicodeVersion outdir = do , "(unicodeVersion)" , "where" , "" - , "import {-# SOURCE #-} GHC.Internal.Data.Version" + , "import GHC.Internal.Data.Version" , "" , "-- | Version of Unicode standard used by @base@:" , "-- [" <> BB.string7 version <> "](https://www.unicode.org/versions/Unicode" <> BB.string7 version <> "/)." View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d29800e0b2386191c8ba9c1fb975f80… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d29800e0b2386191c8ba9c1fb975f80… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Fix determinism of linker arguments
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a8aa1868 by Ilias Tsitsimpis at 2026-03-06T06:26:29-05:00 Fix determinism of linker arguments The switch from Data.Map to UniqMap in 3b5be05ac29 introduced non-determinism in the order of packages passed to the linker. This resulted in non-reproducible builds where the DT_NEEDED entries in dynamic libraries were ordered differently across builds. Fix the regression by explicitly sorting the package list derived from UniqMap. Fixes #26838 - - - - - 1 changed file: - compiler/GHC/Unit/State.hs Changes: ===================================== compiler/GHC/Unit/State.hs ===================================== @@ -112,7 +112,7 @@ import System.FilePath as FilePath import Control.Monad import Data.Graph (stronglyConnComp, SCC(..)) import Data.Char ( toUpper ) -import Data.List ( intersperse, partition, sortBy, sortOn ) +import Data.List ( intersperse, partition, sortBy, sortOn, sort ) import Data.Set (Set) import Data.Monoid (First(..)) import qualified Data.Semigroup as Semigroup @@ -1695,7 +1695,9 @@ mkUnitState logger cfg = do -- NB: preload IS important even for type-checking, because we -- need the correct include path to be set. -- - let preload1 = nonDetKeysUniqMap (filterUniqMap (isJust . uv_explicit) vis_map) + -- NB: Sorting keys here to ensure a deterministic order for the linker. + -- + let preload1 = sort $ nonDetKeysUniqMap (filterUniqMap (isJust . uv_explicit) vis_map) -- add default preload units if they can be found in the db basicLinkedUnits = fmap (RealUnit . Definite) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a8aa18688d2aba09dede9f1f1b82a83… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a8aa18688d2aba09dede9f1f1b82a83… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] determinism: Use a deterministic renaming when writing bytecode files
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 9b64ad3a by Matthew Pickering at 2026-03-06T06:27:16-05:00 determinism: Use a deterministic renaming when writing bytecode files Now when writing the bytecode file, a counter and substitution are used to provide deterministic keys to local variables (rather than relying on uniques). This change ensures that `.gbc` are produced deterministically. Fixes #26499 - - - - - 1 changed file: - compiler/GHC/ByteCode/Serialize.hs Changes: ===================================== compiler/GHC/ByteCode/Serialize.hs ===================================== @@ -48,6 +48,7 @@ import GHC.Utils.Logger import GHC.Linker.Types import System.IO.Unsafe (unsafeInterleaveIO) import GHC.Utils.Outputable +import GHC.Types.Name.Env {- Note [Overview of persistent bytecode] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -382,8 +383,13 @@ putViaBinName :: WriteBinHandle -> Name -> IO () putViaBinName bh nm = case findUserDataWriter Proxy bh of BinaryWriter f -> f bh $ BinName nm +data BytecodeNameEnv = ByteCodeNameEnv { _bytecode_next_id :: !Word64 + , _bytecode_name_subst :: NameEnv Word64 + } + addBinNameWriter :: WriteBinHandle -> IO WriteBinHandle -addBinNameWriter bh' = +addBinNameWriter bh' = do + env_ref <- newIORef (ByteCodeNameEnv 0 emptyNameEnv) evaluate $ flip addWriterToUserData bh' $ BinaryWriter @@ -394,10 +400,17 @@ addBinNameWriter bh' = put_ bh nm | otherwise -> do putByte bh 1 - put_ bh - $ occNameFS (occName nm) - `appendFS` mkFastString - (show $ nameUnique nm) + key <- getBinNameKey env_ref nm + -- Delimit the OccName from the deterministic counter to keep the + -- encoding injective, avoiding collisions like "foo1" vs "foo#1". + put_ bh (occNameFS (occName nm) `appendFS` mkFastString ('#' : show key)) + where + -- Find a deterministic key for local names. This + getBinNameKey ref name = do + atomicModifyIORef ref (\b@(ByteCodeNameEnv next subst) -> + case lookupNameEnv subst name of + Just idx -> (b, idx) + Nothing -> (ByteCodeNameEnv (next + 1) (extendNameEnv subst name next), next)) addBinNameReader :: HscEnv -> ReadBinHandle -> IO ReadBinHandle addBinNameReader HscEnv {..} bh' = do @@ -423,9 +436,6 @@ addBinNameReader HscEnv {..} bh' = do -- Note [Serializing Names in bytecode] -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- NOTE: This approach means that bytecode objects are not deterministic. --- We need to revisit this in order to make the output deterministic. --- -- The bytecode related types contain various Names which we need to -- serialize. Unfortunately, we can't directly use the Binary instance -- of Name: it is only meant to be used for serializing external Names @@ -433,9 +443,8 @@ addBinNameReader HscEnv {..} bh' = do -- -- We also need to maintain the invariant that: any pair of internal -- Names with equal/different uniques must also be deserialized to --- have the same equality. So normally uniques aren't supposed to be --- serialized, but for this invariant to work, we do append uniques to --- OccNames of internal Names, so that they can be uniquely identified --- by OccName alone. When deserializing, we check a global cached --- mapping from OccName to Unique, and create the real Name with the --- right Unique if it's already deserialized at least once. +-- have the same equality. Therefore when we write the names to the interface, we +-- use an incrementing counter to give each local name it's own unique number. A substitution +-- is maintained to give each occurence of the Name the same unique key. When the interface +-- is read, a reverse mapping is used from these unique keys to a Name. +-- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9b64ad3a458bf4e4165f125059e4bc3… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9b64ad3a458bf4e4165f125059e4bc3… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 3 commits: Correct `hIsReadable` and `hIsWritable` for duplex handles
by Marge Bot (＠marge-bot) 06 Mar '26

06 Mar '26

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 598db847 by Wolfgang Jeltsch at 2026-03-06T06:25:25-05:00 Correct `hIsReadable` and `hIsWritable` for duplex handles This contribution implements CLC proposal #371. It changes `hIsReadable` and `hIsWritable` such that they always throw a respective exception when encountering a closed or semi-closed handle, not just in the case of a file handle. - - - - - b90201e5 by Wolfgang Jeltsch at 2026-03-06T06:25:25-05:00 Document `SemiClosedHandle` - - - - - c9df72b5 by Wolfgang Jeltsch at 2026-03-06T06:25:25-05:00 Tell users what “semi-closed” means for duplex handles - - - - - 4 changed files: - libraries/base/changelog.md - libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs - libraries/ghc-internal/src/GHC/Internal/IO/Handle/Types.hs Changes: ===================================== libraries/base/changelog.md ===================================== @@ -26,6 +26,7 @@ * Add a new module `System.IO.OS` with operations for obtaining operating-system handles (file descriptors, Windows handles). ([CLC proposal #369](https://github.com/haskell/core-libraries-committee/issues/369)) * Evaluate backtraces for "error" exceptions at the moment they are thrown. ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383)) * Hide implementation details when throwing exceptions in throw and throwSTM. ([CLC proposal #387](https://github.com/haskell/core-libraries-committee/issues/387)) + * Change `hIsReadable` and `hIsWritable` such that they always throw a respective exception when encountering a closed or semi-closed handle, not just in the case of a file handle. ([CLC proposal #371](github.com/haskell/core-libraries-committee/issues/371)) ## 4.22.0.0 *TBA* * Shipped with GHC 9.14.1 ===================================== libraries/ghc-internal/src/GHC/Internal/IO/Handle.hs ===================================== @@ -502,9 +502,14 @@ hIsClosed handle = -- | @'hIsReadable' hdl@ returns whether it is possible to read from the handle. hIsReadable :: Handle -> IO Bool -hIsReadable (DuplexHandle _ _ _) = return True -hIsReadable handle = - withHandle_ "hIsReadable" handle $ \ handle_ -> do +hIsReadable handle@(FileHandle _ var) + = hIsReadable' handle var +hIsReadable handle@(DuplexHandle _ readingVar _) + = hIsReadable' handle readingVar + +hIsReadable' :: Handle -> MVar Handle__ -> IO Bool +hIsReadable' handle readingVar = + withHandle_' "hIsReadable" handle readingVar $ \ handle_ -> do case haType handle_ of ClosedHandle -> ioe_closedHandle SemiClosedHandle -> ioe_semiclosedHandle @@ -512,9 +517,14 @@ hIsReadable handle = -- | @'hIsWritable' hdl@ returns whether it is possible to write to the handle. hIsWritable :: Handle -> IO Bool -hIsWritable (DuplexHandle _ _ _) = return True -hIsWritable handle = - withHandle_ "hIsWritable" handle $ \ handle_ -> do +hIsWritable handle@(FileHandle _ var) + = hIsWritable' handle var +hIsWritable handle@(DuplexHandle _ _ writingVar) + = hIsWritable' handle writingVar + +hIsWritable' :: Handle -> MVar Handle__ -> IO Bool +hIsWritable' handle writingVar = + withHandle_' "hIsWritable" handle writingVar $ \ handle_ -> do case haType handle_ of ClosedHandle -> ioe_closedHandle SemiClosedHandle -> ioe_semiclosedHandle ===================================== libraries/ghc-internal/src/GHC/Internal/IO/Handle/Text.hs ===================================== @@ -361,19 +361,18 @@ unpack_nl !buf !r !w acc0 -- ----------------------------------------------------------------------------- -- hGetContents --- hGetContents on a DuplexHandle only affects the read side: you can --- carry on writing to it afterwards. - -- | Computation 'hGetContents' @hdl@ returns the list of characters -- corresponding to the unread portion of the channel or file managed -- by @hdl@, which is put into an intermediate state, /semi-closed/. --- In this state, @hdl@ is effectively closed, --- but items are read from @hdl@ on demand and accumulated in a special --- list returned by 'hGetContents' @hdl@. +-- In this state, @hdl@ is treated like a closed handle, with the +-- following exceptions: +-- +-- * Characters can be read from @hdl@ by evaluating portions of the +-- list returned by 'hGetContents' @hdl@. +-- * If the handle allows for independent reading and writing, as it is +-- the case for socket handles, writing continues to be possible. -- --- Any operation that fails because a handle is closed, --- also fails if a handle is semi-closed. The only exception is --- 'GHC.Internal.System.IO.hClose'. A semi-closed handle becomes closed: +-- A semi-closed handle becomes closed: -- -- * if 'GHC.Internal.System.IO.hClose' is applied to it; -- ===================================== libraries/ghc-internal/src/GHC/Internal/IO/Handle/Types.hs ===================================== @@ -157,6 +157,7 @@ data BufferList e data HandleType = ClosedHandle | SemiClosedHandle + -- ^ See the documentation of 'GHC.IO.Handle.Text.hGetContents'. | ReadHandle | WriteHandle | AppendHandle View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7d64031bbb2e37d4f10e535f8e47e6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/7d64031bbb2e37d4f10e535f8e47e6… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/backports-9.12.4] 2 commits: Mark T26410_ffi as fragile on Windows
by Zubin (＠wz1000) 06 Mar '26

06 Mar '26

Zubin pushed to branch wip/backports-9.12.4 at Glasgow Haskell Compiler / GHC Commits: 4d81dd7f by sheaf at 2026-03-06T11:21:09+05:30 Mark T26410_ffi as fragile on Windows As seen in #26595, this test intermittently fails on Windows. This commit marks it as fragile, until we get around to fixing it. (cherry picked from commit 6b42232c34273137b194c41b3c968be4a377a68f) - - - - - 309889a5 by Zubin Duggal at 2026-03-06T11:21:09+05:30 Prepare release 9.12.4 - - - - - 10 changed files: - configure.ac - + docs/users_guide/9.12.4-notes.rst - docs/users_guide/release-notes.rst - libraries/base/base.cabal.in - libraries/base/changelog.md - testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs - testsuite/tests/interface-stability/base-exports.stdout-mingw32 - testsuite/tests/interface-stability/base-exports.stdout-ws-32 - testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 - testsuite/tests/simd/should_run/all.T Changes: ===================================== configure.ac ===================================== @@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12.3], [glasgow-ha AC_CONFIG_MACRO_DIRS([m4]) # Set this to YES for a released version, otherwise NO -: ${RELEASE=YES} +: ${RELEASE=NO} # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line # above. If this is not a released version, then we will append the ===================================== docs/users_guide/9.12.4-notes.rst ===================================== @@ -0,0 +1,166 @@ +.. _release-9-12-4: + +Version 9.12.4 +============== + +The significant changes to the various parts of the compiler are listed in the +following sections. See the `migration guide +<https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.12>`_ on the GHC Wiki +for specific guidance on migrating programs to this release. + +Compiler +~~~~~~~~ + +- Fixed a bug in CSE where the in-scope set was not properly maintained (:ghc-ticket:`25468`) +- Fixed ``matchExpectedFunTys`` to use ``tcMkScaledFunTys`` (:ghc-ticket:`26277`) +- Fixed ``parenBreakableList`` usage in ``ppHsContext`` for better pretty-printing of contexts +- Improved error messages for bad record updates to allow out-of-scope data constructors (:ghc-ticket:`26391`) +- Fixed a missing InVar->OutVar lookup in ``SetLevels`` (:ghc-ticket:`26681`) +- Fixed split sections on Windows (:ghc-ticket:`26696`, :ghc-ticket:`26494`) +- Fixed split sections for the LLVM backend (:ghc-ticket:`26770`) +- Don't re-use stack slots for growing registers (:ghc-ticket:`26668`) +- Fixed cast worker/wrapper incorrectly firing on INLINE functions (:ghc-ticket:`26903`) +- Fixed non-determinism in ``TyLitMap`` by using deterministic maps for strings (:ghc-ticket:`26846`) +- Fixed non-determinism in ``WithHsDocIdentifiers`` binary instance by using a stable sort (:ghc-ticket:`26858`) +- Added ``-mcmodel=medium`` module flag to generated LLVM IR on LoongArch +- Pass the ``mcmodel=medium`` parameter to CC via GHC on LoongArch +- Pass the ``+evex512`` attribute to LLVM 18+ when ``-mavx512f`` is set (:ghc-ticket:`26410`) +- Improved error handling in ``getPackageArchives`` (:ghc-ticket:`26383`) +- Fixed a shadowing bug in implicit parameters (:ghc-ticket:`26451`) +- Fixed a subtle bug in ``GHC.Core.Utils.mkTick`` that could generate type-incorrect code (:ghc-ticket:`26772`) +- Fixed a long-standing interaction between ticks and casts in ``Eliminate Identity Cases`` +- ``NamedDefaults``: require the class to be standard or have an in-scope default declaration (:ghc-ticket:`25775`, :ghc-ticket:`25778`) + +Runtime System +~~~~~~~~~~~~~~ + +- Fixed a deadlock with eventlog flush interval and RTS shutdown (:ghc-ticket:`26573`) +- Fixed eager black holes: record mutated closure and fix assertion (:ghc-ticket:`26495`) +- Fixed object file format detection in ``loadArchive`` (:ghc-ticket:`26630`) +- Use ``INFO_TABLE_CONSTR`` for ``stg_dummy_ret_closure`` (:ghc-ticket:`26745`) +- Fixed lost wakeups in ``threadPaused`` for threads blocked on black holes (:ghc-ticket:`26324`) +- Fixed ``stg_AP_STACK`` to push the correct update frame (:ghc-ticket:`26324`) +- Fixed potential loop in heap reservation logic on certain kernels (:ghc-ticket:`26151`) +- Don't use CAS without ``PARALLEL_GC`` on +- Switch prim to use modern atomic compiler builtins (:ghc-ticket:`26729`) +- Removed obsolete ``CC_SUPPORTS_TLS``, ``HAS_VISIBILITY_HIDDEN``, ``COMPILING_WINDOWS_DLL``, + and ``__GNUC__``-related logic +- Removed the ``-O3`` pragma hack in ``Hash.c`` +- Removed unnecessary Cabal flags + +Code Generation +~~~~~~~~~~~~~~~ + +- NCG for PPC: add pattern for ``CmmRegOff`` to ``iselExpr64`` (:ghc-ticket:`26828`) +- PPC NCG: Use libcall for 64-bit ``cmpxchg`` on 32-bit PowerPC (:ghc-ticket:`23969`) + +Bytecode Compiler +~~~~~~~~~~~~~~~~~ + +- Use 32 bits for breakpoint index (:ghc-ticket:`26325`) + +``base`` library +~~~~~~~~~~~~~~~~ + +- Expose ``Backtraces`` constructor and fields (:ghc-ticket:`26049`) +- Store ``StackTrace`` and ``StackSnapshot`` in ``Backtraces``, deferring decoding until display +- Evaluate backtraces for ``error`` exceptions at the moment they are thrown + (`CLC proposal #383 <https://github.com/haskell/core-libraries-committee/issues/383>`__, + :ghc-ticket:`26751`) + +``ghc-experimental`` library +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Fixed ``GHC.Exception.Backtrace.Experimental`` module +- Added ability to customise the collection of exception annotations + +``ghc-pkg`` +~~~~~~~~~~~~ + +- Removed ``traceId`` from ``ghc-pkg`` executable + +``ghc-toolchain`` +~~~~~~~~~~~~~~~~~ + +- Dropped ``ld.gold`` from merge object command + +Packaging and Build System +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- Added ``hpc`` to release script +- Use a response file to invoke GHC when analysing dependencies +- Fixed ``GHC.Platform.Host`` generation for cross stage1 (:ghc-ticket:`26449`) +- Fixed runtime error during ``users_guide`` build with Sphinx 9.1.0 (:ghc-ticket:`26810`) +- Added ``ghc-{experimental,internal}.cabal`` to the list of dependencies of the doc target (:ghc-ticket:`26738`) +- Updated ``libffi`` to 3.5.2 +- Bumped ``directory`` submodule to 1.3.10.1 +- Bumped ``exceptions`` submodule to 0.10.12 +- Bumped ``file-io`` submodule to 0.1.6 +- Bumped ``filepath`` submodule to 1.5.5.0 +- Bumped ``haskeline`` submodule to 0.8.4.1 +- Bumped ``mtl`` submodule to 2.3.2 +- Bumped ``os-string`` submodule to 2.0.10 +- Bumped ``text`` submodule to 2.1.4 +- Bumped ``transformers`` submodule to 0.6.3.0 +- Bumped ``unix`` submodule to 2.8.8.0 +- Bumped ``Win32`` submodule to 2.14.2.1 + +Wasm Backend +~~~~~~~~~~~~ + +- Fixed dyld handling for forward declared ``GOT.func`` items (:ghc-ticket:`26430`) +- Ensure ``setKeepCAFs()`` is called in GHCi (:ghc-ticket:`26106`) +- Prevent bundlers from resolving ``import("node:timers")`` +- Use ``import.meta.main`` for proper distinction of Node.js main modules (:ghc-ticket:`26916`) + +Included libraries +~~~~~~~~~~~~~~~~~~ + +The package database provided with this distribution also contains a number of +packages other than GHC itself. See the changelogs provided with these packages +for further change information. + +.. ghc-package-list:: + + compiler/ghc.cabal: The compiler itself + libraries/array/array.cabal: Dependency of ``ghc`` library + libraries/base/base.cabal: Core library + libraries/binary/binary.cabal: Dependency of ``ghc`` library + libraries/bytestring/bytestring.cabal: Dependency of ``ghc`` library + libraries/Cabal/Cabal/Cabal.cabal: Dependency of ``ghc-pkg`` utility + libraries/Cabal/Cabal-syntax/Cabal-syntax.cabal: Dependency of ``ghc-pkg`` utility + libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library + libraries/deepseq/deepseq.cabal: Dependency of ``ghc`` library + libraries/directory/directory.cabal: Dependency of ``ghc`` library + libraries/exceptions/exceptions.cabal: Dependency of ``ghc`` and ``haskeline`` library + libraries/file-io/file-io.cabal: Dependency of ``directory`` library + libraries/filepath/filepath.cabal: Dependency of ``ghc`` library + libraries/ghc-boot/ghc-boot.cabal: Internal compiler library + libraries/ghc-boot-th/ghc-boot-th.cabal: Internal compiler library + libraries/ghc-compact/ghc-compact.cabal: Core library + libraries/ghc-experimental/ghc-experimental.cabal: Core library + libraries/ghc-heap/ghc-heap.cabal: GHC heap-walking library + libraries/ghci/ghci.cabal: The REPL interface + libraries/ghc-internal/ghc-internal.cabal: Core library + libraries/ghc-platform/ghc-platform.cabal: Internal library + libraries/ghc-prim/ghc-prim.cabal: Core library + libraries/haskeline/haskeline.cabal: Dependency of ``ghci`` executable + libraries/hpc/hpc.cabal: Dependency of ``hpc`` executable + libraries/integer-gmp/integer-gmp.cabal: Core library + libraries/mtl/mtl.cabal: Dependency of ``Cabal`` library + libraries/os-string/os-string.cabal: Dependency of ``filepath`` library + libraries/parsec/parsec.cabal: Dependency of ``Cabal`` library + libraries/pretty/pretty.cabal: Dependency of ``ghc`` library + libraries/process/process.cabal: Dependency of ``ghc`` library + libraries/semaphore-compat/semaphore-compat.cabal: Dependency of ``ghc`` library + libraries/stm/stm.cabal: Dependency of ``haskeline`` library + libraries/template-haskell/template-haskell.cabal: Core library + libraries/terminfo/terminfo.cabal: Dependency of ``haskeline`` library + libraries/text/text.cabal: Dependency of ``Cabal`` library + libraries/time/time.cabal: Dependency of ``ghc`` library + libraries/transformers/transformers.cabal: Dependency of ``ghc`` library + libraries/unix/unix.cabal: Dependency of ``ghc`` library + libraries/Win32/Win32.cabal: Dependency of ``ghc`` library + libraries/xhtml/xhtml.cabal: Dependency of ``haddock`` executable + utils/haddock/haddock-api/haddock-api.cabal: Dependency of ``haddock`` executable + utils/haddock/haddock-library/haddock-library.cabal: Dependency of ``haddock`` executable ===================================== docs/users_guide/release-notes.rst ===================================== @@ -7,3 +7,4 @@ Release notes 9.12.1-notes 9.12.2-notes 9.12.3-notes + 9.12.4-notes ===================================== libraries/base/base.cabal.in ===================================== @@ -4,7 +4,7 @@ cabal-version: 3.0 -- Make sure you are editing ghc-experimental.cabal.in, not ghc-experimental.cabal name: base -version: 4.21.1.0 +version: 4.21.2.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause ===================================== libraries/base/changelog.md ===================================== @@ -1,7 +1,9 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) -## 4.21.2.0 *TBA* - * Evaluate backtraces for "error" exceptions at the moment they are thrown. ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383)) +## 4.21.2.0 *March 2026* + * Expose `Backtraces` constructor and fields ([CLC proposal #199](https://github.com/haskell/core-libraries-committee/issues/199), [#26049](https://gitlab.haskell.org/ghc/ghc/-/issues/26049)) + * Store `StackTrace` and `StackSnapshot` in `Backtraces`, deferring decoding until display + * Evaluate backtraces for "error" exceptions at the moment they are thrown ([CLC proposal #383](https://github.com/haskell/core-libraries-committee/issues/383), [#26751](https://gitlab.haskell.org/ghc/ghc/-/issues/26751)) ## 4.21.1.0 *Sept 2024* * Fix incorrect results of `integerPowMod` when the base is 0 and the exponent is negative, and `integerRecipMod` when the modulus is zero ([#26017](https://gitlab.haskell.org/ghc/ghc/-/issues/26017)). ===================================== testsuite/tests/interface-stability/base-exports.stdout-javascript-unknown-ghcjs ===================================== @@ -322,7 +322,7 @@ module Control.Exception.Backtrace where type BacktraceMechanism :: * data BacktraceMechanism = CostCentreBacktrace | HasCallStackBacktrace | ExecutionBacktrace | IPEBacktrace type Backtraces :: * - data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe [GHC.Internal.ExecutionStack.Internal.Location], btrIpe :: GHC.Internal.Maybe.Maybe [GHC.Internal.Stack.CloneStack.StackEntry]} + data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe GHC.Internal.ExecutionStack.Internal.StackTrace, btrIpe :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.CloneStack.StackSnapshot} collectBacktraces :: (?callStack::GHC.Internal.Stack.Types.CallStack) => GHC.Types.IO Backtraces displayBacktraces :: Backtraces -> GHC.Internal.Base.String getBacktraceMechanismState :: BacktraceMechanism -> GHC.Types.IO GHC.Types.Bool ===================================== testsuite/tests/interface-stability/base-exports.stdout-mingw32 ===================================== @@ -322,7 +322,7 @@ module Control.Exception.Backtrace where type BacktraceMechanism :: * data BacktraceMechanism = CostCentreBacktrace | HasCallStackBacktrace | ExecutionBacktrace | IPEBacktrace type Backtraces :: * - data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe [GHC.Internal.ExecutionStack.Internal.Location], btrIpe :: GHC.Internal.Maybe.Maybe [GHC.Internal.Stack.CloneStack.StackEntry]} + data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe GHC.Internal.ExecutionStack.Internal.StackTrace, btrIpe :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.CloneStack.StackSnapshot} collectBacktraces :: (?callStack::GHC.Internal.Stack.Types.CallStack) => GHC.Types.IO Backtraces displayBacktraces :: Backtraces -> GHC.Internal.Base.String getBacktraceMechanismState :: BacktraceMechanism -> GHC.Types.IO GHC.Types.Bool ===================================== testsuite/tests/interface-stability/base-exports.stdout-ws-32 ===================================== @@ -322,7 +322,7 @@ module Control.Exception.Backtrace where type BacktraceMechanism :: * data BacktraceMechanism = CostCentreBacktrace | HasCallStackBacktrace | ExecutionBacktrace | IPEBacktrace type Backtraces :: * - data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe [GHC.Internal.ExecutionStack.Internal.Location], btrIpe :: GHC.Internal.Maybe.Maybe [GHC.Internal.Stack.CloneStack.StackEntry]} + data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe GHC.Internal.ExecutionStack.Internal.StackTrace, btrIpe :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.CloneStack.StackSnapshot} collectBacktraces :: (?callStack::GHC.Internal.Stack.Types.CallStack) => GHC.Types.IO Backtraces displayBacktraces :: Backtraces -> GHC.Internal.Base.String getBacktraceMechanismState :: BacktraceMechanism -> GHC.Types.IO GHC.Types.Bool ===================================== testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32 ===================================== @@ -4324,13 +4324,13 @@ module GHC.Exception.Backtrace.Experimental where data Backtraces = Backtraces {btrCostCentre :: GHC.Internal.Maybe.Maybe (GHC.Internal.Ptr.Ptr GHC.Internal.Stack.CCS.CostCentreStack), btrHasCallStack :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.Types.CallStack, btrExecutionStack :: GHC.Internal.Maybe.Maybe GHC.Internal.ExecutionStack.Internal.StackTrace, btrIpe :: GHC.Internal.Maybe.Maybe GHC.Internal.Stack.CloneStack.StackSnapshot} type CollectExceptionAnnotationMechanism :: * data CollectExceptionAnnotationMechanism = ... - collectBacktraces :: (?callStack::GHC.Internal.Stack.Types.CallStack) => GHC.Internal.Types.IO Backtraces - collectExceptionAnnotation :: GHC.Internal.Stack.Types.HasCallStack => GHC.Internal.Types.IO GHC.Internal.Exception.Context.SomeExceptionAnnotation + collectBacktraces :: (?callStack::GHC.Internal.Stack.Types.CallStack) => GHC.Types.IO Backtraces + collectExceptionAnnotation :: GHC.Internal.Stack.Types.HasCallStack => GHC.Types.IO GHC.Internal.Exception.Context.SomeExceptionAnnotation displayBacktraces :: Backtraces -> GHC.Internal.Base.String - getBacktraceMechanismState :: BacktraceMechanism -> GHC.Internal.Types.IO GHC.Internal.Types.Bool - getCollectExceptionAnnotationMechanism :: GHC.Internal.Types.IO CollectExceptionAnnotationMechanism - setBacktraceMechanismState :: BacktraceMechanism -> GHC.Internal.Types.Bool -> GHC.Internal.Types.IO () - setCollectExceptionAnnotation :: forall a. GHC.Internal.Exception.Context.ExceptionAnnotation a => (GHC.Internal.Stack.Types.HasCallStack => GHC.Internal.Types.IO a) -> GHC.Internal.Types.IO () + getBacktraceMechanismState :: BacktraceMechanism -> GHC.Types.IO GHC.Types.Bool + getCollectExceptionAnnotationMechanism :: GHC.Types.IO CollectExceptionAnnotationMechanism + setBacktraceMechanismState :: BacktraceMechanism -> GHC.Types.Bool -> GHC.Types.IO () + setCollectExceptionAnnotation :: forall a. GHC.Internal.Exception.Context.ExceptionAnnotation a => (GHC.Internal.Stack.Types.HasCallStack => GHC.Types.IO a) -> GHC.Types.IO () module GHC.PrimOps where -- Safety: Unsafe @@ -10577,8 +10577,8 @@ instance forall a k (b :: k). GHC.Internal.Data.String.IsString a => GHC.Interna instance forall a. GHC.Internal.Data.String.IsString a => GHC.Internal.Data.String.IsString (GHC.Internal.Data.Functor.Identity.Identity a) -- Defined in ‘GHC.Internal.Data.String’ instance forall a. (a ~ GHC.Types.Char) => GHC.Internal.Data.String.IsString [a] -- Defined in ‘GHC.Internal.Data.String’ instance forall a. GHC.Internal.Enum.Bounded a => GHC.Internal.Enum.Bounded (GHC.Internal.Data.Ord.Down a) -- Defined in ‘GHC.Internal.Data.Ord’ -instance forall a. (GHC.Internal.Enum.Enum a, GHC.Internal.Enum.Bounded a, GHC.Classes.Eq a) => GHC.Internal.Enum.Enum (GHC.Internal.Data.Ord.Down a) -- Defined in 'GHC.Internal.Data.Ord' -instance GHC.Internal.Exception.Context.ExceptionAnnotation GHC.Internal.Exception.Backtrace.Backtraces -- Defined in 'GHC.Internal.Exception.Backtrace' +instance forall a. (GHC.Internal.Enum.Enum a, GHC.Internal.Enum.Bounded a, GHC.Classes.Eq a) => GHC.Internal.Enum.Enum (GHC.Internal.Data.Ord.Down a) -- Defined in ‘GHC.Internal.Data.Ord’ +instance GHC.Internal.Exception.Context.ExceptionAnnotation GHC.Internal.Exception.Backtrace.Backtraces -- Defined in ‘GHC.Internal.Exception.Backtrace’ instance forall a. GHC.Internal.Float.Floating a => GHC.Internal.Float.Floating (GHC.Internal.Data.Ord.Down a) -- Defined in ‘GHC.Internal.Data.Ord’ instance forall a. GHC.Internal.Float.RealFloat a => GHC.Internal.Float.RealFloat (GHC.Internal.Data.Ord.Down a) -- Defined in ‘GHC.Internal.Data.Ord’ instance forall a. GHC.Internal.Foreign.Storable.Storable a => GHC.Internal.Foreign.Storable.Storable (GHC.Internal.Data.Ord.Down a) -- Defined in ‘GHC.Internal.Data.Ord’ ===================================== testsuite/tests/simd/should_run/all.T ===================================== @@ -109,6 +109,7 @@ test('T26410_ffi' , [ only_ways(llvm_ways) # SIMD NCG TODO: support 512-bit wide vectors , unless(arch('x86_64') and have_cpu_feature('avx512f'), skip) , extra_hc_opts('-mavx512f -optc -mavx512f -optlc -mcpu=penryn') + , when(opsys('mingw32'), fragile(26595)) ] , compile_and_run if have_cpu_feature('avx512f') else compile , ['T26410_ffi_c.c']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6d8735c3a12a684601ebc8c8fddfeb… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6d8735c3a12a684601ebc8c8fddfeb… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/sjakobi/T13729
by Simon Jakobi (＠sjakobi2) 06 Mar '26

06 Mar '26

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

1 0