- ghc-commits - Haskell.org

[Git][ghc/ghc][wip/spj-reinstallable-base2] fix js
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC Commits: faa211b9 by Cheng Shao at 2026-07-15T15:13:03+00:00 fix js - - - - - 2 changed files: - testsuite/tests/cabal/T27013a/all.T - testsuite/tests/javascript/Makefile Changes: ===================================== testsuite/tests/cabal/T27013a/all.T ===================================== @@ -1,4 +1,5 @@ test('T27013a', - [extra_files(['src/', 'composition.cabal', 'Setup.hs'])], + [extra_files(['src/', 'composition.cabal', 'Setup.hs']), + js_broken(22349)], makefile_test, []) ===================================== testsuite/tests/javascript/Makefile ===================================== @@ -30,4 +30,4 @@ T24744: grep -c "h\$$r1 = \"test_val_80_local_once" T24744.dump-js # check that the optimization occurred grep -c "h\$$r1 = h\$$decodeUtf8z" T24744.dump-js - grep -c "h\$$stc(h\$$mainZCMainzitestzuvalzu80zulocal,h\$$mainZCMainzitestzuvalzu80zulocal_e,\[h\$$ghczminternalZCGHCziInternalziCStringziunpackCStringzh,h\$$mainZCMainzimain7_1,h\$$mainZCMainzimain7_2\])" T24744.jsexe/out.js + grep -c "h\$$stc(h\$$mainZCMainzitestzuvalzu80zulocal,h\$$mainZCMainzitestzuvalzu80zulocal_e,\[h\$$ghczminternalZCGHCziInternalziTypesziunpackCStringzh,h\$$mainZCMainzimain7_1,h\$$mainZCMainzimain7_2\])" T24744.jsexe/out.js View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/faa211b986d576a2b18f50d0c3a0ed0… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/faa211b986d576a2b18f50d0c3a0ed0… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/jeltsch/textual-bytecode-output] Switch to only removing suffixes that start with `r`
by Wolfgang Jeltsch (＠jeltsch) 15 Jul '26

15 Jul '26

