September 2025 - ghc-commits

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 12 commits: Improve pretty printer for HsExpr
by Marge Bot (＠marge-bot) 23 Sep '25

23 Sep '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: e7df6cc0 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Improve pretty printer for HsExpr Given a very deeply-nested application, it just kept printing deeper and deeper. This small change makes it cut off. Test is in #26330, but we also get a dramatic decrease in compile time for perf/compiler/InstanceMatching: InstanceMatching 4,086,884,584 1,181,767,232 -71.1% GOOD Why? Because before we got a GIGANTIC error message that took ages to pretty-print; now we get this much more civilised message (I have removed some whitespace.) Match.hs:1007:1: error: • No instance for ‘Show (F001 a)’ arising from a use of ‘showsPrec’ • In the second argument of ‘showString’, namely ‘(showsPrec 11 b1 (GHC.Internal.Show.showSpace (showsPrec 11 b2 (GHC.Internal.Show.showSpace (showsPrec 11 b3 (GHC.Internal.Show.showSpace (showsPrec 11 b4 (GHC.Internal.Show.showSpace (showsPrec 11 b5 (GHC.Internal.Show.showSpace (showsPrec 11 b6 (GHC.Internal.Show.showSpace (showsPrec ...)))))))))))))’ ----------------------- The main payload is * At the start of `pprExpr` * In the defn of `pprApp` A little bit of refactoring: * It turned out that we were setting the default cut-off depth to a fixed value in two places, so changing one didn't change the other. See defaultSDocDepth and defaultSDocCols * I refactored `pprDeeperList` a bit so I could understand it better. Because the depth calculation has changed, there are lots of small error message wibbles. Metric Decrease: InstanceMatching - - - - - 209f0158 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Use Outputable.ellipsis rather than text "..." - - - - - 64bb0e37 by Sylvain Henry at 2025-09-23T14:35:56-04:00 deriveConstants: automatically pass -fcommon CC flag (#26393) By mistake we tried to use deriveConstants without passing `--gcc-flag -fcommon` (which Hadrian does) and it failed. This patch: 1. adds parsing support for constants stored in the .bss section (i.e. when -fcommon isn't passed) 2. enables passing `-fcommon` automatically to the C compiler because Windows requires this for subtle reasons 3. Documents the subtle reasons (1) isn't strictly necessary because we always do (2) but it does no harm and it is still useful if the CC flags ever contain -fno-common - - - - - afcdf92f by Oleg Grenrus at 2025-09-23T14:36:41-04:00 Don't wrap spaces in <span>s Doing similar comparison as in 63189b2ceca07edf4e179f4180ca60d470c62cb3 With this change the gzipped documentation is now 2% smaller (previously 1%) 12_694_206 Agda-2.9.0-docs-orig.tar.gz 12_436_829 Agda-2.9.0-docs.tar.gz Unzipped docs are 5% smaller (previously 3%) 178M Agda-2.9.0-docs-orig 169M Agda-2.9.0-docs Individual hyperlinked sources are around 7-10% smaller (previously 5%) (`Parser` module is generated by happy and has relatively little whitespace) 14_230_117 Agda.Syntax.Parser.Parser.html 13_220_758 Agda.Syntax.Parser.Parser.html Agda's hyperlinked sources are 9% smaller now: 121M Agda-2.9.0-docs-orig/src 110M Agda-2.9.0-docs/src - - - - - 67de53a6 by Cheng Shao at 2025-09-23T14:37:31-04:00 rts: remove obsolete __GNUC__ related logic This patch removes obsolete `__GNUC__` related logic, given on any currently supported platform and toolchain, `__GNUC__ >= 4` is universally true. Also pulls some other weeds and most notably, use `__builtin___clear_cache` for clang as well, since clang has supported this gcc intrinsic since 2014, see https://github.com/llvm/llvm-project/commit/c491a8d4577052bc6b3b4c72a7db6a7…. - - - - - 39365c97 by Sven Tennie at 2025-09-23T15:10:07-04:00 RV64: Fix: Add missing truncation to MO_S_Shr (#26248) Sub-double word (<W64) registers need to be truncated after the operation. - - - - - 648eb2ec by Sven Tennie at 2025-09-23T15:10:07-04:00 RV64: Cleanup shift emitting cases/code Remove overlapping cases to make the shift logic easier to understand. - - - - - 1a4982bb by Alex Washburn at 2025-09-23T15:10:08-04:00 Correcting LLVM linking of Intel BMI intrinsics pdep{8,16} and pext{8,16}. This patch fixes #26065. The LLVM interface does not expose bindings to: - llvm.x86.bmi.pdep.8 - llvm.x86.bmi.pdep.16 - llvm.x86.bmi.pext.8 - llvm.x86.bmi.pext.16 So calls are instead made to llvm.x86.bmi.{pdep,pext}.32 in these cases, with pre/post-operation truncation to constrain the logical value range. - - - - - 19257e0d by Peng Fan at 2025-09-23T15:10:22-04:00 NCG/LA64: Implement MO_BSwap and MO_BRev with bit-manipulation Instructions - - - - - 05cdcc1e by Sylvain Henry at 2025-09-23T15:10:31-04:00 Allow Core plugins to access unoptimized Core (#23337) Make the first simple optimization pass after desugaring a real CoreToDo pass. This allows CorePlugins to decide whether they want to be executed before or after this pass. - - - - - 03e71c3f by Simon Hengel at 2025-09-23T15:10:32-04:00 docs: Fix typo in scoped_type_variables.rst - - - - - 7668b4a8 by Cheng Shao at 2025-09-23T15:10:32-04:00 ghci: fix bootstrapping with 9.12.3-rc1 and above This patch fixes bootstrapping GHC with 9.12.3-rc1 and above. ghci defines `Binary` instance for `HalfWord` in `ghc-heap`, which is a proper `newtype` in 9.14 and starting from 9.12.3. Given we don't build `ghc-heap` in stage0, we need to fix this predicate so that it corresponds to the boot ghc versions that contain the right version of `ghc-heap`. - - - - - 96 changed files: - compiler/GHC/CmmToAsm/LA64/CodeGen.hs - compiler/GHC/CmmToAsm/LA64/Instr.hs - compiler/GHC/CmmToAsm/LA64/Ppr.hs - compiler/GHC/CmmToAsm/RV64/CodeGen.hs - compiler/GHC/CmmToLlvm/CodeGen.hs - compiler/GHC/Core/Opt/Pipeline.hs - compiler/GHC/Core/Opt/Pipeline/Types.hs - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Errors/Ppr.hs - compiler/GHC/HsToCore/Pmc/Ppr.hs - compiler/GHC/HsToCore/Pmc/Types.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Llvm/Ppr.hs - compiler/GHC/Llvm/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Utils/Ppr.hs - docs/users_guide/exts/scoped_type_variables.rst - hadrian/src/Settings/Builders/DeriveConstants.hs - libraries/ghc-internal/cbits/atomic.c - libraries/ghc-internal/cbits/ctz.c - libraries/ghci/GHCi/Message.hs - rts/RtsStartup.c - rts/RtsSymbols.c - rts/include/Rts.h - rts/include/Stg.h - rts/include/rts/Types.h - rts/sm/BlockAlloc.c - rts/sm/Evac.h - rts/sm/Storage.c - testsuite/tests/arrows/gadt/T17423.stderr - testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr - testsuite/tests/indexed-types/should_fail/T26176.stderr - testsuite/tests/indexed-types/should_fail/T2693.stderr - testsuite/tests/indexed-types/should_fail/T4093b.stderr - testsuite/tests/indexed-types/should_fail/T8518.stderr - testsuite/tests/indexed-types/should_fail/T9662.stderr - testsuite/tests/linear/should_fail/Linear17.stderr - testsuite/tests/linear/should_fail/LinearLet7.stderr - + testsuite/tests/llvm/should_run/T26065.hs - + testsuite/tests/llvm/should_run/T26065.stdout - testsuite/tests/llvm/should_run/all.T - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail11.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr - testsuite/tests/partial-sigs/should_compile/T21719.stderr - testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs - testsuite/tests/plugins/late-plugin/LatePlugin.hs - testsuite/tests/plugins/simple-plugin/Simple/ReplacePlugin.hs - testsuite/tests/polykinds/T13393.stderr - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/simplCore/should_compile/simpl017.stderr - testsuite/tests/th/T10945.stderr - testsuite/tests/th/TH_StaticPointers02.stderr - testsuite/tests/typecheck/should_compile/T11339.stderr - testsuite/tests/typecheck/should_fail/DoExpansion3.stderr - testsuite/tests/typecheck/should_fail/T12177.stderr - testsuite/tests/typecheck/should_fail/T22707.stderr - testsuite/tests/typecheck/should_fail/T24064.stderr - + testsuite/tests/typecheck/should_fail/T26330.hs - + testsuite/tests/typecheck/should_fail/T26330.stderr - testsuite/tests/typecheck/should_fail/T8142.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_fail/tcfail128.stderr - testsuite/tests/typecheck/should_fail/tcfail153.stderr - testsuite/tests/typecheck/should_fail/tcfail168.stderr - testsuite/tests/typecheck/should_fail/tcfail177.stderr - testsuite/tests/typecheck/should_fail/tcfail185.stderr - testsuite/tests/typecheck/should_run/Typeable1.stderr - utils/deriveConstants/Main.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs - utils/haddock/hypsrc-test/ref/src/Bug1091.html - utils/haddock/hypsrc-test/ref/src/CPP.html - utils/haddock/hypsrc-test/ref/src/Classes.html - utils/haddock/hypsrc-test/ref/src/Constructors.html - utils/haddock/hypsrc-test/ref/src/Identifiers.html - utils/haddock/hypsrc-test/ref/src/LinkingIdentifiers.html - utils/haddock/hypsrc-test/ref/src/Literals.html - utils/haddock/hypsrc-test/ref/src/Operators.html - utils/haddock/hypsrc-test/ref/src/Polymorphism.html - utils/haddock/hypsrc-test/ref/src/PositionPragmas.html - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/haddock/hypsrc-test/ref/src/Records.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellSplices.html - utils/haddock/hypsrc-test/ref/src/Types.html - utils/haddock/hypsrc-test/ref/src/UsingQuasiquotes.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/401871c2a024fb42677f5048d60fa1… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/401871c2a024fb42677f5048d60fa1… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] rts: remove obsolete __GNUC__ related logic
by Marge Bot (＠marge-bot) 23 Sep '25

23 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 67de53a6 by Cheng Shao at 2025-09-23T14:37:31-04:00 rts: remove obsolete __GNUC__ related logic This patch removes obsolete `__GNUC__` related logic, given on any currently supported platform and toolchain, `__GNUC__ >= 4` is universally true. Also pulls some other weeds and most notably, use `__builtin___clear_cache` for clang as well, since clang has supported this gcc intrinsic since 2014, see https://github.com/llvm/llvm-project/commit/c491a8d4577052bc6b3b4c72a7db6a7…. - - - - - 10 changed files: - libraries/ghc-internal/cbits/atomic.c - libraries/ghc-internal/cbits/ctz.c - rts/RtsStartup.c - rts/RtsSymbols.c - rts/include/Rts.h - rts/include/Stg.h - rts/include/rts/Types.h - rts/sm/BlockAlloc.c - rts/sm/Evac.h - rts/sm/Storage.c Changes: ===================================== libraries/ghc-internal/cbits/atomic.c ===================================== @@ -163,7 +163,7 @@ hs_atomic_and64(StgWord x, StgWord64 val) #pragma GCC diagnostic push #if defined(__clang__) #pragma GCC diagnostic ignored "-Wsync-fetch-and-nand-semantics-changed" -#elif defined(__GNUC__) +#else #pragma GCC diagnostic ignored "-Wsync-nand" #endif ===================================== libraries/ghc-internal/cbits/ctz.c ===================================== @@ -31,7 +31,7 @@ hs_ctz32(StgWord x) StgWord hs_ctz64(StgWord64 x) { -#if defined(__GNUC__) && (defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH)) +#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) /* On Linux/i386, the 64bit `__builtin_ctzll()` intrinsic doesn't get inlined by GCC but rather a short `__ctzdi2` runtime function is inserted when needed into compiled object files. ===================================== rts/RtsStartup.c ===================================== @@ -125,13 +125,7 @@ void _fpreset(void) x86_init_fpu(); } -#if defined(__GNUC__) void __attribute__((alias("_fpreset"))) fpreset(void); -#else -void fpreset(void) { - _fpreset(); -} -#endif /* Set the console's CodePage to UTF-8 if using the new I/O manager and the CP is still the default one. */ ===================================== rts/RtsSymbols.c ===================================== @@ -963,7 +963,7 @@ extern char **environ; RTS_INTCHAR_SYMBOLS // 64-bit support functions in libgcc.a -#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) +#if SIZEOF_VOID_P <= 4 && !defined(_ABIN32) #define RTS_LIBGCC_SYMBOLS \ SymI_NeedsProto(__divdi3) \ SymI_NeedsProto(__udivdi3) \ @@ -974,7 +974,7 @@ extern char **environ; SymI_NeedsProto(__ashrdi3) \ SymI_NeedsProto(__lshrdi3) \ SymI_NeedsProto(__fixunsdfdi) -#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 +#elif SIZEOF_VOID_P == 8 #define RTS_LIBGCC_SYMBOLS \ SymI_NeedsProto(__udivti3) \ SymI_NeedsProto(__umodti3) ===================================== rts/include/Rts.h ===================================== @@ -54,35 +54,19 @@ extern "C" { #include "rts/Types.h" #include "rts/Time.h" -#if __GNUC__ >= 3 #define ATTRIBUTE_ALIGNED(n) __attribute__((aligned(n))) -#else -#define ATTRIBUTE_ALIGNED(n) /*nothing*/ -#endif // Symbols that are extern, but private to the RTS, are declared // with visibility "hidden" to hide them outside the RTS shared // library. #define RTS_PRIVATE GNUC3_ATTRIBUTE(visibility("hidden")) -#if __GNUC__ >= 4 #define RTS_UNLIKELY(p) __builtin_expect((p),0) -#else -#define RTS_UNLIKELY(p) (p) -#endif -#if __GNUC__ >= 4 #define RTS_LIKELY(p) __builtin_expect(!!(p), 1) -#else -#define RTS_LIKELY(p) (p) -#endif /* __builtin_unreachable is supported since GNU C 4.5 */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) #define RTS_UNREACHABLE __builtin_unreachable() -#else -#define RTS_UNREACHABLE abort() -#endif /* Prefetch primitives */ #define prefetchForRead(ptr) __builtin_prefetch(ptr, 0) @@ -374,17 +358,8 @@ TICK_VAR(2) Useful macros and inline functions -------------------------------------------------------------------------- */ -#if defined(__GNUC__) -#define SUPPORTS_TYPEOF -#endif - -#if defined(SUPPORTS_TYPEOF) #define stg_min(a,b) ({typeof(a) _a = (a), _b = (b); _a <= _b ? _a : _b; }) #define stg_max(a,b) ({typeof(a) _a = (a), _b = (b); _a <= _b ? _b : _a; }) -#else -#define stg_min(a,b) ((a) <= (b) ? (a) : (b)) -#define stg_max(a,b) ((a) <= (b) ? (b) : (a)) -#endif /* -------------------------------------------------------------------------- */ ===================================== rts/include/Stg.h ===================================== @@ -131,20 +131,12 @@ /* * GCC attributes */ -#if defined(__GNUC__) #define GNU_ATTRIBUTE(at) __attribute__((at)) -#else -#define GNU_ATTRIBUTE(at) -#endif -#if __GNUC__ >= 3 #define GNUC3_ATTRIBUTE(at) __attribute__((at)) -#else -#define GNUC3_ATTRIBUTE(at) -#endif /* Used to mark a switch case that falls-through */ -#if (defined(__GNUC__) && __GNUC__ >= 7) +#if __GNUC__ >= 7 // N.B. Don't enable fallthrough annotations when compiling with Clang. // Apparently clang doesn't enable implicitly fallthrough warnings by default // http://llvm.org/viewvc/llvm-project?revision=167655&view=revision @@ -154,7 +146,7 @@ #define FALLTHROUGH ((void)0) #endif /* __GNUC__ >= 7 */ -#if !defined(DEBUG) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +#if !defined(DEBUG) #define GNUC_ATTR_HOT __attribute__((hot)) #else #define GNUC_ATTR_HOT /* nothing */ @@ -168,21 +160,13 @@ See Note [Windows Stack allocations] */ #if defined(__clang__) #define STG_NO_OPTIMIZE __attribute__((optnone)) -#elif defined(__GNUC__) || defined(__GNUG__) -#define STG_NO_OPTIMIZE __attribute__((optimize("O0"))) #else -#define STG_NO_OPTIMIZE /* nothing */ +#define STG_NO_OPTIMIZE __attribute__((optimize("O0"))) #endif // Mark a function as accepting a printf-like format string. -#if !defined(__GNUC__) && defined(mingw32_HOST_OS) -/* On Win64, if we say "printf" then gcc thinks we are going to use - MS format specifiers like %I64d rather than %llu */ -#define STG_PRINTF_ATTR(fmt_arg, rest) GNUC3_ATTRIBUTE(format(gnu_printf, fmt_arg, rest)) -#else /* However, on OS X, "gnu_printf" isn't recognised */ #define STG_PRINTF_ATTR(fmt_arg, rest) GNUC3_ATTRIBUTE(format(printf, fmt_arg, rest)) -#endif #define STG_RESTRICT __restrict__ @@ -204,13 +188,9 @@ # define stg__has_attribute(attr) (0) #endif -#ifdef __GNUC__ -# define STG_GNUC_GUARD_VERSION(major, minor) \ +#define STG_GNUC_GUARD_VERSION(major, minor) \ ((__GNUC__ > (major)) || \ ((__GNUC__ == (major)) && (__GNUC_MINOR__ >= (minor)))) -#else -# define STG_GNUC_GUARD_VERSION(major, minor) (0) -#endif /* * The versions of the `__malloc__` attribute which take arguments are only ===================================== rts/include/rts/Types.h ===================================== @@ -16,16 +16,6 @@ #include <stddef.h> #include <stdbool.h> -// Deprecated, use uint32_t instead. -typedef unsigned int nat __attribute__((deprecated)); /* uint32_t */ - -/* ullong (64|128-bit) type: only include if needed (not ANSI) */ -#if defined(__GNUC__) -#define LL(x) (x##LL) -#else -#define LL(x) (x##L) -#endif - typedef struct StgClosure_ StgClosure; typedef struct StgInfoTable_ StgInfoTable; typedef struct StgTSO_ StgTSO; ===================================== rts/sm/BlockAlloc.c ===================================== @@ -274,19 +274,9 @@ STATIC_INLINE uint32_t log_2(W_ n) { ASSERT(n > 0 && n < (1<<NUM_FREE_LISTS)); -#if defined(__GNUC__) return CLZW(n) ^ (sizeof(StgWord)*8 - 1); // generates good code on x86. __builtin_clz() compiles to bsr+xor, but // we want just bsr, so the xor here cancels out gcc's xor. -#else - W_ i, x; - x = n; - for (i=0; i < NUM_FREE_LISTS; i++) { - x = x >> 1; - if (x == 0) return i; - } - return NUM_FREE_LISTS; -#endif } // log base 2 (ceiling), needs to support up to (2^NUM_FREE_LISTS)-1 @@ -294,18 +284,8 @@ STATIC_INLINE uint32_t log_2_ceil(W_ n) { ASSERT(n > 0 && n < (1<<NUM_FREE_LISTS)); -#if defined(__GNUC__) uint32_t r = log_2(n); return (n & (n-1)) ? r+1 : r; -#else - W_ i, x; - x = 1; - for (i=0; i < MAX_FREE_LIST; i++) { - if (x >= n) return i; - x = x << 1; - } - return MAX_FREE_LIST; -#endif } STATIC_INLINE void ===================================== rts/sm/Evac.h ===================================== @@ -25,7 +25,7 @@ // registers EAX, EDX, and ECX instead of on the stack. Functions that // take a variable number of arguments will continue to be passed all of // their arguments on the stack. -#if __GNUC__ >= 2 && (defined(x86_64_HOST_ARCH) || defined(i386_HOST_ARCH)) +#if defined(x86_64_HOST_ARCH) || defined(i386_HOST_ARCH) #define REGPARM1 __attribute__((regparm(1))) #else #define REGPARM1 ===================================== rts/sm/Storage.c ===================================== @@ -1818,25 +1818,6 @@ StgWord calcTotalCompactW (void) #include <libkern/OSCacheControl.h> #endif -/* __builtin___clear_cache is supported since GNU C 4.3.6. - * We pick 4.4 to simplify condition a bit. - */ -#define GCC_HAS_BUILTIN_CLEAR_CACHE (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) - -#if defined(__clang__) -/* clang defines __clear_cache as a builtin on some platforms. - * For example on armv7-linux-androideabi. The type slightly - * differs from gcc. - */ -extern void __clear_cache(void * begin, void * end); -#elif defined(__GNUC__) && !GCC_HAS_BUILTIN_CLEAR_CACHE -/* __clear_cache is a libgcc function. - * It existed before __builtin___clear_cache was introduced. - * See #8562. - */ -extern void __clear_cache(char * begin, char * end); -#endif /* __GNUC__ */ - /* On ARM and other platforms, we need to flush the cache after writing code into memory, so the processor reliably sees it. */ void flushExec (W_ len, AdjustorExecutable exec_addr) @@ -1849,26 +1830,11 @@ void flushExec (W_ len, AdjustorExecutable exec_addr) /* On iOS we need to use the special 'sys_icache_invalidate' call. */ sys_icache_invalidate(exec_addr, len); #elif defined(wasm32_HOST_ARCH) -#elif defined(__clang__) - unsigned char* begin = (unsigned char*)exec_addr; - unsigned char* end = begin + len; -# if __has_builtin(__builtin___clear_cache) - __builtin___clear_cache((void*)begin, (void*)end); -# else - __clear_cache((void*)begin, (void*)end); -# endif -#elif defined(__GNUC__) - /* For all other platforms, fall back to a libgcc builtin. */ +#else + /* For all other platforms, fall back to __builtin___clear_cache. */ unsigned char* begin = (unsigned char*)exec_addr; unsigned char* end = begin + len; -# if GCC_HAS_BUILTIN_CLEAR_CACHE __builtin___clear_cache((void*)begin, (void*)end); -# else - /* For all other platforms, fall back to a libgcc builtin. */ - __clear_cache((void*)begin, (void*)end); -# endif -#else -#error Missing support to flush the instruction cache #endif } View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/67de53a6ced23caad640d2c74210892… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/67de53a6ced23caad640d2c74210892… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] Don't wrap spaces in <span>s
by Marge Bot (＠marge-bot) 23 Sep '25

23 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: afcdf92f by Oleg Grenrus at 2025-09-23T14:36:41-04:00 Don't wrap spaces in <span>s Doing similar comparison as in 63189b2ceca07edf4e179f4180ca60d470c62cb3 With this change the gzipped documentation is now 2% smaller (previously 1%) 12_694_206 Agda-2.9.0-docs-orig.tar.gz 12_436_829 Agda-2.9.0-docs.tar.gz Unzipped docs are 5% smaller (previously 3%) 178M Agda-2.9.0-docs-orig 169M Agda-2.9.0-docs Individual hyperlinked sources are around 7-10% smaller (previously 5%) (`Parser` module is generated by happy and has relatively little whitespace) 14_230_117 Agda.Syntax.Parser.Parser.html 13_220_758 Agda.Syntax.Parser.Parser.html Agda's hyperlinked sources are 9% smaller now: 121M Agda-2.9.0-docs-orig/src 110M Agda-2.9.0-docs/src - - - - - 17 changed files: - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs - utils/haddock/hypsrc-test/ref/src/Bug1091.html - utils/haddock/hypsrc-test/ref/src/CPP.html - utils/haddock/hypsrc-test/ref/src/Classes.html - utils/haddock/hypsrc-test/ref/src/Constructors.html - utils/haddock/hypsrc-test/ref/src/Identifiers.html - utils/haddock/hypsrc-test/ref/src/LinkingIdentifiers.html - utils/haddock/hypsrc-test/ref/src/Literals.html - utils/haddock/hypsrc-test/ref/src/Operators.html - utils/haddock/hypsrc-test/ref/src/Polymorphism.html - utils/haddock/hypsrc-test/ref/src/PositionPragmas.html - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/haddock/hypsrc-test/ref/src/Records.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellSplices.html - utils/haddock/hypsrc-test/ref/src/Types.html - utils/haddock/hypsrc-test/ref/src/UsingQuasiquotes.html The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/afcdf92fef46cd73d85258732b8001e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/afcdf92fef46cd73d85258732b8001e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] deriveConstants: automatically pass -fcommon CC flag (#26393)
by Marge Bot (＠marge-bot) 23 Sep '25

23 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 64bb0e37 by Sylvain Henry at 2025-09-23T14:35:56-04:00 deriveConstants: automatically pass -fcommon CC flag (#26393) By mistake we tried to use deriveConstants without passing `--gcc-flag -fcommon` (which Hadrian does) and it failed. This patch: 1. adds parsing support for constants stored in the .bss section (i.e. when -fcommon isn't passed) 2. enables passing `-fcommon` automatically to the C compiler because Windows requires this for subtle reasons 3. Documents the subtle reasons (1) isn't strictly necessary because we always do (2) but it does no harm and it is still useful if the CC flags ever contain -fno-common - - - - - 2 changed files: - hadrian/src/Settings/Builders/DeriveConstants.hs - utils/deriveConstants/Main.hs Changes: ===================================== hadrian/src/Settings/Builders/DeriveConstants.hs ===================================== @@ -48,4 +48,4 @@ includeCcArgs = do , arg "-Irts/include" , arg $ "-I" ++ rtsPath </> "include" , notM targetSupportsSMP ? arg "-DNOSMP" - , arg "-fcommon" ] + ] ===================================== utils/deriveConstants/Main.hs ===================================== @@ -1,3 +1,5 @@ +{-# LANGUAGE LambdaCase #-} + {- ------------------------------------------------------------------------ (c) The GHC Team, 1992-2012 @@ -65,7 +67,17 @@ main = do opts <- parseArgs "mingw32" -> Windows _ -> DefaultOS verbose = o_verbose opts - gccFlags = o_gccFlags opts + gccFlags0 = o_gccFlags opts + -- nm applied to COFF files doesn't correctly report + -- the size of global variable symbols (it reports 0) + -- except for Common symbols (probably because the + -- merge algorithm of Common symbols takes symbol size + -- into account). So we force the use of `-fcommon` + -- here. + -- As far as we know, it is only required on Windows + -- but enabling it on other platforms does no harm, so + -- we enable it unconditionally. + gccFlags = "-fcommon" : gccFlags0 rs <- case os of JS -> getWantedJS _ -> getWanted verbose os tmpdir gccProg gccFlags nmProg @@ -751,7 +763,7 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram ++ "Workaround: You may want to pass\n" ++ " --with-nm=$(xcrun --find nm-classic)\n" ++ "to 'configure'.\n" - Just x -> die ("unexpected value round-tripped for CONTROL_GROUP_CONST_291: " ++ show x) + Just x -> die ("unexpected value round-tripped for CONTROL_GROUP_CONST_291: " ++ show x ++ "\n" ++ show m ++ "\n" ++ xs) mapM (lookupResult m) (wanteds (Just os)) where headers = ["#define IN_STG_CODE 0", @@ -841,14 +853,23 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram -- and returns ("MAX_Vanilla_REG", 11) parseNmLine line = case words line of - ('_' : n) : "C" : s : _ -> mkP n s - n : "C" : s : _ -> mkP n s - [n, "D", _, s] -> mkP n s - [s, "O", "*COM*", _, n] -> mkP n s + -- in common section + (n : "C" : s : _ ) -> mkP n s -- nm format (ELF, COFF) + [s, "O", "*COM*", _, n] -> mkP n s -- objdump format (ELF) + -- in .bss section + [n, "B", _, s ] -> mkP n s -- nm format (ELF) + [_, "g", "O", ".bss", s, n] -> mkP n s -- objdump format (ELF) + -- in data section + [n, "D", _, s] -> mkP n s -- nm format (ELF) + [_, "g", "O", ".data", s, n] -> mkP n s -- objdump format (ELF) _ -> Nothing - where mkP r s = case (stripPrefix prefix r, readHex s) of + where mkP r s = case (stripPrefix prefix (strip_ r), readHex s) of (Just name, [(size, "")]) -> Just (name, size) _ -> Nothing + -- strip leading underscore: some platforms (e.g. Darwin) add one + strip_ = \case + ('_':n) -> n + n -> n -- On AIX, `nm` isn't able to tell us the symbol size, so we -- need to use `objdump --syms`. However, unlike on OpenBSD, View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/64bb0e3738beba7f7f82a6885441704… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/64bb0e3738beba7f7f82a6885441704… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][master] 2 commits: Improve pretty printer for HsExpr
by Marge Bot (＠marge-bot) 23 Sep '25

23 Sep '25

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: e7df6cc0 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Improve pretty printer for HsExpr Given a very deeply-nested application, it just kept printing deeper and deeper. This small change makes it cut off. Test is in #26330, but we also get a dramatic decrease in compile time for perf/compiler/InstanceMatching: InstanceMatching 4,086,884,584 1,181,767,232 -71.1% GOOD Why? Because before we got a GIGANTIC error message that took ages to pretty-print; now we get this much more civilised message (I have removed some whitespace.) Match.hs:1007:1: error: • No instance for ‘Show (F001 a)’ arising from a use of ‘showsPrec’ • In the second argument of ‘showString’, namely ‘(showsPrec 11 b1 (GHC.Internal.Show.showSpace (showsPrec 11 b2 (GHC.Internal.Show.showSpace (showsPrec 11 b3 (GHC.Internal.Show.showSpace (showsPrec 11 b4 (GHC.Internal.Show.showSpace (showsPrec 11 b5 (GHC.Internal.Show.showSpace (showsPrec 11 b6 (GHC.Internal.Show.showSpace (showsPrec ...)))))))))))))’ ----------------------- The main payload is * At the start of `pprExpr` * In the defn of `pprApp` A little bit of refactoring: * It turned out that we were setting the default cut-off depth to a fixed value in two places, so changing one didn't change the other. See defaultSDocDepth and defaultSDocCols * I refactored `pprDeeperList` a bit so I could understand it better. Because the depth calculation has changed, there are lots of small error message wibbles. Metric Decrease: InstanceMatching - - - - - 209f0158 by Simon Peyton Jones at 2025-09-23T14:34:39-04:00 Use Outputable.ellipsis rather than text "..." - - - - - 51 changed files: - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/HsToCore/Errors/Ppr.hs - compiler/GHC/HsToCore/Pmc/Ppr.hs - compiler/GHC/HsToCore/Pmc/Types.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Llvm/Ppr.hs - compiler/GHC/Llvm/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Utils/Ppr.hs - testsuite/tests/arrows/gadt/T17423.stderr - testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr - testsuite/tests/indexed-types/should_fail/T26176.stderr - testsuite/tests/indexed-types/should_fail/T2693.stderr - testsuite/tests/indexed-types/should_fail/T4093b.stderr - testsuite/tests/indexed-types/should_fail/T8518.stderr - testsuite/tests/indexed-types/should_fail/T9662.stderr - testsuite/tests/linear/should_fail/Linear17.stderr - testsuite/tests/linear/should_fail/LinearLet7.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail11.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr - testsuite/tests/partial-sigs/should_compile/T21719.stderr - testsuite/tests/polykinds/T13393.stderr - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/simplCore/should_compile/simpl017.stderr - testsuite/tests/th/T10945.stderr - testsuite/tests/th/TH_StaticPointers02.stderr - testsuite/tests/typecheck/should_compile/T11339.stderr - testsuite/tests/typecheck/should_fail/DoExpansion3.stderr - testsuite/tests/typecheck/should_fail/T12177.stderr - testsuite/tests/typecheck/should_fail/T22707.stderr - testsuite/tests/typecheck/should_fail/T24064.stderr - + testsuite/tests/typecheck/should_fail/T26330.hs - + testsuite/tests/typecheck/should_fail/T26330.stderr - testsuite/tests/typecheck/should_fail/T8142.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_fail/tcfail128.stderr - testsuite/tests/typecheck/should_fail/tcfail153.stderr - testsuite/tests/typecheck/should_fail/tcfail168.stderr - testsuite/tests/typecheck/should_fail/tcfail177.stderr - testsuite/tests/typecheck/should_fail/tcfail185.stderr - testsuite/tests/typecheck/should_run/Typeable1.stderr The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/867c26755e8855c6df949e65df0c2a… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/867c26755e8855c6df949e65df0c2a… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/cleanup] cleanup: Delete historical artifact of COMPILING_WINDOWS_DLL
by Rodrigo Mesquita (＠alt-romes) 23 Sep '25

23 Sep '25

Rodrigo Mesquita pushed to branch wip/romes/cleanup at Glasgow Haskell Compiler / GHC Commits: 4d6fa0a8 by Rodrigo Mesquita at 2025-09-23T18:18:33+01:00 cleanup: Delete historical artifact of COMPILING_WINDOWS_DLL Namely, drop the obsolete - DLL_IMPORT_RTS - DLL_IMPORT_DATA_VAR - DLL_IMPORT_DATA_VARNAME - DLL_IMPORT_DATA_REF These macros were not doing anything and placed inconsistently Looking at the git logs reveal these macros were used to support dynamic libraries on Win32, a feature that was dropped in b8cfa8f741729ef123569fb321c4b2ab4a1a941c This allows us to get rid of the rts/DLL.h file too. - - - - - 13 changed files: - rts/CloneStack.h - rts/Prelude.h - rts/RtsSymbols.c - rts/include/Rts.h - rts/include/RtsAPI.h - rts/include/Stg.h - rts/include/rts/Flags.h - rts/include/rts/NonMoving.h - rts/include/rts/StableName.h - rts/include/rts/StablePtr.h - − rts/include/stg/DLL.h - rts/include/stg/MiscClosures.h - rts/rts.cabal Changes: ===================================== rts/CloneStack.h ===================================== @@ -8,8 +8,8 @@ #pragma once -extern StgClosure DLL_IMPORT_DATA_VARNAME(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure); -#define StackSnapshot_constructor_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure) +extern StgClosure ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure; +#define StackSnapshot_constructor_closure (&(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure)) StgStack* cloneStack(Capability* capability, const StgStack* stack); ===================================== rts/Prelude.h ===================================== @@ -15,8 +15,8 @@ #define PRELUDE_INFO(i) extern W_(i)[] #define PRELUDE_CLOSURE(i) extern W_(i)[] #else -#define PRELUDE_INFO(i) extern const StgInfoTable DLL_IMPORT_DATA_VARNAME(i) -#define PRELUDE_CLOSURE(i) extern StgClosure DLL_IMPORT_DATA_VARNAME(i) +#define PRELUDE_INFO(i) extern const StgInfoTable (i) +#define PRELUDE_CLOSURE(i) extern StgClosure (i) #endif /* See Note [Wired-in exceptions are not CAFfy] in GHC.Core.Make. */ @@ -87,58 +87,58 @@ PRELUDE_INFO(ghczminternal_GHCziInternalziWord_W32zh_con_info); PRELUDE_INFO(ghczminternal_GHCziInternalziWord_W64zh_con_info); PRELUDE_INFO(ghczminternal_GHCziInternalziStable_StablePtr_con_info); -#define Unit_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTuple_Z0T_closure) -#define True_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_True_closure) -#define False_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_False_closure) -#define unpackCString_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPack_unpackCString_closure) -#define runFinalizerBatch_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure) +#define Unit_closure (&(ghczminternal_GHCziInternalziTuple_Z0T_closure)) +#define True_closure (&(ghczminternal_GHCziInternalziTypes_True_closure)) +#define False_closure (&(ghczminternal_GHCziInternalziTypes_False_closure)) +#define unpackCString_closure (&(ghczminternal_GHCziInternalziPack_unpackCString_closure)) +#define runFinalizerBatch_closure (&(ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure)) #define mainIO_closure (&ZCMain_main_closure) -#define runSparks_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziSync_runSparks_closure) -#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure) -#define interruptIOManager_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure) -#define ioManagerCapabilitiesChanged_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure) -#define runHandlersPtr_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziSignal_runHandlersPtr_closure) +#define runSparks_closure (&(ghczminternal_GHCziInternalziConcziSync_runSparks_closure)) +#define ensureIOManagerIsRunning_closure (&(ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure)) +#define interruptIOManager_closure (&(ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure)) +#define ioManagerCapabilitiesChanged_closure (&(ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure)) +#define runHandlersPtr_closure (&(ghczminternal_GHCziInternalziConcziSignal_runHandlersPtr_closure)) #if defined(mingw32_HOST_OS) -#define processRemoteCompletion_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure) +#define processRemoteCompletion_closure (&(ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure)) #endif -#define runAllocationLimitHandler_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziAllocationLimitHandler_runAllocationLimitHandler_closure) - -#define flushStdHandles_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure) -#define runMainIO_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runMainIO_closure) - -#define stackOverflow_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_stackOverflow_closure) -#define heapOverflow_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_heapOverflow_closure) -#define allocationLimitExceeded_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure) -#define blockedIndefinitelyOnMVar_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure) -#define blockedIndefinitelyOnSTM_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure) -#define cannotCompactFunction_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure) -#define cannotCompactPinned_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure) -#define cannotCompactMutable_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure) -#define nonTermination_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure) -#define nestedAtomically_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure) -#define absentSumFieldError_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPrimziPanic_absentSumFieldError_closure) -#define underflowException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_underflowException_closure) -#define overflowException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_overflowException_closure) -#define divZeroException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure) - -#define blockedOnBadFD_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure) - -#define Czh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Czh_con_info) -#define Izh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Izh_con_info) -#define Fzh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Fzh_con_info) -#define Dzh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Dzh_con_info) -#define Wzh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Wzh_con_info) -#define W8zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W8zh_con_info) -#define W16zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W16zh_con_info) -#define W32zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W32zh_con_info) -#define W64zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W64zh_con_info) -#define I8zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I8zh_con_info) -#define I16zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I16zh_con_info) -#define I32zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I32zh_con_info) -#define I64zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I64zh_con_info) -#define I64zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I64zh_con_info) -#define Ptr_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPtr_Ptr_con_info) -#define FunPtr_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPtr_FunPtr_con_info) -#define StablePtr_static_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStable_StablePtr_static_info) -#define StablePtr_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStable_StablePtr_con_info) +#define runAllocationLimitHandler_closure (&(ghczminternal_GHCziInternalziAllocationLimitHandler_runAllocationLimitHandler_closure)) + +#define flushStdHandles_closure (&(ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure)) +#define runMainIO_closure (&(ghczminternal_GHCziInternalziTopHandler_runMainIO_closure)) + +#define stackOverflow_closure (&(ghczminternal_GHCziInternalziIOziException_stackOverflow_closure)) +#define heapOverflow_closure (&(ghczminternal_GHCziInternalziIOziException_heapOverflow_closure)) +#define allocationLimitExceeded_closure (&(ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure)) +#define blockedIndefinitelyOnMVar_closure (&(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure)) +#define blockedIndefinitelyOnSTM_closure (&(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure)) +#define cannotCompactFunction_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure)) +#define cannotCompactPinned_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure)) +#define cannotCompactMutable_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure)) +#define nonTermination_closure (&(ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure)) +#define nestedAtomically_closure (&(ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure)) +#define absentSumFieldError_closure (&(ghczminternal_GHCziInternalziPrimziPanic_absentSumFieldError_closure)) +#define underflowException_closure (&(ghczminternal_GHCziInternalziExceptionziType_underflowException_closure)) +#define overflowException_closure (&(ghczminternal_GHCziInternalziExceptionziType_overflowException_closure)) +#define divZeroException_closure (&(ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure)) + +#define blockedOnBadFD_closure (&(ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure)) + +#define Czh_con_info (&(ghczminternal_GHCziInternalziTypes_Czh_con_info)) +#define Izh_con_info (&(ghczminternal_GHCziInternalziTypes_Izh_con_info)) +#define Fzh_con_info (&(ghczminternal_GHCziInternalziTypes_Fzh_con_info)) +#define Dzh_con_info (&(ghczminternal_GHCziInternalziTypes_Dzh_con_info)) +#define Wzh_con_info (&(ghczminternal_GHCziInternalziTypes_Wzh_con_info)) +#define W8zh_con_info (&(ghczminternal_GHCziInternalziWord_W8zh_con_info)) +#define W16zh_con_info (&(ghczminternal_GHCziInternalziWord_W16zh_con_info)) +#define W32zh_con_info (&(ghczminternal_GHCziInternalziWord_W32zh_con_info)) +#define W64zh_con_info (&(ghczminternal_GHCziInternalziWord_W64zh_con_info)) +#define I8zh_con_info (&(ghczminternal_GHCziInternalziInt_I8zh_con_info)) +#define I16zh_con_info (&(ghczminternal_GHCziInternalziInt_I16zh_con_info)) +#define I32zh_con_info (&(ghczminternal_GHCziInternalziInt_I32zh_con_info)) +#define I64zh_con_info (&(ghczminternal_GHCziInternalziInt_I64zh_con_info)) +#define I64zh_con_info (&(ghczminternal_GHCziInternalziInt_I64zh_con_info)) +#define Ptr_con_info (&(ghczminternal_GHCziInternalziPtr_Ptr_con_info)) +#define FunPtr_con_info (&(ghczminternal_GHCziInternalziPtr_FunPtr_con_info)) +#define StablePtr_static_info (&(ghczminternal_GHCziInternalziStable_StablePtr_static_info)) +#define StablePtr_con_info (&(ghczminternal_GHCziInternalziStable_StablePtr_con_info)) ===================================== rts/RtsSymbols.c ===================================== @@ -1054,9 +1054,9 @@ RTS_ARM_OUTLINE_ATOMIC_SYMBOLS #define SymI_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA }, #define SymE_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ - (void*)DLL_IMPORT_DATA_REF(vvv), STRENGTH_NORMAL, SYM_TYPE_CODE }, + (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE }, #define SymE_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ - (void*)DLL_IMPORT_DATA_REF(vvv), STRENGTH_NORMAL, SYM_TYPE_DATA }, + (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA }, #define SymI_NeedsProto(vvv) SymI_HasProto(vvv) #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv) ===================================== rts/include/Rts.h ===================================== @@ -281,9 +281,9 @@ void _warnFail(const char *filename, unsigned int linenum); #include "rts/LibdwPool.h" /* Misc stuff without a home */ -DLL_IMPORT_RTS extern char **prog_argv; /* so we can get at these from Haskell */ -DLL_IMPORT_RTS extern int prog_argc; -DLL_IMPORT_RTS extern char *prog_name; +extern char **prog_argv; /* so we can get at these from Haskell */ +extern int prog_argc; +extern char *prog_name; void reportStackOverflow(StgTSO* tso); void reportHeapOverflow(void); ===================================== rts/include/RtsAPI.h ===================================== @@ -587,8 +587,8 @@ void rts_done (void); extern StgClosure ghczminternal_GHCziInternalziTopHandler_runIO_closure; extern StgClosure ghczminternal_GHCziInternalziTopHandler_runNonIO_closure; -#define runIO_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runIO_closure) -#define runNonIO_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runNonIO_closure) +#define runIO_closure (&(ghczminternal_GHCziInternalziTopHandler_runIO_closure)) +#define runNonIO_closure (&(ghczminternal_GHCziInternalziTopHandler_runNonIO_closure)) /* ------------------------------------------------------------------------ */ ===================================== rts/include/Stg.h ===================================== @@ -352,7 +352,6 @@ external prototype return neither of these types to workaround #11395. Other Stg stuff... -------------------------------------------------------------------------- */ -#include "stg/DLL.h" #include "stg/MachRegsForHost.h" #include "stg/Regs.h" #include "stg/Ticky.h" ===================================== rts/include/rts/Flags.h ===================================== @@ -358,7 +358,7 @@ typedef struct _RTS_FLAGS { } RTS_FLAGS; #if defined(COMPILING_RTS_MAIN) -extern DLLIMPORT RTS_FLAGS RtsFlags; +extern RTS_FLAGS RtsFlags; #elif IN_STG_CODE /* Note [RtsFlags is a pointer in STG code] * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ===================================== rts/include/rts/NonMoving.h ===================================== @@ -19,10 +19,10 @@ struct StgThunk_; struct Capability_; /* This is called by the code generator */ -extern DLL_IMPORT_RTS +extern void updateRemembSetPushClosure_(StgRegTable *reg, struct StgClosure_ *p); -extern DLL_IMPORT_RTS +extern void updateRemembSetPushThunk_(StgRegTable *reg, struct StgThunk_ *p); // Forward declaration for unregisterised backend. @@ -31,7 +31,7 @@ EF_(stg_copyArray_barrier); // Note that RTS code should not condition on this directly by rather // use the IF_NONMOVING_WRITE_BARRIER_ENABLED macro to ensure that // the barrier is eliminated in the non-threaded RTS. -extern StgWord DLL_IMPORT_DATA_VAR(nonmoving_write_barrier_enabled); +extern StgWord nonmoving_write_barrier_enabled; // A similar macro is defined in rts/include/Cmm.h for C-- code. #if defined(THREADED_RTS) ===================================== rts/include/rts/StableName.h ===================================== @@ -29,4 +29,4 @@ typedef struct { // free } snEntry; -extern DLL_IMPORT_RTS snEntry *stable_name_table; +extern snEntry *stable_name_table; ===================================== rts/include/rts/StablePtr.h ===================================== @@ -26,7 +26,7 @@ typedef struct { // otherwise. } spEntry; -extern DLL_IMPORT_RTS spEntry *stable_ptr_table; +extern spEntry *stable_ptr_table; ATTR_ALWAYS_INLINE EXTERN_INLINE StgPtr deRefStablePtr(StgStablePtr sp) ===================================== rts/include/stg/DLL.h deleted ===================================== @@ -1,35 +0,0 @@ -/* ----------------------------------------------------------------------------- - * - * (c) The GHC Team, 1998-2009 - * - * Support for Windows DLLs. - * - * Do not #include this file directly: #include "Rts.h" instead. - * - * To understand the structure of the RTS headers, see the wiki: - * https://gitlab.haskell.org/ghc/ghc/wikis/commentary/source-tree/includes - * - * ---------------------------------------------------------------------------*/ - -#pragma once - -# define DLL_IMPORT_DATA_REF(x) (&(x)) -# define DLL_IMPORT_DATA_VARNAME(x) x -# define DLLIMPORT - -/* The view of the rts/include/ header files differ ever so - slightly depending on whether the RTS is being compiled - or not - so we're forced to distinguish between two. - [oh, you want details :) : Data symbols defined by the RTS - have to be accessed through an extra level of indirection - when compiling generated .hc code compared to when the RTS - sources are being processed. This is only the case when - using Win32 DLLs. ] -*/ -#if defined(COMPILING_RTS) -#define DLL_IMPORT_RTS -#define DLL_IMPORT_DATA_VAR(x) x -#else -#define DLL_IMPORT_RTS DLLIMPORT -#define DLL_IMPORT_DATA_VAR(x) x -#endif ===================================== rts/include/stg/MiscClosures.h ===================================== @@ -25,14 +25,14 @@ # define RTS_THUNK_INFO(i) extern const W_(i)[] # define RTS_INFO(i) extern const W_(i)[] # define RTS_CLOSURE(i) extern W_(i)[] -# define RTS_FUN_DECL(f) extern DLL_IMPORT_RTS StgFunPtr f(void) +# define RTS_FUN_DECL(f) extern StgFunPtr f(void) #else -# define RTS_RET_INFO(i) extern DLL_IMPORT_RTS const StgRetInfoTable i -# define RTS_FUN_INFO(i) extern DLL_IMPORT_RTS const StgFunInfoTable i -# define RTS_THUNK_INFO(i) extern DLL_IMPORT_RTS const StgThunkInfoTable i -# define RTS_INFO(i) extern DLL_IMPORT_RTS const StgInfoTable i -# define RTS_CLOSURE(i) extern DLL_IMPORT_RTS StgClosure i -# define RTS_FUN_DECL(f) extern DLL_IMPORT_RTS StgFunPtr f(void) +# define RTS_RET_INFO(i) extern const StgRetInfoTable i +# define RTS_FUN_INFO(i) extern const StgFunInfoTable i +# define RTS_THUNK_INFO(i) extern const StgThunkInfoTable i +# define RTS_INFO(i) extern const StgInfoTable i +# define RTS_CLOSURE(i) extern StgClosure i +# define RTS_FUN_DECL(f) extern StgFunPtr f(void) #endif #if defined(TABLES_NEXT_TO_CODE) @@ -274,11 +274,11 @@ RTS_CLOSURE(stg_NO_TREC_closure); RTS_ENTRY(stg_NO_FINALIZER); #if IN_STG_CODE -extern DLL_IMPORT_RTS StgWordArray stg_CHARLIKE_closure; -extern DLL_IMPORT_RTS StgWordArray stg_INTLIKE_closure; +extern StgWordArray stg_CHARLIKE_closure; +extern StgWordArray stg_INTLIKE_closure; #else -extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_CHARLIKE_closure[]; -extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_INTLIKE_closure[]; +extern StgIntCharlikeClosure stg_CHARLIKE_closure[]; +extern StgIntCharlikeClosure stg_INTLIKE_closure[]; #endif /* StgStartup */ ===================================== rts/rts.cabal ===================================== @@ -334,7 +334,6 @@ library rts/storage/InfoTables.h rts/storage/MBlock.h rts/storage/TSO.h - stg/DLL.h stg/MachRegs.h stg/MachRegs/arm32.h stg/MachRegs/arm64.h View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4d6fa0a8600ddbc04ffda028760418e… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4d6fa0a8600ddbc04ffda028760418e… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc][wip/romes/cleanup] cleanup: Drop obsolete DLL_IMPORT_DATA_REF
by Rodrigo Mesquita (＠alt-romes) 23 Sep '25

23 Sep '25

Rodrigo Mesquita pushed to branch wip/romes/cleanup at Glasgow Haskell Compiler / GHC Commits: 034a1f98 by Rodrigo Mesquita at 2025-09-23T18:16:37+01:00 cleanup: Drop obsolete DLL_IMPORT_DATA_REF This macro no longer makes sense since COMPILING_WINDOWS_DLL was dropped in b8cfa8f741729ef123569fb321c4b2ab4a1a941c. This allows us to get rid of the rts/DLL.h file too. - - - - - 7 changed files: - rts/CloneStack.h - rts/Prelude.h - rts/RtsSymbols.c - rts/include/RtsAPI.h - rts/include/Stg.h - − rts/include/stg/DLL.h - rts/rts.cabal Changes: ===================================== rts/CloneStack.h ===================================== @@ -9,7 +9,7 @@ #pragma once extern StgClosure ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure; -#define StackSnapshot_constructor_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure) +#define StackSnapshot_constructor_closure (&(ghczminternal_GHCziInternalziStackziCloneStack_StackSnapshot_closure)) StgStack* cloneStack(Capability* capability, const StgStack* stack); ===================================== rts/Prelude.h ===================================== @@ -87,58 +87,58 @@ PRELUDE_INFO(ghczminternal_GHCziInternalziWord_W32zh_con_info); PRELUDE_INFO(ghczminternal_GHCziInternalziWord_W64zh_con_info); PRELUDE_INFO(ghczminternal_GHCziInternalziStable_StablePtr_con_info); -#define Unit_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTuple_Z0T_closure) -#define True_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_True_closure) -#define False_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_False_closure) -#define unpackCString_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPack_unpackCString_closure) -#define runFinalizerBatch_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure) +#define Unit_closure (&(ghczminternal_GHCziInternalziTuple_Z0T_closure)) +#define True_closure (&(ghczminternal_GHCziInternalziTypes_True_closure)) +#define False_closure (&(ghczminternal_GHCziInternalziTypes_False_closure)) +#define unpackCString_closure (&(ghczminternal_GHCziInternalziPack_unpackCString_closure)) +#define runFinalizerBatch_closure (&(ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure)) #define mainIO_closure (&ZCMain_main_closure) -#define runSparks_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziSync_runSparks_closure) -#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure) -#define interruptIOManager_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure) -#define ioManagerCapabilitiesChanged_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure) -#define runHandlersPtr_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziConcziSignal_runHandlersPtr_closure) +#define runSparks_closure (&(ghczminternal_GHCziInternalziConcziSync_runSparks_closure)) +#define ensureIOManagerIsRunning_closure (&(ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure)) +#define interruptIOManager_closure (&(ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure)) +#define ioManagerCapabilitiesChanged_closure (&(ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure)) +#define runHandlersPtr_closure (&(ghczminternal_GHCziInternalziConcziSignal_runHandlersPtr_closure)) #if defined(mingw32_HOST_OS) -#define processRemoteCompletion_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure) +#define processRemoteCompletion_closure (&(ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure)) #endif -#define runAllocationLimitHandler_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziAllocationLimitHandler_runAllocationLimitHandler_closure) - -#define flushStdHandles_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure) -#define runMainIO_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runMainIO_closure) - -#define stackOverflow_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_stackOverflow_closure) -#define heapOverflow_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_heapOverflow_closure) -#define allocationLimitExceeded_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure) -#define blockedIndefinitelyOnMVar_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure) -#define blockedIndefinitelyOnSTM_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure) -#define cannotCompactFunction_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure) -#define cannotCompactPinned_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure) -#define cannotCompactMutable_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure) -#define nonTermination_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure) -#define nestedAtomically_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure) -#define absentSumFieldError_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPrimziPanic_absentSumFieldError_closure) -#define underflowException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_underflowException_closure) -#define overflowException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_overflowException_closure) -#define divZeroException_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure) - -#define blockedOnBadFD_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure) - -#define Czh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Czh_con_info) -#define Izh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Izh_con_info) -#define Fzh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Fzh_con_info) -#define Dzh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Dzh_con_info) -#define Wzh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTypes_Wzh_con_info) -#define W8zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W8zh_con_info) -#define W16zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W16zh_con_info) -#define W32zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W32zh_con_info) -#define W64zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziWord_W64zh_con_info) -#define I8zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I8zh_con_info) -#define I16zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I16zh_con_info) -#define I32zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I32zh_con_info) -#define I64zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I64zh_con_info) -#define I64zh_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziInt_I64zh_con_info) -#define Ptr_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPtr_Ptr_con_info) -#define FunPtr_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziPtr_FunPtr_con_info) -#define StablePtr_static_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStable_StablePtr_static_info) -#define StablePtr_con_info DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziStable_StablePtr_con_info) +#define runAllocationLimitHandler_closure (&(ghczminternal_GHCziInternalziAllocationLimitHandler_runAllocationLimitHandler_closure)) + +#define flushStdHandles_closure (&(ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure)) +#define runMainIO_closure (&(ghczminternal_GHCziInternalziTopHandler_runMainIO_closure)) + +#define stackOverflow_closure (&(ghczminternal_GHCziInternalziIOziException_stackOverflow_closure)) +#define heapOverflow_closure (&(ghczminternal_GHCziInternalziIOziException_heapOverflow_closure)) +#define allocationLimitExceeded_closure (&(ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure)) +#define blockedIndefinitelyOnMVar_closure (&(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure)) +#define blockedIndefinitelyOnSTM_closure (&(ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure)) +#define cannotCompactFunction_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure)) +#define cannotCompactPinned_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure)) +#define cannotCompactMutable_closure (&(ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure)) +#define nonTermination_closure (&(ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure)) +#define nestedAtomically_closure (&(ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure)) +#define absentSumFieldError_closure (&(ghczminternal_GHCziInternalziPrimziPanic_absentSumFieldError_closure)) +#define underflowException_closure (&(ghczminternal_GHCziInternalziExceptionziType_underflowException_closure)) +#define overflowException_closure (&(ghczminternal_GHCziInternalziExceptionziType_overflowException_closure)) +#define divZeroException_closure (&(ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure)) + +#define blockedOnBadFD_closure (&(ghczminternal_GHCziInternalziEventziThread_blockedOnBadFD_closure)) + +#define Czh_con_info (&(ghczminternal_GHCziInternalziTypes_Czh_con_info)) +#define Izh_con_info (&(ghczminternal_GHCziInternalziTypes_Izh_con_info)) +#define Fzh_con_info (&(ghczminternal_GHCziInternalziTypes_Fzh_con_info)) +#define Dzh_con_info (&(ghczminternal_GHCziInternalziTypes_Dzh_con_info)) +#define Wzh_con_info (&(ghczminternal_GHCziInternalziTypes_Wzh_con_info)) +#define W8zh_con_info (&(ghczminternal_GHCziInternalziWord_W8zh_con_info)) +#define W16zh_con_info (&(ghczminternal_GHCziInternalziWord_W16zh_con_info)) +#define W32zh_con_info (&(ghczminternal_GHCziInternalziWord_W32zh_con_info)) +#define W64zh_con_info (&(ghczminternal_GHCziInternalziWord_W64zh_con_info)) +#define I8zh_con_info (&(ghczminternal_GHCziInternalziInt_I8zh_con_info)) +#define I16zh_con_info (&(ghczminternal_GHCziInternalziInt_I16zh_con_info)) +#define I32zh_con_info (&(ghczminternal_GHCziInternalziInt_I32zh_con_info)) +#define I64zh_con_info (&(ghczminternal_GHCziInternalziInt_I64zh_con_info)) +#define I64zh_con_info (&(ghczminternal_GHCziInternalziInt_I64zh_con_info)) +#define Ptr_con_info (&(ghczminternal_GHCziInternalziPtr_Ptr_con_info)) +#define FunPtr_con_info (&(ghczminternal_GHCziInternalziPtr_FunPtr_con_info)) +#define StablePtr_static_info (&(ghczminternal_GHCziInternalziStable_StablePtr_static_info)) +#define StablePtr_con_info (&(ghczminternal_GHCziInternalziStable_StablePtr_con_info)) ===================================== rts/RtsSymbols.c ===================================== @@ -1054,9 +1054,9 @@ RTS_ARM_OUTLINE_ATOMIC_SYMBOLS #define SymI_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA }, #define SymE_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ - (void*)DLL_IMPORT_DATA_REF(vvv), STRENGTH_NORMAL, SYM_TYPE_CODE }, + (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE }, #define SymE_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \ - (void*)DLL_IMPORT_DATA_REF(vvv), STRENGTH_NORMAL, SYM_TYPE_DATA }, + (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA }, #define SymI_NeedsProto(vvv) SymI_HasProto(vvv) #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv) ===================================== rts/include/RtsAPI.h ===================================== @@ -587,8 +587,8 @@ void rts_done (void); extern StgClosure ghczminternal_GHCziInternalziTopHandler_runIO_closure; extern StgClosure ghczminternal_GHCziInternalziTopHandler_runNonIO_closure; -#define runIO_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runIO_closure) -#define runNonIO_closure DLL_IMPORT_DATA_REF(ghczminternal_GHCziInternalziTopHandler_runNonIO_closure) +#define runIO_closure (&(ghczminternal_GHCziInternalziTopHandler_runIO_closure)) +#define runNonIO_closure (&(ghczminternal_GHCziInternalziTopHandler_runNonIO_closure)) /* ------------------------------------------------------------------------ */ ===================================== rts/include/Stg.h ===================================== @@ -352,7 +352,6 @@ external prototype return neither of these types to workaround #11395. Other Stg stuff... -------------------------------------------------------------------------- */ -#include "stg/DLL.h" #include "stg/MachRegsForHost.h" #include "stg/Regs.h" #include "stg/Ticky.h" ===================================== rts/include/stg/DLL.h deleted ===================================== @@ -1,26 +0,0 @@ -/* ----------------------------------------------------------------------------- - * - * (c) The GHC Team, 1998-2009 - * - * Support for Windows DLLs. - * - * Do not #include this file directly: #include "Rts.h" instead. - * - * To understand the structure of the RTS headers, see the wiki: - * https://gitlab.haskell.org/ghc/ghc/wikis/commentary/source-tree/includes - * - * ---------------------------------------------------------------------------*/ - -#pragma once - -# define DLL_IMPORT_DATA_REF(x) (&(x)) - -/* The view of the rts/include/ header files differ ever so - slightly depending on whether the RTS is being compiled - or not - so we're forced to distinguish between two. - [oh, you want details :) : Data symbols defined by the RTS - have to be accessed through an extra level of indirection - when compiling generated .hc code compared to when the RTS - sources are being processed. This is only the case when - using Win32 DLLs. ] -*/ ===================================== rts/rts.cabal ===================================== @@ -334,7 +334,6 @@ library rts/storage/InfoTables.h rts/storage/MBlock.h rts/storage/TSO.h - stg/DLL.h stg/MachRegs.h stg/MachRegs/arm32.h stg/MachRegs/arm64.h View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/034a1f98f7e7053b3c5ac2ec8ef49fa… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/034a1f98f7e7053b3c5ac2ec8ef49fa… You're receiving this email because of your account on gitlab.haskell.org.

1 0

[Git][ghc/ghc] Pushed new branch wip/romes/cleanup
by Rodrigo Mesquita (＠alt-romes) 23 Sep '25

23 Sep '25

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

1 0

[Git][ghc/ghc] Pushed new branch wip/gbc-files
by Matthew Pickering (＠mpickering) 23 Sep '25

23 Sep '25

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

1 0

[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 8 commits: compiler: move Binary instance of Map to GHC.Utils.Binary
by Marge Bot (＠marge-bot) 23 Sep '25

23 Sep '25

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 8b0940db by Cheng Shao at 2025-09-20T06:48:05-04:00 compiler: move Binary instance of Map to GHC.Utils.Binary This patch moves `Binary` instance of `Map` from `haddock-api` to `GHC.Utils.Binary`. This also allows us to remove a redundant instance defined for `NameEntityInfo`, which is a type synonym for `Map`. - - - - - 4a8fed75 by Vladislav Zavialov at 2025-09-20T06:48:47-04:00 Fix keyword in ExplicitNamespaces error message (#26418) Consider this module header and the resulting error: {-# LANGUAGE NoExplicitNamespaces #-} module T26418 (data HeadC) where -- error: [GHC-47007] -- Illegal keyword 'type' Previously, the error message would mention 'type' (as shown above), even though the user wrote 'data'. This has now been fixed. The error location has also been corrected: it is now reported at the keyword position rather than at the position of the associated import/export item. - - - - - 867c2675 by Cheng Shao at 2025-09-20T06:49:28-04:00 wasm: fix dyld handling for forward declared GOT.func items This patch fixes wasm shared linker's handling of forward declared GOT.func items, see linked issue for details. Also adds T26430 test to witness the fix. Fixes #26430. Co-authored-by: Codex <codex(a)openai.com> - - - - - 94152272 by Simon Peyton Jones at 2025-09-23T08:43:53-04:00 Improve pretty printer for HsExpr Given a very deeply-nested application, it just kept printing deeper and deeper. This small change makes it cut off. Test is in #26330, but we also get a dramatic decrease in compile time for perf/compiler/InstanceMatching: InstanceMatching 4,086,884,584 1,181,767,232 -71.1% GOOD Why? Because before we got a GIGANTIC error message that took ages to pretty-print; now we get this much more civilised message (I have removed some whitespace.) Match.hs:1007:1: error: • No instance for ‘Show (F001 a)’ arising from a use of ‘showsPrec’ • In the second argument of ‘showString’, namely ‘(showsPrec 11 b1 (GHC.Internal.Show.showSpace (showsPrec 11 b2 (GHC.Internal.Show.showSpace (showsPrec 11 b3 (GHC.Internal.Show.showSpace (showsPrec 11 b4 (GHC.Internal.Show.showSpace (showsPrec 11 b5 (GHC.Internal.Show.showSpace (showsPrec 11 b6 (GHC.Internal.Show.showSpace (showsPrec ...)))))))))))))’ ----------------------- The main payload is * At the start of `pprExpr` * In the defn of `pprApp` A little bit of refactoring: * It turned out that we were setting the default cut-off depth to a fixed value in two places, so changing one didn't change the other. See defaultSDocDepth and defaultSDocCols * I refactored `pprDeeperList` a bit so I could understand it better. Because the depth calculation has changed, there are lots of small error message wibbles. Metric Decrease: InstanceMatching - - - - - b635f672 by Simon Peyton Jones at 2025-09-23T08:43:54-04:00 Use Outputable.ellipsis rather than text "..." - - - - - 30af8843 by Sylvain Henry at 2025-09-23T08:44:14-04:00 deriveConstants: automatically pass -fcommon CC flag (#26393) By mistake we tried to use deriveConstants without passing `--gcc-flag -fcommon` (which Hadrian does) and it failed. This patch: 1. adds parsing support for constants stored in the .bss section (i.e. when -fcommon isn't passed) 2. enables passing `-fcommon` automatically to the C compiler because Windows requires this for subtle reasons 3. Documents the subtle reasons (1) isn't strictly necessary because we always do (2) but it does no harm and it is still useful if the CC flags ever contain -fno-common - - - - - 05ad1eb6 by Oleg Grenrus at 2025-09-23T08:44:15-04:00 Don't wrap spaces in <span>s Doing similar comparison as in 63189b2ceca07edf4e179f4180ca60d470c62cb3 With this change the gzipped documentation is now 2% smaller (previously 1%) 12_694_206 Agda-2.9.0-docs-orig.tar.gz 12_436_829 Agda-2.9.0-docs.tar.gz Unzipped docs are 5% smaller (previously 3%) 178M Agda-2.9.0-docs-orig 169M Agda-2.9.0-docs Individual hyperlinked sources are around 7-10% smaller (previously 5%) (`Parser` module is generated by happy and has relatively little whitespace) 14_230_117 Agda.Syntax.Parser.Parser.html 13_220_758 Agda.Syntax.Parser.Parser.html Agda's hyperlinked sources are 9% smaller now: 121M Agda-2.9.0-docs-orig/src 110M Agda-2.9.0-docs/src - - - - - 401871c2 by Cheng Shao at 2025-09-23T08:44:16-04:00 rts: remove obsolete __GNUC__ related logic This patch removes obsolete `__GNUC__` related logic, given on any currently supported platform and toolchain, `__GNUC__ >= 4` is universally true. Also pulls some other weeds and most notably, use `__builtin___clear_cache` for clang as well, since clang has supported this gcc intrinsic since 2014, see https://github.com/llvm/llvm-project/commit/c491a8d4577052bc6b3b4c72a7db6a7…. - - - - - 98 changed files: - compiler/GHC/Core/Opt/Simplify/Env.hs - compiler/GHC/Core/Ppr.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/HsToCore/Errors/Ppr.hs - compiler/GHC/HsToCore/Pmc/Ppr.hs - compiler/GHC/HsToCore/Pmc/Types.hs - compiler/GHC/Iface/Ext/Types.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Llvm/Ppr.hs - compiler/GHC/Llvm/Types.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/Errors/Types.hs - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Parser/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Runtime/Loader.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Types/Hint/Ppr.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - compiler/GHC/Utils/Ppr.hs - hadrian/src/Settings/Builders/DeriveConstants.hs - libraries/ghc-internal/cbits/atomic.c - libraries/ghc-internal/cbits/ctz.c - rts/RtsStartup.c - rts/RtsSymbols.c - rts/include/Rts.h - rts/include/Stg.h - rts/include/rts/Types.h - rts/sm/BlockAlloc.c - rts/sm/Evac.h - rts/sm/Storage.c - testsuite/tests/arrows/gadt/T17423.stderr - + testsuite/tests/ghci-wasm/Makefile - + testsuite/tests/ghci-wasm/T26430.hs - + testsuite/tests/ghci-wasm/T26430A.c - + testsuite/tests/ghci-wasm/T26430B.c - + testsuite/tests/ghci-wasm/all.T - testsuite/tests/indexed-types/should_compile/PushedInAsGivens.stderr - testsuite/tests/indexed-types/should_fail/T26176.stderr - testsuite/tests/indexed-types/should_fail/T2693.stderr - testsuite/tests/indexed-types/should_fail/T4093b.stderr - testsuite/tests/indexed-types/should_fail/T8518.stderr - testsuite/tests/indexed-types/should_fail/T9662.stderr - testsuite/tests/linear/should_fail/Linear17.stderr - testsuite/tests/linear/should_fail/LinearLet7.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail10.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail11.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail13.stderr - testsuite/tests/parser/should_fail/RecordDotSyntaxFail8.stderr - testsuite/tests/parser/should_fail/T16270h.stderr - + testsuite/tests/parser/should_fail/T26418.hs - + testsuite/tests/parser/should_fail/T26418.stderr - testsuite/tests/parser/should_fail/all.T - testsuite/tests/partial-sigs/should_compile/T21719.stderr - testsuite/tests/polykinds/T13393.stderr - testsuite/tests/rep-poly/T12709.stderr - testsuite/tests/simplCore/should_compile/simpl017.stderr - testsuite/tests/th/T10945.stderr - testsuite/tests/th/TH_StaticPointers02.stderr - testsuite/tests/typecheck/should_compile/T11339.stderr - testsuite/tests/typecheck/should_fail/DoExpansion3.stderr - testsuite/tests/typecheck/should_fail/T12177.stderr - testsuite/tests/typecheck/should_fail/T22707.stderr - testsuite/tests/typecheck/should_fail/T24064.stderr - + testsuite/tests/typecheck/should_fail/T26330.hs - + testsuite/tests/typecheck/should_fail/T26330.stderr - testsuite/tests/typecheck/should_fail/T8142.stderr - testsuite/tests/typecheck/should_fail/T8603.stderr - testsuite/tests/typecheck/should_fail/all.T - testsuite/tests/typecheck/should_fail/tcfail128.stderr - testsuite/tests/typecheck/should_fail/tcfail153.stderr - testsuite/tests/typecheck/should_fail/tcfail168.stderr - testsuite/tests/typecheck/should_fail/tcfail177.stderr - testsuite/tests/typecheck/should_fail/tcfail185.stderr - testsuite/tests/typecheck/should_run/Typeable1.stderr - utils/deriveConstants/Main.hs - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Renderer.hs - utils/haddock/haddock-api/src/Haddock/InterfaceFile.hs - utils/haddock/hypsrc-test/ref/src/Bug1091.html - utils/haddock/hypsrc-test/ref/src/CPP.html - utils/haddock/hypsrc-test/ref/src/Classes.html - utils/haddock/hypsrc-test/ref/src/Constructors.html - utils/haddock/hypsrc-test/ref/src/Identifiers.html - utils/haddock/hypsrc-test/ref/src/LinkingIdentifiers.html - utils/haddock/hypsrc-test/ref/src/Literals.html - utils/haddock/hypsrc-test/ref/src/Operators.html - utils/haddock/hypsrc-test/ref/src/Polymorphism.html - utils/haddock/hypsrc-test/ref/src/PositionPragmas.html - utils/haddock/hypsrc-test/ref/src/Quasiquoter.html - utils/haddock/hypsrc-test/ref/src/Records.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html - utils/haddock/hypsrc-test/ref/src/TemplateHaskellSplices.html - utils/haddock/hypsrc-test/ref/src/Types.html - utils/haddock/hypsrc-test/ref/src/UsingQuasiquotes.html - utils/jsffi/dyld.mjs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b5acbab629efefc06130f622039f09… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b5acbab629efefc06130f622039f09… You're receiving this email because of your account on gitlab.haskell.org.

1 0