Zubin pushed to branch wip/9.10.3-backports at Glasgow Haskell Compiler / GHC Commits: 90a90dc9 by doyougnu at 2025-07-25T05:28:40+05:30 RTS linker: add support for hidden symbols (#25191) Add linker support for hidden symbols. We basically treat them as weak symbols. Patch upstreamed from haskell.nix Co-authored-by: Sylvain Henry Co-authored-by: Moritz Angermann (cherry picked from commit 9ca155065b39968d784846902ec1e0bcbe60ee40) - - - - - 4c43fe31 by Tamar Christina at 2025-07-25T05:28:40+05:30 rts: Mark API set symbols as HIDDEN and correct symbol type (cherry picked from commit 48e9aa3ebf5acb950a94addc6e47bfebeabead70) - - - - - 79bb3645 by Zubin Duggal at 2025-07-25T05:28:40+05:30 Prepare 9.10.3 prerelease - - - - - 19 changed files: - .gitlab/generate-ci/gen_ci.hs - .gitlab/jobs.yaml - configure.ac - + docs/users_guide/9.10.3-notes.rst - rts/Linker.c - rts/LinkerInternals.h - rts/linker/Elf.c - rts/linker/ElfTypes.h - rts/linker/PEi386.c - testsuite/driver/testlib.py - testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout - testsuite/tests/driver/T20604/T20604.stdout - testsuite/tests/ghci/scripts/ghci064.stdout - testsuite/tests/rts/linker/Makefile - + testsuite/tests/rts/linker/T25191.hs - + testsuite/tests/rts/linker/T25191.stdout - + testsuite/tests/rts/linker/T25191_foo1.c - + testsuite/tests/rts/linker/T25191_foo2.c - testsuite/tests/rts/linker/all.T Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -997,9 +997,9 @@ job_groups = -- Fully static build, in theory usable on any linux distribution. , fullyStaticBrokenTests (standardBuildsWithConfig Amd64 (Linux Alpine312) (splitSectionsBroken static)) -- Dynamically linked build, suitable for building your own static executables on alpine - , disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine312) (splitSectionsBroken vanilla)) + , disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine312) (splitSectionsBroken vanilla))) , disableValidate (standardBuildsWithConfig AArch64 (Linux Alpine318) (splitSectionsBroken vanilla)) - , disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine318) (splitSectionsBroken vanilla)) + , alpine318BrokenTests (disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine318) (splitSectionsBroken vanilla))) , fullyStaticBrokenTests (disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine312) staticNativeInt))) , validateBuilds Amd64 (Linux Debian11) (crossConfig "aarch64-linux-gnu" (Emulator "qemu-aarch64 -L /usr/aarch64-linux-gnu") Nothing) @@ -1024,6 +1024,8 @@ job_groups = -- (see Note [Object unloading]). fullyStaticBrokenTests = modifyJobs (addVariable "BROKEN_TESTS" "ghcilink002 linker_unload_native") + alpine318BrokenTests = modifyJobs (addVariable "BROKEN_TESTS" "scc001") + hackage_doc_job = rename (<> "-hackage") . modifyJobs (addVariable "HADRIAN_ARGS" "--haddock-for-hackage") tsan_jobs = ===================================== .gitlab/jobs.yaml ===================================== @@ -830,7 +830,7 @@ ".gitlab/ci.sh clean", "cat ci_timings" ], - "allow_failure": false, + "allow_failure": true, "artifacts": { "expire_in": "8 weeks", "paths": [ @@ -1006,7 +1006,7 @@ "variables": { "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_18-validate", - "BROKEN_TESTS": "encoding004 T10458", + "BROKEN_TESTS": "scc001 encoding004 T10458", "BUILD_FLAVOUR": "validate", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", @@ -3244,7 +3244,7 @@ ".gitlab/ci.sh clean", "cat ci_timings" ], - "allow_failure": false, + "allow_failure": true, "artifacts": { "expire_in": "1 year", "paths": [ @@ -3358,7 +3358,7 @@ "variables": { "BIGNUM_BACKEND": "gmp", "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_18-release+no_split_sections", - "BROKEN_TESTS": "encoding004 T10458", + "BROKEN_TESTS": "scc001 encoding004 T10458", "BUILD_FLAVOUR": "release+no_split_sections", "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check", "HADRIAN_ARGS": "--hash-unit-ids", ===================================== configure.ac ===================================== @@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.10.2], [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.10.3-notes.rst ===================================== @@ -0,0 +1,165 @@ +.. _release-9-10-3: + +Version 9.10.3 +=============== +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.10`_ on the GHC Wiki +for specific guidance on migrating programs to this release. + + +Compiler +~~~~~~~~ + +- Don't cache solved [W] HasCallStack constraints to avoid re-using old + call-stacks instead of constructing new ones. (:ghc-ticket:`25529`) + +- Fix EmptyCase panic in tcMatches when \case{} is checked against a function + type preceded by invisible forall. (:ghc-ticket:`25960`) + +- Fix panic triggered by combination of \case{} and forall t ->. (:ghc-ticket:`25004`) + +- Fix GHC.SysTools.Ar archive member size writing logic that was emitting wrong + archive member sizes in headers. (:ghc-ticket:`26120`, :ghc-ticket:`22586`) + +- Fix multiple bugs in name resolution of subordinate import lists related to + type namespace specifiers and hiding clauses. (:ghc-ticket:`22581`, :ghc-ticket:`25983`, :ghc-ticket:`25984`, :ghc-ticket:`25991`) + +- Use mkTrAppChecked in ds_ev_typeable to avoid false negatives for type + equality involving function types. (:ghc-ticket:`25998`) + +- Fix bytecode generation for ``tagToEnum# <LITERAL>``. (:ghc-ticket:`25975`) + +- Don't report used duplicate record fields as unused. (:ghc-ticket:`24035`) + +- Propagate long distance info to guarded let binds for better pattern-match + checking warnings. (:ghc-ticket:`25749`) + +- Prevent incorrect unpacking optimizations for GADTs with multiple constructors. (:ghc-ticket:`25672`) + +- Introduce a separate argument limit for forced specs via SPEC argument with + warning when limit is exceeded. (:ghc-ticket:`25197`) + +Build system and packaging +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- 9.10 hadrian can build with Cabal-3.12.1. (:ghc-ticket:`25605`) + +- GHC settings: always unescape escaped spaces to fix handling of spaces in + executable paths. (:ghc-ticket:`25204`) + +Native code generator backend +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- x86 NCG: Fix code generation of bswap64 on i386. (:ghc-ticket:`25601`) + +- AArch64 NCG: Fix sub-word arithmetic right shift by zero-extending sub-word + values. (:ghc-ticket:`26061`) + +- NCG: AArch64 - Add -finter-module-far-jumps flag for modules with far jumps + outside the current module. (:ghc-ticket:`24648`) + +LLVM backend +~~~~~~~~~~~~ + +- LLVM: fix typo in padLiveArgs that was incorrectly computing too many padding + registers causing segfaults. (:ghc-ticket:`25770`, :ghc-ticket:`25773`) + +- llvmGen: Fix linkage of built-in arrays to use Appending linkage instead of + Internal. (:ghc-ticket:`25769`) + +- llvmGen: Fix built-in variable predicate to check for `@llvm` rather than + `$llvm`. + +WebAssembly backend +~~~~~~~~~~~~~~~~~~~ + +- wasm: use primitive opcodes for fabs and sqrt operations. + +Runtime system +~~~~~~~~~~~~~~ + +- rts: Implement WEAK EXTERNAL undef redirection by target symbol name. + +- rts: Handle API set symbol versioning conflicts. + +- rts: fix rts_clearMemory logic when sanity checks are enabled. (:ghc-ticket:`26011`) + +- rts/linker: Improve efficiency of proddable blocks structure by using binary + search instead of linked lists for better performance with split sections. (:ghc-ticket:`26009`) + +- rts/linker/PEi386: Don't repeatedly load DLLs by maintaining a hash-set of + loaded DLL names. (:ghc-ticket:`26009`, :ghc-ticket:`26052`) + +- rts/linker: Don't fail due to RTLD_NOW by attempting eager binding first, + then reverting to lazy binding on failure. (:ghc-ticket:`25943`) + +``base`` library +~~~~~~~~~~~~~~~~ + +- base: Expose Backtraces constructor and fields. (:ghc-ticket:`26049`) + +- base: Note strictness changes made in 4.16.0.0. (:ghc-ticket:`25886`) + +- Fix bugs in ``integerRecipMod`` and ``integerPowMod`` return values. (:ghc-ticket:`26017`) + +``ghc`` library +~~~~~~~~~~~~~~~ + +- perf: Replace uses of genericLength with strictGenericLength to reduce time + spent in 'assembleBCOs' and allocations. (:ghc-ticket:`25706`) + +Build tools +~~~~~~~~~~~ + +- configure: Drop probing of ld.gold since `gold` has been dropped from + binutils-2.44. (:ghc-ticket:`25716`) + +- get-win32-tarballs.py: List tarball files to be downloaded if we cannot find + them. (:ghc-ticket:`25929`) + +- hp2ps Utilities.c: include stdlib.h instead of extern malloc and realloc. + +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:: + + 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/filepath/filepath.cabal: Dependency of ``ghc`` library + compiler/ghc.cabal: The compiler itself + libraries/ghci/ghci.cabal: The REPL interface + 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-heap/ghc-heap.cabal: GHC heap-walking 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/parsec/parsec.cabal: Dependency of ``Cabal`` library + libraries/pretty/pretty.cabal: Dependency of ``ghc`` library + libraries/process/process.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 \ No newline at end of file ===================================== rts/Linker.c ===================================== @@ -232,11 +232,11 @@ static void ghciRemoveSymbolTable(StrHashTable *table, const SymbolName* key, static const char * symbolTypeString (SymType type) { - switch (type & ~SYM_TYPE_DUP_DISCARD) { + switch (type & ~(SYM_TYPE_DUP_DISCARD | SYM_TYPE_HIDDEN)) { case SYM_TYPE_CODE: return "code"; case SYM_TYPE_DATA: return "data"; case SYM_TYPE_INDIRECT_DATA: return "indirect-data"; - default: barf("symbolTypeString: unknown symbol type"); + default: barf("symbolTypeString: unknown symbol type (%d)", type); } } @@ -283,10 +283,19 @@ int ghciInsertSymbolTable( } else if (pinfo->type ^ type) { + if(pinfo->type & SYM_TYPE_HIDDEN) + { + /* The existing symbol is hidden, let's replace it */ + pinfo->value = data; + pinfo->owner = owner; + pinfo->strength = strength; + pinfo->type = type; + return 1; + } /* We were asked to discard the symbol on duplicates, do so quietly. */ - if (!(type & SYM_TYPE_DUP_DISCARD)) + if (!(type & (SYM_TYPE_DUP_DISCARD | SYM_TYPE_HIDDEN))) { - debugBelch("Symbol type mismatch.\n"); + debugBelch("Symbol type mismatch (existing %d, new %d).\n", pinfo->type, type); debugBelch("Symbol %s was defined by %" PATH_FMT " to be a %s symbol.\n", key, obj_name, symbolTypeString(type)); debugBelch(" yet was defined by %" PATH_FMT " to be a %s symbol.\n", ===================================== rts/LinkerInternals.h ===================================== @@ -65,6 +65,8 @@ typedef enum _SymType { SYM_TYPE_DUP_DISCARD = 1 << 3, /* the symbol is a symbol in a BFD import library however if a duplicate is found with a mismatching SymType then discard this one. */ + SYM_TYPE_HIDDEN = 1 << 4, /* the symbol is hidden and should not be exported */ + } SymType; ===================================== rts/linker/Elf.c ===================================== @@ -1073,6 +1073,9 @@ ocGetNames_ELF ( ObjectCode* oc ) } else { sym_type = SYM_TYPE_DATA; } + if(ELF_ST_VISIBILITY(symbol->elf_sym->st_other) == STV_HIDDEN) { + sym_type |= SYM_TYPE_HIDDEN; + } /* And the decision is ... */ ===================================== rts/linker/ElfTypes.h ===================================== @@ -33,6 +33,9 @@ #define Elf_Sym Elf64_Sym #define Elf_Rel Elf64_Rel #define Elf_Rela Elf64_Rela +#if !defined(ELF_ST_VISIBILITY) +#define ELF_ST_VISIBILITY ELF64_ST_VISIBILITY +#endif #if !defined(ELF_ST_TYPE) #define ELF_ST_TYPE ELF64_ST_TYPE #endif @@ -57,6 +60,9 @@ #define Elf_Sym Elf32_Sym #define Elf_Rel Elf32_Rel #define Elf_Rela Elf32_Rela +#if !defined(ELF_ST_VISIBILITY) +#define ELF_ST_VISIBILITY ELF32_ST_VISIBILITY +#endif /* ELF_ST_VISIBILITY */ #if !defined(ELF_ST_TYPE) #define ELF_ST_TYPE ELF32_ST_TYPE #endif /* ELF_ST_TYPE */ ===================================== rts/linker/PEi386.c ===================================== @@ -1181,8 +1181,10 @@ bool checkAndLoadImportLibrary( pathchar* arch_name, char* member_name, FILE* f // Because the symbol has been loaded before we actually need it, if a // stronger reference wants to add a duplicate we should discard this // one to preserve link order. - if (!ghciInsertSymbolTable(dll, symhash, symbol, sym, false, - SYM_TYPE_CODE | SYM_TYPE_DUP_DISCARD, NULL)) + 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)) return false; return true; @@ -2080,6 +2082,9 @@ ocGetNames_PEi386 ( ObjectCode* oc ) sname[size-start]='\0'; stgFree(tmp); sname = strdup (sname); + if(secNumber == IMAGE_SYM_UNDEFINED) + type |= SYM_TYPE_HIDDEN; + if (!ghciInsertSymbolTable(oc->fileName, symhash, sname, addr, false, type, oc)) return false; @@ -2094,6 +2099,8 @@ ocGetNames_PEi386 ( ObjectCode* oc ) && (!section || (section && section->kind != SECTIONKIND_IMPORT))) { /* debugBelch("addSymbol %p `%s' Weak:%lld \n", addr, sname, isWeak); */ sname = strdup (sname); + if(secNumber == IMAGE_SYM_UNDEFINED) + type |= SYM_TYPE_HIDDEN; IF_DEBUG(linker_verbose, debugBelch("addSymbol %p `%s'\n", addr, sname)); ASSERT(i < (uint32_t)oc->n_symbols); oc->symbols[i].name = sname; @@ -2125,7 +2132,7 @@ static size_t makeSymbolExtra_PEi386( ObjectCode* oc, uint64_t index STG_UNUSED, size_t s, char* symbol STG_UNUSED, SymType type ) { SymbolExtra *extra; - switch(type & ~SYM_TYPE_DUP_DISCARD) { + switch(type & ~(SYM_TYPE_DUP_DISCARD | SYM_TYPE_HIDDEN)) { case SYM_TYPE_CODE: { // jmp *-14(%rip) extra = m32_alloc(oc->rx_m32, sizeof(SymbolExtra), 8); ===================================== testsuite/driver/testlib.py ===================================== @@ -1493,7 +1493,7 @@ async def do_test(name: TestName, dst_makefile = in_testdir('Makefile') if src_makefile.exists(): makefile = src_makefile.read_text(encoding='UTF-8') - makefile = re.sub('TOP=.*', 'TOP=%s' % config.top, makefile, 1) + makefile = re.sub('TOP=.*', 'TOP=%s' % config.top, makefile, count=1) dst_makefile.write_text(makefile, encoding='UTF-8') if opts.pre_cmd: @@ -2708,7 +2708,7 @@ def normalise_errmsg(s: str) -> str: # filter out unsupported GNU_PROPERTY_TYPE (5), which is emitted by LLVM10 # and not understood by older binutils (ar, ranlib, ...) - s = modify_lines(s, lambda l: re.sub(r'^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE \(5\) type: 0xc000000(.*)$', '', l)) + s = modify_lines(s, lambda l: re.sub(r'^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE (?: \(5\) )? type: 0xc000000(.*)$', '', l)) s = re.sub(r'ld: warning: passed .* min versions \(.*\) for platform macOS. Using [\.0-9]+.','',s) s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s) ===================================== testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout ===================================== @@ -13,13 +13,13 @@ Building library 'q' instantiated with for bkpcabal08-0.1.0.0... [2 of 4] Compiling B[sig] ( q/B.hsig, nothing ) [3 of 4] Compiling M ( q/M.hs, nothing ) [A changed] -[4 of 4] Instantiating bkpcabal08-0.1.0.0-5O1mUtZZLBeDZEqqtwJcCj-p +[4 of 4] Instantiating bkpcabal08-0.1.0.0-Asivy2QkF0WEbGENiw5nyj-p Preprocessing library 'q' for bkpcabal08-0.1.0.0... Building library 'q' instantiated with - A = bkpcabal08-0.1.0.0-DlVb5PcmUolGCHYbfTL7EP-impl:A - B = bkpcabal08-0.1.0.0-DlVb5PcmUolGCHYbfTL7EP-impl:B + A = bkpcabal08-0.1.0.0-BznDTmYyvWf7fdEdPEncB4-impl:A + B = bkpcabal08-0.1.0.0-BznDTmYyvWf7fdEdPEncB4-impl:B for bkpcabal08-0.1.0.0... -[1 of 3] Compiling A[sig] ( q/A.hsig, dist/build/bkpcabal08-0.1.0.0-LFiTKyjPqyn9yyuysCoVKg-q+5IA1jA4bEzCFcXtraqAC38/A.o ) [Prelude package changed] -[2 of 3] Compiling B[sig] ( q/B.hsig, dist/build/bkpcabal08-0.1.0.0-LFiTKyjPqyn9yyuysCoVKg-q+5IA1jA4bEzCFcXtraqAC38/B.o ) [Prelude package changed] +[1 of 3] Compiling A[sig] ( q/A.hsig, dist/build/bkpcabal08-0.1.0.0-BOgmYfE3t0l9LsOUH0dl5H-q+sLNLgjkt61DMZK9wGbx81/A.o ) [Prelude package changed] +[2 of 3] Compiling B[sig] ( q/B.hsig, dist/build/bkpcabal08-0.1.0.0-BOgmYfE3t0l9LsOUH0dl5H-q+sLNLgjkt61DMZK9wGbx81/B.o ) [Prelude package changed] Preprocessing library 'r' for bkpcabal08-0.1.0.0... Building library 'r' for bkpcabal08-0.1.0.0... ===================================== testsuite/tests/driver/T20604/T20604.stdout ===================================== @@ -1,11 +1,10 @@ A1 A -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSghc-prim-0.10.0-inplace-ghc9.9.20230815.so" 1403aed32fb9af243c4cc949007c846c -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSghc-bignum-1.3-inplace-ghc9.9.20230815.so" 54293f8faab737bac998f6e1a1248db8 -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSghc-internal-0.1.0.0-inplace-ghc9.9.20230815.so" a5c0e962d84d9044d44df4698becddcc -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSbase-4.19.0.0-inplace-ghc9.9.20230815.so" 4a90ed136fe0f89e5d0360daded517bd -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSghc-boot-th-9.9-inplace-ghc9.9.20230815.so" e338655f71b1d37fdfdd2504b7de6e76 -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSarray-0.5.6.0-inplace-ghc9.9.20230815.so" 6943478e8adaa043abf7a2b38dd435a2 -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSdeepseq-1.5.0.0-inplace-ghc9.9.20230815.so" 9974eb196694990ac6bb3c2591405de0 -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHSpretty-1.1.3.6-inplace-ghc9.9.20230815.so" 1eefc21514f5584086f62b70aa554b7d -addDependentFile "/home/ben/ghc/ghc-compare-2/_build/stage1/lib/../lib/x86_64-linux-ghc-9.9.20230815/libHStemplate-haskell-2.21.0.0-inplace-ghc9.9.20230815.so" f85c86eb94dcce1eacd739b6e991ba2d +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSghc-prim-0.12.0-inplace-ghc9.10.2.20250724.so" 0b7cbf5659e1fd221ea306e2da08c7d3 +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSghc-bignum-1.3-inplace-ghc9.10.2.20250724.so" 1c29a409bcfbc31a3cfc2ded7c1d5530 +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSghc-internal-9.1002.0-inplace-ghc9.10.2.20250724.so" 9606aee1cbbee934848aa85568563754 +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSbase-4.20.1.0-inplace-ghc9.10.2.20250724.so" 5d1ab384becff6d4b20bae121d55fbc8 +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSghc-boot-th-9.10.2.20250724-inplace-ghc9.10.2.20250724.so" 930b5206ff48d75ba522e582262695a8 +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSdeepseq-1.5.2.0-inplace-ghc9.10.2.20250724.so" db23e7880c9a9fee0d494b48294c3487 +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHSpretty-1.1.3.6-inplace-ghc9.10.2.20250724.so" ad484cfb103f02509b1be6abcf2a402f +addDependentFile "/home/zubin/ghcs/unicode-lex/_build_/stage1/lib/../lib/x86_64-linux-ghc-9.10.2.20250724/libHStemplate-haskell-2.22.0.0-inplace-ghc9.10.2.20250724.so" 50b2cb166e6e5293c24be374ffac2ade ===================================== testsuite/tests/ghci/scripts/ghci064.stdout ===================================== @@ -27,12 +27,12 @@ instance [safe] Eq w => Eq (Maybe w) -- Defined in ‘GHC.Internal.Maybe’ instance GHC.Internal.Generics.Generic [w] -- Defined in ‘GHC.Internal.Generics’ -instance Monoid [w] -- Defined in ‘GHC.Internal.Base’ -instance Semigroup [w] -- Defined in ‘GHC.Internal.Base’ instance Read w => Read [w] -- Defined in ‘GHC.Internal.Read’ instance Eq w => Eq [w] -- Defined in ‘GHC.Classes’ instance Ord w => Ord [w] -- Defined in ‘GHC.Classes’ instance Show w => Show [w] -- Defined in ‘GHC.Internal.Show’ +instance Monoid [w] -- Defined in ‘GHC.Internal.Base’ +instance Semigroup [w] -- Defined in ‘GHC.Internal.Base’ instance [safe] MyShow w => MyShow [w] -- Defined at ghci064.hs:8:10 instance GHC.Internal.Generics.Generic [T] ===================================== testsuite/tests/rts/linker/Makefile ===================================== @@ -145,3 +145,10 @@ reloc-none: "$(TEST_HC)" load-object.c -o load-object -no-hs-main -debug "$(TEST_HC)" -c reloc-none.c -o reloc-none.o ./load-object reloc-none.o + +.PHONY: T25191 +T25191: + "$(TEST_HC)" -c T25191_foo1.c -o foo1.o -v0 + "$(TEST_HC)" -c T25191_foo2.c -o foo2.o -v0 + "$(TEST_HC)" T25191.hs -v0 + ./T25191 ===================================== testsuite/tests/rts/linker/T25191.hs ===================================== @@ -0,0 +1,29 @@ +{-# LANGUAGE ForeignFunctionInterface, CPP #-} +import Foreign.C.String +import Control.Monad +import System.FilePath +import Foreign.Ptr + +-- 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 = do + initLinker + r1 <- withPathString "foo1.o" loadObj + when (r1 /= 1) $ error "loadObj failed" + r2 <- withPathString "foo2.o" loadObj + when (r2 /= 1) $ error "loadObj failed" + r <- resolveObjs + when (r /= 1) $ error "resolveObj failed" + putStrLn "success" + +foreign import ccall "initLinker" initLinker :: IO () +foreign import ccall "addDLL" addDLL :: PathString -> IO CString +foreign import ccall "loadObj" loadObj :: PathString -> IO Int +foreign import ccall "resolveObjs" resolveObjs :: IO Int ===================================== testsuite/tests/rts/linker/T25191.stdout ===================================== @@ -0,0 +1 @@ +success ===================================== testsuite/tests/rts/linker/T25191_foo1.c ===================================== @@ -0,0 +1,10 @@ +#include + +void __attribute__ ((__visibility__ ("hidden"))) foo(void) { + printf("HIDDEN FOO\n"); +} + +void bar(void) { + printf("BAR\n"); + foo(); +} ===================================== testsuite/tests/rts/linker/T25191_foo2.c ===================================== @@ -0,0 +1,8 @@ +#include + +extern void bar(void); + +void foo(void) { + printf("VISIBLE FOO\n"); + bar(); +} ===================================== testsuite/tests/rts/linker/all.T ===================================== @@ -168,3 +168,11 @@ test('reloc-none', unless(opsys('linux'), skip), req_rts_linker], makefile_test, ['reloc-none']) + +test('T25191', + [req_rts_linker, + extra_files(['T25191_foo1.c','T25191_foo2.c']), + when(opsys('darwin'), expect_broken(25191)), # not supported in the MachO linker yet + when(opsys('mingw32'), expect_broken(25191)) # not supported in the PE linker yet + ], + makefile_test, ['T25191']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bbc65fcec14cb6f8d249ae150090acd... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/bbc65fcec14cb6f8d249ae150090acd... You're receiving this email because of your account on gitlab.haskell.org.