Wolfgang Jeltsch pushed to branch wip/jeltsch/textual-bytecode-output at Glasgow Haskell Compiler / GHC Commits: b51667d1 by Wolfgang Jeltsch at 2026-07-15T17:12:23+03:00 Switch to only removing suffixes that start with `r` - - - - - 4 changed files: - testsuite/tests/show-bytecode/Makefile - testsuite/tests/show-bytecode/show-bytecode-breakpoints.stdout - testsuite/tests/show-bytecode/show-bytecode-hpc.stdout - testsuite/tests/show-bytecode/show-bytecode-vanilla.stdout Changes: ===================================== testsuite/tests/show-bytecode/Makefile ===================================== @@ -4,7 +4,7 @@ include $(TOP)/mk/test.mk compile = '$(TEST_HC)' $(TEST_HC_OPTS) -fbyte-code -fwrite-byte-code -no-link show = '$(TEST_HC)' $(TEST_HC_OPTS) --show-byte-code -normalize = sed -E -e 's/_[[:alnum:]]+//g' +normalize = sed -E -e 's/_r[[:alnum:]]+//g' show-bytecode-vanilla: $(compile) Example.hs ===================================== testsuite/tests/show-bytecode/show-bytecode-breakpoints.stdout ===================================== @@ -10,55 +10,55 @@ objects: cost center of breakpoint 0 utilized items: break array of module ‘Example’ - item named ‘static’ + item named ‘static_ptr1’ item named ‘$dTypeable2’ item named ‘$fIsStaticStaticPtr’ - static-construction object ‘static’: + static-construction object ‘static_ptr1’: data constructor name: StaticPtr lifted: yes literals: word 2391484856205448807 word 14295153105712797526 utilized items: - item named ‘static’ + item named ‘static_ptr1_sat’ item named ‘primes’ - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: StaticPtrInfo lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - item named ‘static’ - ordinary object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + ordinary object ‘static_ptr1_sat’: arity: 0 literals: top-level string "main" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: top-level string "Example" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: (,) lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + static-construction object ‘static_ptr1_sat’: data constructor name: I# lifted: yes literals: word 27 utilized items: <none> - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: I# lifted: yes literals: word 20 @@ -72,7 +72,7 @@ objects: info table of ‘:’ utilized items: break array of module ‘Example’ - ordinary object ‘primes’: + ordinary object ‘primes_sat’: arity: 0 literals: top-level string "Example" @@ -80,11 +80,11 @@ objects: cost center of breakpoint 1 utilized items: break array of module ‘Example’ - ordinary object ‘primes’: + ordinary object ‘primes_sat’: arity: 0 literals: <none> utilized items: - ordinary object ‘primes’: + ordinary object ‘primes_sat’: arity: 0 literals: word 3 @@ -96,7 +96,7 @@ objects: item named ‘enumFrom’ item named ‘isPrime’ item named ‘filter’ - ordinary object ‘primes’: + ordinary object ‘primes_sat’: arity: 0 literals: word 2 @@ -112,7 +112,7 @@ objects: cost center of breakpoint 9 utilized items: break array of module ‘Example’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: top-level string "Example" @@ -120,7 +120,7 @@ objects: cost center of breakpoint 8 utilized items: break array of module ‘Example’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: top-level string "Example" @@ -128,7 +128,7 @@ objects: cost center of breakpoint 7 utilized items: break array of module ‘Example’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: top-level string "Example" @@ -136,7 +136,7 @@ objects: cost center of breakpoint 6 utilized items: break array of module ‘Example’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 0 literals: top-level string "Example" @@ -157,7 +157,7 @@ objects: arity: 3 literals: <none> utilized items: <none> - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: top-level string "Example" @@ -178,7 +178,7 @@ objects: item named ‘.’ item named ‘primes’ item named ‘takeWhile’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: top-level string "Example" @@ -203,55 +203,55 @@ objects: cost center of breakpoint 10 utilized items: break array of module ‘Example’ - item named ‘static’ + item named ‘static_ptr’ item named ‘$dTypeable2’ item named ‘$fIsStaticStaticPtr’ - static-construction object ‘static’: + static-construction object ‘static_ptr’: data constructor name: StaticPtr lifted: yes literals: word 17112019464237448244 word 14704510317759369968 utilized items: - item named ‘static’ + item named ‘static_ptr_sat’ item named ‘fibonaccis’ - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: StaticPtrInfo lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - item named ‘static’ - ordinary object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + ordinary object ‘static_ptr_sat’: arity: 0 literals: top-level string "main" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: top-level string "Example" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: (,) lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + static-construction object ‘static_ptr_sat’: data constructor name: I# lifted: yes literals: word 15 utilized items: <none> - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: I# lifted: yes literals: word 24 @@ -265,7 +265,7 @@ objects: info table of ‘:’ utilized items: break array of module ‘Example’ - ordinary object ‘fibonaccis’: + ordinary object ‘fibonaccis_sat’: arity: 0 literals: word 0 @@ -283,7 +283,7 @@ objects: info table of ‘:’ utilized items: break array of module ‘Example’ - ordinary object ‘positiveFibonaccis’: + ordinary object ‘positiveFibonaccis_sat’: arity: 0 literals: top-level string "Example" @@ -291,7 +291,7 @@ objects: cost center of breakpoint 12 utilized items: break array of module ‘Example’ - ordinary object ‘positiveFibonaccis’: + ordinary object ‘positiveFibonaccis_sat’: arity: 0 literals: <none> utilized items: @@ -300,7 +300,7 @@ objects: item named ‘positiveFibonaccis’ item named ‘fibonaccis’ item named ‘zipWith’ - ordinary object ‘positiveFibonaccis’: + ordinary object ‘positiveFibonaccis_sat’: arity: 0 literals: word 1 @@ -590,13 +590,13 @@ objects: cost center of breakpoint 15 utilized items: break array of module ‘Example’ - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 1 literals: word 0 info table of ‘IS’ utilized items: item named ‘fromInteger’ - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 3 literals: top-level string "Example" @@ -822,7 +822,7 @@ breakpoints: %'Many eta1 :: a corresponding source breakpoint: 1 static-pointer table entries: - ed7a1b0a13717c34cc10ea39e61d12f0: static - 213042ce5bda1667c6629602bbd55756: static + ed7a1b0a13717c34cc10ea39e61d12f0: static_ptr + 213042ce5bda1667c6629602bbd55756: static_ptr1 HPC information: <none> ===================================== testsuite/tests/show-bytecode/show-bytecode-hpc.stdout ===================================== @@ -5,78 +5,78 @@ objects: ordinary object ‘primesPtr’: arity: 0 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ utilized items: - item named ‘static’ + item named ‘static_ptr1’ item named ‘$dTypeable2’ item named ‘$fIsStaticStaticPtr’ - static-construction object ‘static’: + static-construction object ‘static_ptr1’: data constructor name: StaticPtr lifted: yes literals: word 2391484856205448807 word 14295153105712797526 utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + static-construction object ‘static_ptr1_sat’: data constructor name: StaticPtrInfo lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - item named ‘static’ - ordinary object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + ordinary object ‘static_ptr1_sat’: arity: 0 literals: top-level string "main" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: top-level string "Example" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: (,) lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + static-construction object ‘static_ptr1_sat’: data constructor name: I# lifted: yes literals: word 27 utilized items: <none> - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: I# lifted: yes literals: word 20 utilized items: <none> - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘primes’ ordinary object ‘primes2’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘primes2’: + ordinary object ‘primes2_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘primes2’: + ordinary object ‘primes2_sat’: arity: 0 literals: - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ word 3 info table of ‘IS’ utilized items: @@ -84,40 +84,40 @@ objects: item named ‘fromInteger’ item named ‘$fEnumNatural’ item named ‘enumFrom’ - ordinary object ‘primes2’: + ordinary object ‘primes2_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘isPrime’ item named ‘filter’ ordinary object ‘isPrime’: arity: 1 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘primes’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: ordinary object ‘v’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘$fIntegralInteger’ item named ‘$fNumNatural’ @@ -125,7 +125,7 @@ objects: ordinary object ‘v1’: arity: 0 literals: - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ word 2 info table of ‘IS’ utilized items: <none> @@ -133,19 +133,19 @@ objects: arity: 3 literals: <none> utilized items: <none> - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: ordinary object ‘v’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘$fOrdNatural’ item named ‘<=’ ordinary object ‘v1’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: <none> ordinary object ‘pap’: arity: 3 @@ -153,13 +153,13 @@ objects: utilized items: <none> item named ‘.’ item named ‘takeWhile’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: ordinary object ‘v’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: ordinary object ‘pap’: arity: 2 @@ -169,7 +169,7 @@ objects: item named ‘divides’ ordinary object ‘v1’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: <none> ordinary object ‘pap’: arity: 3 @@ -181,8 +181,8 @@ objects: ordinary object ‘primes’: arity: 0 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ info table of ‘:’ utilized items: item named ‘primes2’ @@ -190,7 +190,7 @@ objects: ordinary object ‘primes1’: arity: 0 literals: - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ word 2 info table of ‘IS’ utilized items: @@ -199,90 +199,90 @@ objects: ordinary object ‘fibonaccisPtr’: arity: 0 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ utilized items: - item named ‘static’ + item named ‘static_ptr’ item named ‘$dTypeable2’ item named ‘$fIsStaticStaticPtr’ - static-construction object ‘static’: + static-construction object ‘static_ptr’: data constructor name: StaticPtr lifted: yes literals: word 17112019464237448244 word 14704510317759369968 utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + static-construction object ‘static_ptr_sat’: data constructor name: StaticPtrInfo lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - item named ‘static’ - ordinary object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + ordinary object ‘static_ptr_sat’: arity: 0 literals: top-level string "main" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: top-level string "Example" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: (,) lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + static-construction object ‘static_ptr_sat’: data constructor name: I# lifted: yes literals: word 15 utilized items: <none> - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: I# lifted: yes literals: word 24 utilized items: <none> - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘fibonaccis’ ordinary object ‘positiveFibonaccis1’: arity: 0 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ info table of ‘:’ utilized items: item named ‘positiveFibonaccis2’ item named ‘positiveFibonaccis’ ordinary object ‘positiveFibonaccis2’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘positiveFibonaccis2’: + ordinary object ‘positiveFibonaccis2_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘positiveFibonaccis1’ - ordinary object ‘positiveFibonaccis2’: + ordinary object ‘positiveFibonaccis2_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘fibonaccis’ - ordinary object ‘positiveFibonaccis2’: + ordinary object ‘positiveFibonaccis2_sat’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘$fNumNatural’ item named ‘+’ @@ -290,20 +290,20 @@ objects: ordinary object ‘fibonaccis’: arity: 0 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ info table of ‘:’ utilized items: item named ‘fibonaccis2’ item named ‘fibonaccis1’ ordinary object ‘fibonaccis2’: arity: 0 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: item named ‘positiveFibonaccis1’ ordinary object ‘positiveFibonaccis’: arity: 0 literals: - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ word 1 info table of ‘IS’ utilized items: @@ -312,7 +312,7 @@ objects: ordinary object ‘fibonaccis1’: arity: 0 literals: - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ word 0 info table of ‘IS’ utilized items: @@ -579,39 +579,39 @@ objects: ordinary object ‘$dReal’: arity: 0 literals: - label ‘’ - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ + label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 1 literals: - label ‘’ + label ‘_hpc_tickboxes_Example_hpc’ word 0 info table of ‘IS’ utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 0 literals: <none> utilized items: item named ‘fromInteger’ item named ‘$p1Real’ - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 3 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: <none> - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 1 - literals: label ‘’ + literals: label ‘_hpc_tickboxes_Example_hpc’ utilized items: <none> item named ‘mod’ - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 0 literals: <none> utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 0 literals: <none> utilized items: item named ‘==’ @@ -658,11 +658,11 @@ top-level strings: $trModule1: "main" breakpoints: <none> static-pointer table entries: - ed7a1b0a13717c34cc10ea39e61d12f0: static - 213042ce5bda1667c6629602bbd55756: static + ed7a1b0a13717c34cc10ea39e61d12f0: static_ptr + 213042ce5bda1667c6629602bbd55756: static_ptr1 HPC information: hash: 000000006110204f module name: Example - tick box name: + tick box name: _hpc_tickboxes_Example_hpc number of ticks: 45 ===================================== testsuite/tests/show-bytecode/show-bytecode-vanilla.stdout ===================================== @@ -6,55 +6,55 @@ objects: arity: 0 literals: <none> utilized items: - item named ‘static’ + item named ‘static_ptr1’ item named ‘$dTypeable2’ item named ‘$fIsStaticStaticPtr’ - static-construction object ‘static’: + static-construction object ‘static_ptr1’: data constructor name: StaticPtr lifted: yes literals: word 2391484856205448807 word 14295153105712797526 utilized items: - item named ‘static’ + item named ‘static_ptr1_sat’ item named ‘primes’ - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: StaticPtrInfo lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - item named ‘static’ - ordinary object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + ordinary object ‘static_ptr1_sat’: arity: 0 literals: top-level string "main" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: top-level string "Example" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr1_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: (,) lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr1_sat’ + item named ‘static_ptr1_sat’ + static-construction object ‘static_ptr1_sat’: data constructor name: I# lifted: yes literals: word 27 utilized items: <none> - static-construction object ‘static’: + static-construction object ‘static_ptr1_sat’: data constructor name: I# lifted: yes literals: word 20 @@ -63,22 +63,22 @@ objects: arity: 0 literals: <none> utilized items: - item named ‘primes2’ + item named ‘primes2_sat’ item named ‘isPrime’ item named ‘filter’ ordinary object ‘isPrime’: arity: 1 literals: <none> utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: <none> utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: <none> utilized items: - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 1 literals: word 2 @@ -91,7 +91,7 @@ objects: item named ‘$fIntegralInteger’ item named ‘$fNumNatural’ item named ‘^’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 3 literals: <none> utilized items: <none> @@ -101,14 +101,14 @@ objects: utilized items: item named ‘$fOrdNatural’ item named ‘<=’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 3 literals: <none> utilized items: <none> item named ‘.’ item named ‘primes’ item named ‘takeWhile’ - ordinary object ‘isPrime’: + ordinary object ‘isPrime_sat’: arity: 2 literals: <none> utilized items: @@ -124,11 +124,11 @@ objects: utilized items: item named ‘primes1’ item named ‘primes2’ - ordinary object ‘primes2’: + ordinary object ‘primes2_sat’: arity: 0 literals: <none> utilized items: - ordinary object ‘primes2’: + ordinary object ‘primes2_sat’: arity: 0 literals: word 3 @@ -142,10 +142,10 @@ objects: arity: 0 literals: <none> utilized items: - item named ‘primes1’ + item named ‘primes1_sat’ item named ‘$fNumNatural’ item named ‘fromInteger’ - static-construction object ‘primes1’: + static-construction object ‘primes1_sat’: data constructor name: IS lifted: yes literals: word 2 @@ -154,55 +154,55 @@ objects: arity: 0 literals: <none> utilized items: - item named ‘static’ + item named ‘static_ptr’ item named ‘$dTypeable2’ item named ‘$fIsStaticStaticPtr’ - static-construction object ‘static’: + static-construction object ‘static_ptr’: data constructor name: StaticPtr lifted: yes literals: word 17112019464237448244 word 14704510317759369968 utilized items: - item named ‘static’ + item named ‘static_ptr_sat’ item named ‘fibonaccis’ - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: StaticPtrInfo lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - item named ‘static’ - ordinary object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + ordinary object ‘static_ptr_sat’: arity: 0 literals: top-level string "main" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: top-level string "Example" utilized items: - ordinary object ‘static’: + ordinary object ‘static_ptr_sat’: arity: 0 literals: <none> utilized items: item named ‘unpackCString#’ - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: (,) lifted: yes literals: <none> utilized items: - item named ‘static’ - item named ‘static’ - static-construction object ‘static’: + item named ‘static_ptr_sat’ + item named ‘static_ptr_sat’ + static-construction object ‘static_ptr_sat’: data constructor name: I# lifted: yes literals: word 15 utilized items: <none> - static-construction object ‘static’: + static-construction object ‘static_ptr_sat’: data constructor name: I# lifted: yes literals: word 24 @@ -213,7 +213,7 @@ objects: utilized items: item named ‘positiveFibonaccis1’ item named ‘fibonaccis’ - item named ‘positiveFibonaccis2’ + item named ‘positiveFibonaccis2_sat’ item named ‘zipWith’ static-construction object ‘positiveFibonaccis1’: data constructor name: : @@ -229,7 +229,7 @@ objects: utilized items: item named ‘fibonaccis1’ item named ‘positiveFibonaccis1’ - ordinary object ‘positiveFibonaccis2’: + ordinary object ‘positiveFibonaccis2_sat’: arity: 0 literals: <none> utilized items: @@ -239,10 +239,10 @@ objects: arity: 0 literals: <none> utilized items: - item named ‘positiveFibonaccis’ + item named ‘positiveFibonaccis_sat’ item named ‘$fNumNatural’ item named ‘fromInteger’ - static-construction object ‘positiveFibonaccis’: + static-construction object ‘positiveFibonaccis_sat’: data constructor name: IS lifted: yes literals: word 1 @@ -251,10 +251,10 @@ objects: arity: 0 literals: <none> utilized items: - item named ‘fibonaccis1’ + item named ‘fibonaccis1_sat’ item named ‘$fNumNatural’ item named ‘fromInteger’ - static-construction object ‘fibonaccis1’: + static-construction object ‘fibonaccis1_sat’: data constructor name: IS lifted: yes literals: word 0 @@ -521,26 +521,26 @@ objects: arity: 0 literals: <none> utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 1 literals: word 0 info table of ‘IS’ utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 0 literals: <none> utilized items: item named ‘fromInteger’ item named ‘$p1Real’ - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 3 literals: <none> utilized items: item named ‘mod’ - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 0 literals: <none> utilized items: - ordinary object ‘divides’: + ordinary object ‘divides_sat’: arity: 0 literals: <none> utilized items: item named ‘==’ @@ -587,7 +587,7 @@ top-level strings: $trModule1: "main" breakpoints: <none> static-pointer table entries: - ed7a1b0a13717c34cc10ea39e61d12f0: static - 213042ce5bda1667c6629602bbd55756: static + ed7a1b0a13717c34cc10ea39e61d12f0: static_ptr + 213042ce5bda1667c6629602bbd55756: static_ptr1 HPC information: <none> View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b51667d150c1f226f2420e1f3da20e6… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b51667d150c1f226f2420e1f3da20e6… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/fix-nightly-messup
by Magnus (＠MangoIV) 15 Jul '26

15 Jul '26

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

1 0

[Git][ghc/ghc][wip/fix-cross-test-cc] 25 commits: ttg: Using ShortText over FastString in the AST
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

Cheng Shao pushed to branch wip/fix-cross-test-cc at Glasgow Haskell Compiler / GHC Commits: 4ebfc478 by Rodrigo Mesquita at 2026-07-08T04:47:53-04:00 ttg: Using ShortText over FastString in the AST To make the AST independent of GHC, this commit replaces usages of `FastString` with `HText` in the AST, killing the last edge from Language.Haskell.* to GHC.* modules. Even though we /do/ want to use FastStrings in general -- critically in Names or Ids -- there is no particular reason for the FastStrings that occur in the AST proper to be FastStrings. Strings in the AST are typically unique and don't benefit particularly from being interned FastStrings with Uniques for fast comparison. `HText` is a type synonym for `ShortText` which uses GHC's Modified UTF-8 encoding exclusively. Modified UTF-8 must be used to represent the Haskell AST because the Haskell Report allows surrogate code points. `Data.Text.Text` functions use Standard UTF-8 which replace surrogates with a placeholder value, thus `Data.Text.Text` is unsuitable for AST strings. See the `Language.Haskell.Syntax.Text` module header for more details. Final progress towards #21592 Closes #21628 - - - - - d910b353 by Simon Peyton Jones at 2026-07-08T04:48:36-04:00 Update equality-type documenation in GHC.Builtin.Types.Prim Fix #27466 - - - - - b2530542 by Simon Peyton Jones at 2026-07-08T04:48:36-04:00 Honour -dsuppress-coercions in GHC.Core.TyCo.pprCo Fixes #27467 - - - - - 9a73179a by Facundo Domínguez at 2026-07-08T04:49:26-04:00 Add item to MR checklist asking to squash fixup commits after approval The checklist has an item that reads All commits are either individually buildable or squashed. This item could be checked immediately after sending the merge request though. If reviewers ask for amends later on, and the author amends the merge request, there was no item that would remind the contributors to squash the fixup commits before landing. This commit adds a new item After all approvals and before landing: all fixup commits are squashed with their originating commits. which should be harder to mark as done before approvals have been given. - - - - - ed09895d by Andreas Klebinger at 2026-07-08T16:53:27-04:00 Fix a profiling race condition resulting in segfaults. StgToCmm: Don't assume tagged FUN closures in closureCodeBody. When entering a closure the self/node pointer might not be tagged in some situations when a thunk is evaluated by multiple threads. So we most AND away the tag bits rather than subtracting an expected tag. Apply.cmm: Fix a race condition occuring when a thunk is mutated during GC. In stg_ap_0_fast when might need to run GC before entering a thunk. If this happens another thread or the GC itself might mutate the closure making entering it no longer valid. We now check for this. Add test and changelog for #27123 fixes. - - - - - 67c03eb2 by Cheng Shao at 2026-07-08T16:54:09-04:00 ghc-heap: fix invalid srtlen returned by peekItbl when no-TNTC This patch fixes the no-TNTC code path of `peekItbl` so that it looks at the right memory address when reading the `srt` field from the `StgInfoTable_` struct. Also adds a `T27465` regression test that reproduces the bug on no-TNTC builds before the fix. Fixes #27465. Co-authored-by: Codex <codex(a)openai.com> - - - - - 2ecabb4f by Zubin Duggal at 2026-07-09T09:23:25-04:00 hadrian: binary-dist-dir should not be the default target Revert behaviour to pre 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2 In 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2, we applied the following behaviour change: ``` hadrian: Build stage 2 cross compilers ... * hadrian: Make binary-dist-dir the default build target. This allows us to have the logic in one place about which libraries/stages to build with cross compilers. Fixes #24192 ``` This is a major regression to development experience, a plain hadrian/build --freeze1 now takes ages because we rebuild all docs (which need to go in the binary dist dir). `binary-dist-dir` is the wrong default target for regular GHC development work Fixes #27445 - - - - - e16388e3 by Zubin Duggal at 2026-07-09T09:23:25-04:00 .gitignore: Add the hadrian system.config introduced by commit 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2 Since commit 23c9b6c392f52ec9d7a8618b204ff6b885f5fba2 Author: Matthew Pickering <matthewtpickering(a)gmail.com> Date: Thu Dec 21 16:17:41 2023 +0000 hadrian: Build stage 2 cross compilers ./configure produces /hadrian/cfg/system.config.{host,target} Add these to .gitignore - - - - - 7e8abf41 by Alan Zimmerman at 2026-07-09T09:24:12-04:00 EPA: Replace AnnListItem with simply [TrailingAnn] Remove the unnecessary wrapper around a single field. - - - - - 29032f17 by Zubin Duggal at 2026-07-09T09:24:58-04:00 testsuite: Keep real reason for fragile test failures - - - - - c34e03a7 by Zubin Duggal at 2026-07-09T09:24:58-04:00 testsuite: Fall back to the failure reason for empty JUnit bodies - - - - - 409d40f0 by Zubin Duggal at 2026-07-09T09:24:58-04:00 testsuite: Show output diffs in JUnit output Also refactor compare_outputs to return essentially a `Maybe Diff` (`CompareOutput`) instead of a bool, but more pythonic. This allows us to pass the diff through nice. - - - - - 06fee1ab by Zubin Duggal at 2026-07-09T09:24:58-04:00 perf notes: include stat deviation and acceptance window in notes so they show up in gitlab - - - - - 57c0f32c by mangoiv at 2026-07-10T11:08:38-04:00 driver: enable -finter-module-far-jumps by default this fixes a compatibility bug with certain binutils/gcc versions where we were seeing jump offset overflow errors. This commit can probably reverted if we stop supporting the problematic binutils/gcc verions (2.44 and 14.2, respectively) Reolves #26994 - - - - - 4396a6f2 by Andrea Vezzosi at 2026-07-10T11:09:25-04:00 [Fix #27287] preserve ModBreaks in ModIface - - - - - ed261a7e by Cheng Shao at 2026-07-14T17:59:38-04:00 hadrian: fix HLS support This patch fixes hadrian's HLS support so one can rely on HLS when working on the hadrian codebase. Fixes #27480. Not building/linking shared libraries for hadrian is a severely premature optimization; this top-level setting in `cabal.project` only affects home packages while the dependencies in the cabal store are built with vanilla/dynamic anyway, and even adding dynamic builds to home packages would not be costly due to cabal's usage of `-dynamic-too`. - - - - - eee8ec5b by Cheng Shao at 2026-07-14T18:00:20-04:00 compiler: fix miscompiled %load_relaxed, add missing %store_relaxed This patch fixes the %load_relaxed cmm primop compilation logic to correctly use relaxed memory ordering, and adds the missing %store_relaxed primop. Parsing logic of %load/%store with explicit ordering is covered in the AtomicFetch test case. Fixes #27483. Co-authored-by: Codex <codex(a)openai.com> - - - - - 1718230f by Alan Zimmerman at 2026-07-14T18:01:06-04:00 EPA: Keep binds and sigs together in HsValBindsLR We combine them into a single list for GhcPs, wrapped in the ValBind data type, which is the bind equivalent of ValD, having constructors for binds and sigs. This simplifies exact print processing, especially when using it to update the contents of local binds, as we no longer need AnnSortKey BindTag - - - - - 6bd1ad2a by Andreas Klebinger at 2026-07-14T18:01:49-04:00 Bump nofib submodule to account for MonoLocalBinds. New versions of GHC enable MonoLocalBinds by default. This breaks some of the benchmarks. I've fixed this and this bump pulls in that fix. - - - - - 7eb0f1c9 by Cheng Shao at 2026-07-14T18:02:31-04:00 testsuite: fix bytecodeIPE test under +ipe flavours This patch fixes the bytecodeIPE test under +ipe flavours. It used to fail under +ipe because the RTS is built with IPE info, then stg_AP_info in RTS carries IPE info, so whereFrom wouldn't return Nothing. Now the test checks IPE info of a datacon in the ghci-loaded module which is not affected by whether the RTS is built with IPE info or not. Fixes #27498. Co-authored-by: Codex <codex(a)openai.com> - - - - - ef038aae by cydparser at 2026-07-15T04:35:41-04:00 Reduce bytes allocated for `capabilities` in RTS (fixes #27487) In rts/Capability.c, `capabilities` is an array of pointers, but it was allocated as if it were an array of Capability's. - - - - - d377e83e by Cheng Shao at 2026-07-15T04:36:27-04:00 rts: fix missing UNTAG in stg_readTVarIOzh This patch fixes missing UNTAG on the current value closure read from StgTVar. UNTAG is a no-op when it's stg_TREC_HEADER_info which is word aligned; it may be a tagged closure, and reading info table from the tagged address is an unaligned load which may cause issues on platforms with strict alignment requirements. Co-authored-by: Codex <codex(a)openai.com> - - - - - 8ed03842 by Cheng Shao at 2026-07-15T04:36:27-04:00 rts: fix missing UNTAG in stg_control0zh_ll This patch fixes missing UNTAG on the cont closure returned by captureContinuationAndAbort. In case it's not NULL, captureContinuationAndAbort returns a tagged StgContinuation closure, in which case it must be untagged before accessing the apply_mask_frame field. In the past it worked out of luck: when apply_mask_frame was NULL then mask_frame_offset is also 0 so the control flow didn't diverge to a wrong path. Still, this is horribly wrong and will crash once StgContinuation struct is refactored and fields are shuffled around. Co-authored-by: Codex <codex(a)openai.com> - - - - - 5aa7000a by Cheng Shao at 2026-07-15T04:37:08-04:00 compiler: fix redundant AP thunk codegen when not using -ticky-ap-thunk This patch fixes a double negation confusion in !7525 that results in some redundant AP thunk code generation when not using -ticky-ap-thunk. Now, we use `stgToCmmUseStdApThunk` to indicate whether precomputed AP thunks in the RTS should be used, which defaults to `True`, unless `-ticky-ap-thunk` is passed. `-finfo-table-map` now also implies `-ticky-ap-thunk`, since when doing IPE profiling we want the generated AP thunks to be unique. Fixes #27502. ------------------------- Metric Decrease: T3064 ------------------------- Co-authored-by: Codex <codex(a)openai.com> - - - - - 77ade843 by Cheng Shao at 2026-07-15T13:39:17+00:00 WIP - - - - - 202 changed files: - .gitignore - .gitlab/merge_request_templates/Default.md - + changelog.d/T21628 - + changelog.d/T27123.md - + changelog.d/fix-cmm-atomic-load-store - + changelog.d/fix-peekitbl-no-tntc - + changelog.d/fix-use-std-ap-thunk - + changelog.d/inter-module-far-jumps-aarch64-default - compiler/GHC/Builtin/Types/Prim.hs - compiler/GHC/Builtin/Utils.hs - compiler/GHC/ByteCode/Breakpoints.hs - compiler/GHC/ByteCode/Types.hs - compiler/GHC/Cmm/CLabel.hs - compiler/GHC/Cmm/Parser.y - compiler/GHC/Core/Ppr.hs - compiler/GHC/Core/TyCo/Ppr.hs - compiler/GHC/Core/TyCo/Rep.hs - compiler/GHC/Core/TyCon.hs - compiler/GHC/Data/FastString.hs - compiler/GHC/Data/StringBuffer.hs - compiler/GHC/Driver/Config/StgToCmm.hs - compiler/GHC/Driver/DynFlags.hs - compiler/GHC/Driver/Errors/Ppr.hs - compiler/GHC/Driver/Flags.hs - compiler/GHC/Driver/Main/Compile.hs - compiler/GHC/Driver/Main/Hsc.hs - compiler/GHC/Driver/Main/Passes.hs - compiler/GHC/Driver/Session.hs - compiler/GHC/Hs/Binds.hs - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Hs/Expr.hs - compiler/GHC/Hs/Instances.hs - compiler/GHC/Hs/Lit.hs - compiler/GHC/Hs/Type.hs - compiler/GHC/Hs/Utils.hs - compiler/GHC/HsToCore.hs - compiler/GHC/HsToCore/Breakpoints.hs - + compiler/GHC/HsToCore/Breakpoints/Types.hs - compiler/GHC/HsToCore/Errors/Types.hs - compiler/GHC/HsToCore/Expr.hs - compiler/GHC/HsToCore/Foreign/C.hs - compiler/GHC/HsToCore/Foreign/JavaScript.hs - compiler/GHC/HsToCore/Foreign/Wasm.hs - compiler/GHC/HsToCore/Match.hs - compiler/GHC/HsToCore/Match/Literal.hs - compiler/GHC/HsToCore/Pmc/Desugar.hs - compiler/GHC/HsToCore/Pmc/Solver/Types.hs - compiler/GHC/HsToCore/Quote.hs - compiler/GHC/HsToCore/Ticks.hs - compiler/GHC/Iface/Ext/Ast.hs - compiler/GHC/Iface/Load.hs - compiler/GHC/Iface/Make.hs - compiler/GHC/Iface/Recomp.hs - compiler/GHC/Iface/Syntax.hs - compiler/GHC/Parser.y - compiler/GHC/Parser/Annotation.hs - compiler/GHC/Parser/Errors/Ppr.hs - compiler/GHC/Parser/HaddockLex.x - compiler/GHC/Parser/Lexer.x - compiler/GHC/Parser/PostProcess.hs - compiler/GHC/Platform/Ways.hs - compiler/GHC/Rename/Bind.hs - compiler/GHC/Rename/Env.hs - compiler/GHC/Rename/Expr.hs - compiler/GHC/Rename/HsType.hs - compiler/GHC/Rename/Module.hs - compiler/GHC/Rename/Names.hs - compiler/GHC/Rename/Splice.hs - compiler/GHC/Rename/Utils.hs - compiler/GHC/Runtime/Eval.hs - compiler/GHC/StgToByteCode.hs - compiler/GHC/StgToCmm/Bind.hs - compiler/GHC/StgToCmm/Config.hs - compiler/GHC/StgToCmm/Foreign.hs - compiler/GHC/StgToCmm/Prim.hs - compiler/GHC/StgToJS/FFI.hs - compiler/GHC/Tc/Deriv.hs - compiler/GHC/Tc/Deriv/Generate.hs - compiler/GHC/Tc/Deriv/Generics.hs - compiler/GHC/Tc/Errors.hs - compiler/GHC/Tc/Errors/Ppr.hs - compiler/GHC/Tc/Gen/Bind.hs - compiler/GHC/Tc/Gen/Expr.hs - compiler/GHC/Tc/Gen/Head.hs - compiler/GHC/Tc/Gen/HsType.hs - compiler/GHC/Tc/Gen/Pat.hs - compiler/GHC/Tc/Gen/Sig.hs - compiler/GHC/Tc/Gen/Splice.hs - compiler/GHC/Tc/Instance/Class.hs - compiler/GHC/Tc/Solver/Dict.hs - compiler/GHC/Tc/TyCl.hs - compiler/GHC/Tc/TyCl/Utils.hs - compiler/GHC/Tc/Types/Origin.hs - compiler/GHC/Tc/Validity.hs - compiler/GHC/ThToHs.hs - compiler/GHC/Types/Basic.hs - compiler/GHC/Types/Error.hs - compiler/GHC/Types/FieldLabel.hs - compiler/GHC/Types/ForeignCall.hs - compiler/GHC/Types/Literal.hs - compiler/GHC/Unit/Module/ModGuts.hs - compiler/GHC/Unit/Module/ModIface.hs - compiler/GHC/Unit/Module/Warnings.hs - compiler/GHC/Unit/Module/WholeCoreBindings.hs - compiler/GHC/Utils/Binary.hs - compiler/GHC/Utils/Outputable.hs - compiler/Language/Haskell/Syntax/Basic.hs - compiler/Language/Haskell/Syntax/Binds.hs - compiler/Language/Haskell/Syntax/Decls.hs - compiler/Language/Haskell/Syntax/Decls/Foreign.hs - compiler/Language/Haskell/Syntax/Expr.hs - compiler/Language/Haskell/Syntax/Extension.hs - compiler/Language/Haskell/Syntax/Lit.hs - compiler/Language/Haskell/Syntax/Module/Name.hs - + compiler/Language/Haskell/Syntax/Text.hs - compiler/Language/Haskell/Syntax/Type.hs - compiler/ghc.cabal.in - docs/users_guide/using-optimisation.rst - ghc/GHCi/UI.hs - hadrian/cabal.project - hadrian/src/Rules.hs - hadrian/src/Rules/BinaryDist.hs - hadrian/src/Rules/Test.hs - hadrian/src/Settings/Builders/RunTest.hs - libraries/ghc-boot/GHC/Data/ShortText.hs - + libraries/ghc-heap/tests/T27465.hs - + libraries/ghc-heap/tests/T27465.stdout - libraries/ghc-heap/tests/all.T - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTable.hsc - libraries/ghc-internal/src/GHC/Internal/Heap/InfoTableProf.hsc - nofib - rts/Apply.cmm - rts/Capability.c - rts/ContinuationOps.cmm - rts/PrimOps.cmm - testsuite/driver/junit.py - testsuite/driver/perf_notes.py - testsuite/driver/testglobals.py - testsuite/driver/testlib.py - testsuite/driver/testutil.py - testsuite/tests/cmm/should_run/AtomicFetch.hs - testsuite/tests/cmm/should_run/AtomicFetch_cmm.cmm - testsuite/tests/codeGen/should_compile/T25177.stderr - testsuite/tests/count-deps/CountDepsAst.stdout - testsuite/tests/count-deps/CountDepsParser.stdout - testsuite/tests/ghc-api/T25121_status.stdout - testsuite/tests/ghc-api/annotations-literals/parsed.hs - testsuite/tests/ghc-api/exactprint/T22919.stderr - testsuite/tests/ghc-api/exactprint/Test20239.stderr - testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr - testsuite/tests/ghci/scripts/bytecodeIPE.hs - testsuite/tests/ghci/should_run/Makefile - + testsuite/tests/ghci/should_run/T27287.hs - + testsuite/tests/ghci/should_run/T27287.stdout - testsuite/tests/ghci/should_run/all.T - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr - testsuite/tests/haddock/should_compile_flag_haddock/T24221.stderr - testsuite/tests/module/mod185.stderr - testsuite/tests/numeric/should_compile/T15547.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/DumpSemis.stderr - testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - testsuite/tests/parser/should_compile/T14189.stderr - testsuite/tests/parser/should_compile/T15323.stderr - testsuite/tests/parser/should_compile/T20452.stderr - testsuite/tests/parser/should_compile/T20718.stderr - testsuite/tests/parser/should_compile/T20718b.stderr - testsuite/tests/parser/should_compile/T20846.stderr - testsuite/tests/parser/should_compile/T23315/T23315.stderr - + testsuite/tests/parser/should_run/StringStartsWithNull.hs - + testsuite/tests/parser/should_run/StringStartsWithNull.stdout - testsuite/tests/parser/should_run/all.T - testsuite/tests/perf/compiler/hard_hole_fits.stderr - testsuite/tests/printer/AnnotationNoListTuplePuns.stdout - testsuite/tests/printer/T18791.stderr - testsuite/tests/printer/Test20297.stdout - testsuite/tests/printer/Test24533.stdout - + testsuite/tests/rts/T27123.hs - testsuite/tests/rts/all.T - testsuite/tests/simplCore/should_compile/DataToTagFamilyScrut.stderr - testsuite/tests/simplCore/should_compile/T14978.stdout - testsuite/tests/simplCore/should_compile/T18013.stderr - testsuite/tests/simplCore/should_compile/T24229a.stderr - testsuite/tests/simplCore/should_compile/T24229b.stderr - testsuite/tests/typecheck/should_compile/T15242.stderr - testsuite/tests/typecheck/should_compile/all.T - utils/check-exact/ExactPrint.hs - utils/check-exact/Main.hs - utils/check-exact/Transform.hs - utils/check-exact/Utils.hs - utils/check-exact/check-exact.cabal - utils/haddock/haddock-api/haddock-api.cabal - utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs - utils/haddock/haddock-api/src/Haddock/Backends/LaTeX.hs - utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/Interface/Create.hs The diff was not included because it is too large. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/39276ed17089e0945c871cad204ac7… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/39276ed17089e0945c871cad204ac7… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/fix-cross-test-cc
by Cheng Shao (＠TerrorJack) 15 Jul '26

15 Jul '26

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

1 0

[Git][ghc/ghc][wip/mangoiv/improve-linker-discovery] configure: implement a saner linker discovery algorithm in dist/configure
by Magnus (＠MangoIV) 15 Jul '26

15 Jul '26

Magnus pushed to branch wip/mangoiv/improve-linker-discovery at Glasgow Haskell Compiler / GHC Commits: 2fdd1e71 by mangoiv at 2026-07-15T15:10:01+02:00 configure: implement a saner linker discovery algorithm in dist/configure - - - - - 3 changed files: - distrib/configure.ac.in - + m4/bindist_determine_linker.m4 - m4/find_merge_objects.m4 Changes: ===================================== distrib/configure.ac.in ===================================== @@ -175,7 +175,11 @@ AC_SUBST([CmmCPPSupportsG0]) dnl ** Which ld to use? dnl -------------------------------------------------------------- -FIND_LD([$target],[GccUseLdOpt]) +dnl currently if you pass $LD=foo, merge objs command will be set to $(which foo) +dnl which is not required by GHC and also wrong. +BINDIST_DETERMINE_LINKER([$target],[GccUseLdOpt]) +dnl at this point, we should have set LD in all cases, so FIND_MERGE_OBJECTS command can +dnl go off and do it's thing FIND_MERGE_OBJECTS() CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 $GccUseLdOpt" CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 $GccUseLdOpt" ===================================== m4/bindist_determine_linker.m4 ===================================== @@ -0,0 +1,134 @@ +# BINDIST_DETERMINE_LINKER +# ------------------------ +# +# This is used to determine the linker within the bindists configure +# +# Notes: +# - usually, linking works by invoking $CC +# - objects are merged using $LD directly +# - $LD is a configure variable and is meaningless to $CC +# - gcc only knows linker *flavours*, it cannot use paths +# which means that the linker path should not be an absolute path +# - clang konws --ld-path which means that it can be passed that +# flag and also merge objs can be an absolute path +# +# Algorithm: +# if $LD is set +# then if $CC accepts --ld-path=$(which $LD) +# then set --ld-path=$(which $LD), MergeObjsCommand=$(which $LD) +# else if $CC accepts --fuse-ld=$LD ($LD is a linker flavour, not an absolute path) +# then set -fuse-ld=$LD, MergeObjsCommand=$LD (not $(which ld)) +# else Reject with +# "$LD is not compatible with $CC you chose. This means that $LD is either +# an unsupported linker flavour or your $CC does not support absolute linker +# paths" +# else if --disable-ld-override is set or $target is macos +# then if $CC accepts --ld-path=$(which ld) +# then set --ld-path=$(which ld), set MergeObjsCommand=$(which ld) +# else set *no* flag (equivalent to --fuse-ld=ld, if you will), set MergeObjsCommand=ld +# else if $CC accepts --ld-path=$(which ld.lld) +# then set --ld-path=$(which ld.lld), MergeObjsCommand=$(which ld.lld) +# else if $CC accepts -fuse-ld=lld +# then set -fuse-ld=lld, MergeObjsCommand=ld.lld +# else set *no* flag (equivalent to --fuse-ld=ld), set MergeObjsCommand=ld +# +# $1 = the platform +# $2 = the variable to set with GHC options to configure gcc to use the chosen linker +# +AC_DEFUN([BINDIST_DETERMINE_LINKER],[ + AC_ARG_ENABLE(ld-override, + [AS_HELP_STRING([--disable-ld-override], + [Prevent GHC from overriding the default linker used by gcc. If ld-override is enabled GHC will try to tell gcc to use whichever linker is selected by the LD environment variable. [default=override enabled]])], + [], + [enable_ld_override=yes]) + + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_TARGET]) + + check_ld_path() { + AC_MSG_CHECKING([whether C compiler supports --ld-path=[$]1]) + ld_path="[$]1" + echo 'int main(void) { return 0; }' > conftest.c + if $CC -o conftest.o "--ld-path=$ld_path" $LDFLAGS conftest.c > /dev/null 2>&1 + then + AC_MSG_RESULT([yes]) + ld_path_ok=yes + else + AC_MSG_RESULT([no]) + ld_path_ok=no + fi + rm -f conftest.c conftest.o + } + + check_fuse_ld() { + AC_MSG_CHECKING([whether C compiler supports -fuse-ld=[$]1]) + ld="[$]1" + echo 'int main(void) {return 0;}' > conftest.c + if $CC -o conftest.o -fuse-ld=[$]1 $LDFLAGS conftest.c > /dev/null 2>&1 + then + AC_MSG_RESULT([yes]) + fuse_ld_ok=yes + else + AC_MSG_RESULT([no]) + fuse_ld_ok=no + fi + rm -f conftest.c conftest.o + } + + try_set_linker_to() { + AC_MSG_CHECKING([whether linker can be set to [$]1]) + tmp_ld=[$]1 + abs_path=`command -v "$tmp_ld" 2>/dev/null` # get absolute path of $tmp_ld if it isn't already one + ld_path_ok="no" + if test "z$abs_path" != "z" && check_ld_path "$abs_path" && test "x$ld_path_ok" = "xyes"; + then $2="--ld-path=$abs_path" + AC_CHECK_TARGET_TOOL([LD], [$abs_path]) + linker_set_successfully=yes + else # --ld-path does not work or $LD cannot be resolved to an absolute path + fuse_ld_ok=no + if check_fuse_ld "$tmp_ld" && test "x$fuse_ld_ok" = "xyes"; + then $2="-fuse-ld=$tmp_ld" + AC_CHECK_TARGET_TOOL([LD], [$tmp_ld]) + linker_set_successfully=yes + else AC_MSG_WARN(["$tmp_ld could not be set via either '--ld-path' or '-fuse-ld"]) + linker_set_successfully=no + fi + fi + } + + # we are lenient when $LD=ld and just act as if $LD wasn't set and + # enable-ld-override is off + if test "z$LD" != "z" && test "z$LD" != "zld"; + then linker_set_successfully=no + try_set_linker_to "$LD" + if test "z$linker_set_successfully" != "zyes"; + then AC_MSG_FAILURE([ $tmp_ld is an invalid linker. If your C compiler accepts the '--ld-path' flag, + \$LD can be either of an executable name that is in \$PATH *or* a path to an executable. + If your C compiler only supports the '--fuse-ld' flag, \$LD can only be one of the linker flavours supported + by it. Mind that if your C compiler supports '--ld-path', 'configure' will always prefer using an absolute path + to your linker as that is less error-prone.]) + fi + + else # $LD is not set -- we will do the ld-override non-sense + if test "x$enable_ld_override" = "xyes" && test "z$LD" != "zld" && case "$1" in + *-darwin) false ;; # don't do the ld override thing on macos + *) true ;; + esac; + then + AC_MSG_NOTICE(["enable ld override was set and no more specific linker was chosen by setting \$LD, trying to find best possible linker"]) + try_set_linker_to "lld" + if test "z$linker_set_successfully" != "zyes"; + then # ... bail out, just use ld in path + $2="" + AC_CHECK_TARGET_TOOL([LD], [ld]) + fi + else # ld override is not set and $LD not set either + $2="" + AC_CHECK_TARGET_TOOL([LD], [ld]) + fi + fi + + AC_MSG_NOTICE([linker discovery set $2 set to $$2]) + + CHECK_LD_COPY_BUG([$1]) +]) ===================================== m4/find_merge_objects.m4 ===================================== @@ -22,7 +22,6 @@ AC_DEFUN([CHECK_MERGE_OBJECTS],[ ]) AC_DEFUN([FIND_MERGE_OBJECTS],[ - AC_REQUIRE([FIND_LD]) if test -z ${MergeObjsCmd+x}; then AC_MSG_NOTICE([Setting cmd]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2fdd1e71a1b612913d8ead02d066c27… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2fdd1e71a1b612913d8ead02d066c27… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/mangoiv/hadrian-uncompressed-tar] hadrian: allow building binary dist tar without compression
by Magnus (＠MangoIV) 15 Jul '26

15 Jul '26

Magnus pushed to branch wip/mangoiv/hadrian-uncompressed-tar at Glasgow Haskell Compiler / GHC Commits: e189126d by mangoiv at 2026-07-15T15:09:36+02:00 hadrian: allow building binary dist tar without compression - - - - - 1 changed file: - hadrian/src/Rules/BinaryDist.hs Changes: ===================================== hadrian/src/Rules/BinaryDist.hs ===================================== @@ -365,16 +365,17 @@ bindistRules = do -- Finally, we create the archive <root>/bindist/ghc-X.Y.Z-platform.tar.xz tarPath <- builderPath (Tar Create) - cmd [Cwd $ root -/- bindist_folder] tarPath - [ "-c", compressorTarFlag compressor, "-f" - , ghcVersionPretty <.> "tar" <.> compressorExtension compressor - , ghcVersionPretty ] + cmd [Cwd $ root -/- bindist_folder] tarPath $ + [ "-c" + , "-f" , compressorExtension compressor $ ghcVersionPretty <.> "tar" + , ghcVersionPretty ] <> compressorTarFlag compressor forM_ [("binary", buildBinDist), ("reloc-binary", buildBinDistReloc)] $ \(name, mk_bindist) -> do phony (name <> "-dist") $ mk_bindist Xz phony (name <> "-dist-gzip") $ mk_bindist Gzip phony (name <> "-dist-bzip2") $ mk_bindist Bzip2 phony (name <> "-dist-xz") $ mk_bindist Xz + phony (name <> "-dist-uncompressed") $ mk_bindist NoCompressor phony "binary-dist-cross" $ buildBinDistX "binary-dist-dir-cross" "bindist" Xz phony "binary-dist-stage3" $ buildBinDistX "binary-dist-dir-stage3" "bindist" Xz @@ -430,7 +431,7 @@ bindistRules = do fixup f | f `elem` ["INSTALL", "README"] = "distrib" -/- f | otherwise = f -data Compressor = Gzip | Bzip2 | Xz +data Compressor = Gzip | Bzip2 | Xz | NoCompressor deriving (Eq, Ord, Show) @@ -448,16 +449,18 @@ generateBuildMk BindistConfig{..} = do a =. b = a ++ " = " ++ b -- | Flag to pass to tar to use the given 'Compressor'. -compressorTarFlag :: Compressor -> String -compressorTarFlag Gzip = "--gzip" -compressorTarFlag Xz = "--xz" -compressorTarFlag Bzip2 = "--bzip" +compressorTarFlag :: Compressor -> [String] +compressorTarFlag Gzip = ["--gzip"] +compressorTarFlag Xz = ["--xz" ] +compressorTarFlag Bzip2 = ["--bzip"] +compressorTarFlag NoCompressor = [] -- | File extension to use for archives compressed with the given 'Compressor'. -compressorExtension :: Compressor -> String -compressorExtension Gzip = "gz" -compressorExtension Xz = "xz" -compressorExtension Bzip2 = "bz2" +compressorExtension :: Compressor -> String -> String +compressorExtension Gzip p = p <.> "gz" +compressorExtension Xz p = p <.> "xz" +compressorExtension Bzip2 p = p <.> "bz2" +compressorExtension NoCompressor p = p -- | A list of files that allow us to support a simple -- @./configure [...] && make install@ workflow. View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e189126dd7e849947adf38144d3e25d… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e189126dd7e849947adf38144d3e25d… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc][wip/mangoiv/improve-linker-discovery] configure: implement a saner linker discovery algorithm in dist/configure
by Magnus (＠MangoIV) 15 Jul '26

15 Jul '26

Magnus pushed to branch wip/mangoiv/improve-linker-discovery at Glasgow Haskell Compiler / GHC Commits: 9fde49e8 by mangoiv at 2026-07-15T15:04:37+02:00 configure: implement a saner linker discovery algorithm in dist/configure - - - - - 3 changed files: - distrib/configure.ac.in - + m4/bindist_determine_linker.m4 - m4/find_merge_objects.m4 Changes: ===================================== distrib/configure.ac.in ===================================== @@ -175,7 +175,11 @@ AC_SUBST([CmmCPPSupportsG0]) dnl ** Which ld to use? dnl -------------------------------------------------------------- -FIND_LD([$target],[GccUseLdOpt]) +dnl currently if you pass $LD=foo, merge objs command will be set to $(which foo) +dnl which is not required by GHC and also wrong. +BINDIST_DETERMINE_LINKER([$target],[GccUseLdOpt]) +dnl at this point, we should have set LD in all cases, so FIND_MERGE_OBJECTS command can +dnl go off and do it's thing FIND_MERGE_OBJECTS() CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 $GccUseLdOpt" CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 $GccUseLdOpt" ===================================== m4/bindist_determine_linker.m4 ===================================== @@ -0,0 +1,134 @@ +# BINDIST_DETERMINE_LINKER +# ------------------------ +# +# This is used to determine the linker within the bindists configure +# +# Notes: +# - usually, linking works by invoking $CC +# - objects are merged using $LD directly +# - $LD is a configure variable and is meaningless to $CC +# - gcc only knows linker *flavours*, it cannot use paths +# which means that the linker path should not be an absolute path +# - clang konws --ld-path which means that it can be passed that +# flag and also merge objs can be an absolute path +# +# Algorithm: +# if $LD is set +# then if $CC accepts --ld-path=$(which $LD) +# then set --ld-path=$(which $LD), MergeObjsCommand=$(which $LD) +# else if $CC accepts --fuse-ld=$LD ($LD is a linker flavour, not an absolute path) +# then set -fuse-ld=$LD, MergeObjsCommand=$LD (not $(which ld)) +# else Reject with +# "$LD is not compatible with $CC you chose. This means that $LD is either +# an unsupported linker flavour or your $CC does not support absolute linker +# paths" +# else if --disable-ld-override is set or $target is macos +# then if $CC accepts --ld-path=$(which ld) +# then set --ld-path=$(which ld), set MergeObjsCommand=$(which ld) +# else set *no* flag (equivalent to --fuse-ld=ld, if you will), set MergeObjsCommand=ld +# else if $CC accepts --ld-path=$(which ld.lld) +# then set --ld-path=$(which ld.lld), MergeObjsCommand=$(which ld.lld) +# else if $CC accepts -fuse-ld=lld +# then set -fuse-ld=lld, MergeObjsCommand=ld.lld +# else set *no* flag (equivalent to --fuse-ld=ld), set MergeObjsCommand=ld +# +# $1 = the platform +# $2 = the variable to set with GHC options to configure gcc to use the chosen linker +# +AC_DEFUN([BINDIST_DETERMINE_LINKER],[ + AC_ARG_ENABLE(ld-override, + [AS_HELP_STRING([--disable-ld-override], + [Prevent GHC from overriding the default linker used by gcc. If ld-override is enabled GHC will try to tell gcc to use whichever linker is selected by the LD environment variable. [default=override enabled]])], + [], + [enable_ld_override=yes]) + + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_TARGET]) + + check_ld_path() { + AC_MSG_CHECKING([whether C compiler supports --ld-path=[$]1]) + ld_path="[$]1" + echo 'int main(void) { return 0; }' > conftest.c + if $CC -o conftest.o "--ld-path=$ld_path" $LDFLAGS conftest.c > /dev/null 2>&1 + then + AC_MSG_RESULT([yes]) + ld_path_ok=yes + else + AC_MSG_RESULT([no]) + ld_path_ok=no + fi + rm -f conftest.c conftest.o + } + + check_fuse_ld() { + AC_MSG_CHECKING([whether C compiler supports -fuse-ld=[$]1]) + ld="[$]1" + echo 'int main(void) {return 0;}' > conftest.c + if $CC -o conftest.o -fuse-ld=[$]1 $LDFLAGS conftest.c > /dev/null 2>&1 + then + AC_MSG_RESULT([yes]) + fuse_ld_ok=yes + else + AC_MSG_RESULT([no]) + fuse_ld_ok=no + fi + rm -f conftest.c conftest.o + } + + try_set_linker_to() { + AC_MSG_CHECKING([whether linker can be set to [$]1]) + tmp_ld=[$]1 + abs_path=`command -v "$tmp_ld" 2>/dev/null` # get absolute path of $tmp_ld if it isn't already one + ld_path_ok="no" + if test "z$abs_path" != "z" && check_ld_path "$abs_path" && test "x$ld_path_ok" = "xyes"; + then $2="--ld-path=$abs_path" + AC_CHECK_TARGET_TOOL([LD], [$abs_path]) + linker_set_successfully=yes + else # --ld-path does not work or $LD cannot be resolved to an absolute path + fuse_ld_ok=no + if check_fuse_ld "$tmp_ld" && test "x$fuse_ld_ok" = "xyes"; + then $2="-fuse-ld=$tmp_ld" + AC_CHECK_TARGET_TOOL([LD], [$tmp_ld]) + linker_set_successfully=yes + else AC_MSG_WARN(["$tmp_ld could not be set via either '--ld-path' or '-fuse-ld"]) + linker_set_successfully=no + fi + fi + } + + # we are lenient when $LD=ld and just act as if $LD wasn't set and + # enable-ld-override is off + if test "z$LD" != "z" && test "z$LD" != "zld"; + then linker_set_successfully=no + try_set_linker_to "$LD" + if test "z$linker_set_successfully" != "zyes"; + then AC_MSG_FAILURE([ $tmp_ld is an invalid linker. If your C compiler accepts the '--ld-path' flag, + \$LD can be either of an executable name that is in \$PATH *or* a path to an executable. + If your C compiler only supports the '--fuse-ld' flag, \$LD can only be one of the linker flavours supported + by it. Mind that if your C compiler supports '--ld-path', 'configure' will always prefer using an absolute path + to your linker as that is less error-prone.]) + fi + + else # $LD is not set -- we will do the ld-override non-sense + if test "x$enable_ld_override" = "xyes" && test "z$LD" != "zld" && case "$1" in + *-darwin) false ;; # don't do the ld override thing on macos + *) true ;; + esac; + then + AC_MSG_NOTICE(["enable ld override was set and no more specific linker was chosen by setting \$LD, trying to find best possible linker"]) + try_set_linker_to "lld" + if test "z$linker_set_successfully" != "zyes"; + then # ... bail out, just use ld in path + $2="" + AC_CHECK_TARGET_TOOL([LD], [ld]) + fi + else # ld override is not set and $LD not set either + $2="" + AC_CHECK_TARGET_TOOL([LD], [ld]) + fi + fi + + AC_MSG_NOTICE([linker discovery set $2 set to $$2]) + + CHECK_LD_COPY_BUG([$1]) +]) ===================================== m4/find_merge_objects.m4 ===================================== @@ -22,7 +22,6 @@ AC_DEFUN([CHECK_MERGE_OBJECTS],[ ]) AC_DEFUN([FIND_MERGE_OBJECTS],[ - AC_REQUIRE([FIND_LD]) if test -z ${MergeObjsCmd+x}; then AC_MSG_NOTICE([Setting cmd]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9fde49e8d1bc73697d9cf271bb19b1b… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9fde49e8d1bc73697d9cf271bb19b1b… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0

[Git][ghc/ghc] Pushed new branch wip/mangoiv/hadrian-uncompressed-tar
by Magnus (＠MangoIV) 15 Jul '26

15 Jul '26

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

1 0

[Git][ghc/ghc][wip/mangoiv/improve-linker-discovery] 2 commits: configure: implement a saner linker discovery algorithm in dist/configure
by Magnus (＠MangoIV) 15 Jul '26

15 Jul '26

Magnus pushed to branch wip/mangoiv/improve-linker-discovery at Glasgow Haskell Compiler / GHC Commits: e55e16b2 by mangoiv at 2026-07-15T13:39:12+02:00 configure: implement a saner linker discovery algorithm in dist/configure - - - - - bd3bfcf2 by mangoiv at 2026-07-15T14:59:05+02:00 hadrian: allow building binary dist tar without compression - - - - - 4 changed files: - distrib/configure.ac.in - hadrian/src/Rules/BinaryDist.hs - + m4/bindist_determine_linker.m4 - m4/find_merge_objects.m4 Changes: ===================================== distrib/configure.ac.in ===================================== @@ -175,7 +175,11 @@ AC_SUBST([CmmCPPSupportsG0]) dnl ** Which ld to use? dnl -------------------------------------------------------------- -FIND_LD([$target],[GccUseLdOpt]) +dnl currently if you pass $LD=foo, merge objs command will be set to $(which foo) +dnl which is not required by GHC and also wrong. +BINDIST_DETERMINE_LINKER([$target],[GccUseLdOpt]) +dnl at this point, we should have set LD in all cases, so FIND_MERGE_OBJECTS command can +dnl go off and do it's thing FIND_MERGE_OBJECTS() CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 $GccUseLdOpt" CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 $GccUseLdOpt" ===================================== hadrian/src/Rules/BinaryDist.hs ===================================== @@ -365,16 +365,17 @@ bindistRules = do -- Finally, we create the archive <root>/bindist/ghc-X.Y.Z-platform.tar.xz tarPath <- builderPath (Tar Create) - cmd [Cwd $ root -/- bindist_folder] tarPath - [ "-c", compressorTarFlag compressor, "-f" - , ghcVersionPretty <.> "tar" <.> compressorExtension compressor - , ghcVersionPretty ] + cmd [Cwd $ root -/- bindist_folder] tarPath $ + [ "-c" + , "-f" , compressorExtension compressor $ ghcVersionPretty <.> "tar" + , ghcVersionPretty ] <> compressorTarFlag compressor forM_ [("binary", buildBinDist), ("reloc-binary", buildBinDistReloc)] $ \(name, mk_bindist) -> do phony (name <> "-dist") $ mk_bindist Xz phony (name <> "-dist-gzip") $ mk_bindist Gzip phony (name <> "-dist-bzip2") $ mk_bindist Bzip2 phony (name <> "-dist-xz") $ mk_bindist Xz + phony (name <> "-dist-uncompressed") $ mk_bindist NoCompressor phony "binary-dist-cross" $ buildBinDistX "binary-dist-dir-cross" "bindist" Xz phony "binary-dist-stage3" $ buildBinDistX "binary-dist-dir-stage3" "bindist" Xz @@ -430,7 +431,7 @@ bindistRules = do fixup f | f `elem` ["INSTALL", "README"] = "distrib" -/- f | otherwise = f -data Compressor = Gzip | Bzip2 | Xz +data Compressor = Gzip | Bzip2 | Xz | NoCompressor deriving (Eq, Ord, Show) @@ -448,16 +449,18 @@ generateBuildMk BindistConfig{..} = do a =. b = a ++ " = " ++ b -- | Flag to pass to tar to use the given 'Compressor'. -compressorTarFlag :: Compressor -> String -compressorTarFlag Gzip = "--gzip" -compressorTarFlag Xz = "--xz" -compressorTarFlag Bzip2 = "--bzip" +compressorTarFlag :: Compressor -> [String] +compressorTarFlag Gzip = ["--gzip"] +compressorTarFlag Xz = ["--xz" ] +compressorTarFlag Bzip2 = ["--bzip"] +compressorTarFlag NoCompressor = [] -- | File extension to use for archives compressed with the given 'Compressor'. -compressorExtension :: Compressor -> String -compressorExtension Gzip = "gz" -compressorExtension Xz = "xz" -compressorExtension Bzip2 = "bz2" +compressorExtension :: Compressor -> String -> String +compressorExtension Gzip p = p <.> "gz" +compressorExtension Xz p = p <.> "xz" +compressorExtension Bzip2 p = p <.> "bz2" +compressorExtension NoCompressor p = p -- | A list of files that allow us to support a simple -- @./configure [...] && make install@ workflow. ===================================== m4/bindist_determine_linker.m4 ===================================== @@ -0,0 +1,134 @@ +# BINDIST_DETERMINE_LINKER +# ------------------------ +# +# This is used to determine the linker within the bindists configure +# +# Notes: +# - usually, linking works by invoking $CC +# - objects are merged using $LD directly +# - $LD is a configure variable and is meaningless to $CC +# - gcc only knows linker *flavours*, it cannot use paths +# which means that the linker path should not be an absolute path +# - clang konws --ld-path which means that it can be passed that +# flag and also merge objs can be an absolute path +# +# Algorithm: +# if $LD is set +# then if $CC accepts --ld-path=$(which $LD) +# then set --ld-path=$(which $LD), MergeObjsCommand=$(which $LD) +# else if $CC accepts --fuse-ld=$LD ($LD is a linker flavour, not an absolute path) +# then set -fuse-ld=$LD, MergeObjsCommand=$LD (not $(which ld)) +# else Reject with +# "$LD is not compatible with $CC you chose. This means that $LD is either +# an unsupported linker flavour or your $CC does not support absolute linker +# paths" +# else if --disable-ld-override is set or $target is macos +# then if $CC accepts --ld-path=$(which ld) +# then set --ld-path=$(which ld), set MergeObjsCommand=$(which ld) +# else set *no* flag (equivalent to --fuse-ld=ld, if you will), set MergeObjsCommand=ld +# else if $CC accepts --ld-path=$(which ld.lld) +# then set --ld-path=$(which ld.lld), MergeObjsCommand=$(which ld.lld) +# else if $CC accepts -fuse-ld=lld +# then set -fuse-ld=lld, MergeObjsCommand=ld.lld +# else set *no* flag (equivalent to --fuse-ld=ld), set MergeObjsCommand=ld +# +# $1 = the platform +# $2 = the variable to set with GHC options to configure gcc to use the chosen linker +# +AC_DEFUN([BINDIST_DETERMINE_LINKER],[ + AC_ARG_ENABLE(ld-override, + [AS_HELP_STRING([--disable-ld-override], + [Prevent GHC from overriding the default linker used by gcc. If ld-override is enabled GHC will try to tell gcc to use whichever linker is selected by the LD environment variable. [default=override enabled]])], + [], + [enable_ld_override=yes]) + + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_TARGET]) + + check_ld_path() { + AC_MSG_CHECKING([whether C compiler supports --ld-path=[$]1]) + ld_path="[$]1" + echo 'int main(void) { return 0; }' > conftest.c + if $CC -o conftest.o "--ld-path=$ld_path" $LDFLAGS conftest.c > /dev/null 2>&1 + then + AC_MSG_RESULT([yes]) + ld_path_ok=yes + else + AC_MSG_RESULT([no]) + ld_path_ok=no + fi + rm -f conftest.c conftest.o + } + + check_fuse_ld() { + AC_MSG_CHECKING([whether C compiler supports -fuse-ld=[$]1]) + ld="[$]1" + echo 'int main(void) {return 0;}' > conftest.c + if $CC -o conftest.o -fuse-ld=[$]1 $LDFLAGS conftest.c > /dev/null 2>&1 + then + AC_MSG_RESULT([yes]) + fuse_ld_ok=yes + else + AC_MSG_RESULT([no]) + fuse_ld_ok=no + fi + rm -f conftest.c conftest.o + } + + try_set_linker_to() { + AC_MSG_CHECKING([whether linker can be set to [$]1]) + tmp_ld=[$]1 + abs_path=`command -v "$tmp_ld" 2>/dev/null` # get absolute path of $tmp_ld if it isn't already one + ld_path_ok="no" + if test "z$abs_path" != "z" && check_ld_path "$abs_path" && test "x$ld_path_ok" = "xyes"; + then $2="--ld-path=$abs_path" + AC_CHECK_TARGET_TOOL([LD], [$abs_path]) + linker_set_successfully=yes + else # --ld-path does not work or $LD cannot be resolved to an absolute path + fuse_ld_ok=no + if check_fuse_ld "$tmp_ld" && test "x$fuse_ld_ok" = "xyes"; + then $2="-fuse-ld=$tmp_ld" + AC_CHECK_TARGET_TOOL([LD], [$tmp_ld]) + linker_set_successfully=yes + else AC_MSG_WARN(["$tmp_ld could not be set via either '--ld-path' or '-fuse-ld"]) + linker_set_successfully=no + fi + fi + } + + # we are lenient when $LD=ld and just act as if $LD wasn't set and + # enable-ld-override is off + if test "z$LD" != "z" && test "z$LD" != "zld"; + then linker_set_successfully=no + try_set_linker_to "$LD" + if test "z$linker_set_successfully" != "zyes"; + then AC_MSG_FAILURE([ $tmp_ld is an invalid linker. If your C compiler accepts the '--ld-path' flag, + \$LD can be either of an executable name that is in \$PATH *or* a path to an executable. + If your C compiler only supports the '--fuse-ld' flag, \$LD can only be one of the linker flavours supported + by it. Mind that if your C compiler supports '--ld-path', 'configure' will always prefer using an absolute path + to your linker as that is less error-prone.]) + fi + + else # $LD is not set -- we will do the ld-override non-sense + if test "x$enable_ld_override" = "xyes" && test "z$LD" != "zld" && case "$1" in + *-darwin) false ;; # don't do the ld override thing on macos + *) true ;; + esac; + then + AC_MSG_NOTICE(["enable ld override was set and no more specific linker was chosen by setting \$LD, trying to find best possible linker"]) + try_set_linker_to "lld" + if test "z$linker_set_successfully" != "zyes"; + then # ... bail out, just use ld in path + $2="" + AC_CHECK_TARGET_TOOL([LD], [ld]) + fi + else # ld override is not set and $LD not set either + $2="" + AC_CHECK_TARGET_TOOL([LD], [ld]) + fi + fi + + AC_MSG_NOTICE([linker discovery set $2 set to $$2]) + + CHECK_LD_COPY_BUG([$1]) +]) ===================================== m4/find_merge_objects.m4 ===================================== @@ -22,7 +22,6 @@ AC_DEFUN([CHECK_MERGE_OBJECTS],[ ]) AC_DEFUN([FIND_MERGE_OBJECTS],[ - AC_REQUIRE([FIND_LD]) if test -z ${MergeObjsCmd+x}; then AC_MSG_NOTICE([Setting cmd]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b8774df10ffcb4c60992c2f7d172dd… -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b8774df10ffcb4c60992c2f7d172dd… You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help

1 0