Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC Commits: 12a706cf by Cheng Shao at 2026-03-14T16:37:54-04:00 base: fix redundant imports in GHC.Internal.Weak.Finalize This patch fixes redundant imports in GHC.Internal.Weak.Finalize that causes a regression in bootstrapping head from 9.14 with validate flavours. Fixes #27026. - - - - - b5d39cad by Matthew Pickering at 2026-03-14T16:38:37-04:00 Use explicit syntax rather than pure - - - - - 6e798f4f by Andreas Klebinger at 2026-03-15T04:59:49-04:00 Configure: Fix check for --target support in stage0 CC The check FP_PROG_CC_LINKER_TARGET used $CC unconditionally to check for --target support. However this fails for the stage0 config where the C compiler used is not $CC but $CC_STAGE0. Since we already pass the compiler under test into the macro I simply changed it to use that instead. Fixes #26999 - - - - - d7db04e7 by Simon Hengel at 2026-03-15T04:59:51-04:00 Fix typo in recursive_do.rst - - - - - 1b6e5bd1 by Matthew Pickering at 2026-03-15T04:59:51-04:00 Add missing req_interp modifier to T18441fail3 and T18441fail19 These tests require the interpreter but they were failing in a different way with the javascript backend because the interpreter was disabled and stderr is ignored by the test. - - - - - 5 changed files: - .gitlab/generate-ci/gen_ci.hs - docs/users_guide/exts/recursive_do.rst - libraries/base/src/GHC/Weak/Finalize.hs - m4/fp_prog_cc_linker_target.m4 - testsuite/tests/ghc-e/should_fail/all.T Changes: ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -173,7 +173,7 @@ configureArgsStr :: BuildConfig -> String configureArgsStr bc = unwords $ ["--enable-unregisterised"| unregisterised bc ] ++ ["--disable-tables-next-to-code" | not (tablesNextToCode bc) ] - ++ ["--with-intree-gmp" | Just _ <- pure (crossTarget bc) ] + ++ ["--with-intree-gmp" | Just _ <- [crossTarget bc] ] ++ ["--with-system-libffi" | crossTarget bc == Just "wasm32-wasi" ] ++ ["--enable-ipe-data-compression" | withZstd bc ] ++ ["--enable-strict-ghc-toolchain-check"] ===================================== docs/users_guide/exts/recursive_do.rst ===================================== @@ -56,7 +56,7 @@ or equivalently As you can guess ``justOnes`` will evaluate to ``Just [-1,-1,-1,...``. -GHC's implementation the mdo-notation closely follows the original +GHC's implementation of the mdo-notation closely follows the original translation as described in the paper `A recursive do for Haskell <https://leventerkok.github.io/papers/recdo.pdf>`__, which in turn is based on the work `Value Recursion in Monadic ===================================== libraries/base/src/GHC/Weak/Finalize.hs ===================================== @@ -16,12 +16,9 @@ import GHC.Internal.Weak.Finalize import GHC.Internal.Base import GHC.Internal.Exception -import GHC.Internal.IORef -import GHC.Internal.Conc.Sync (labelThreadByteArray#, myThreadId) -import GHC.Internal.IO (catchException, unsafePerformIO) +import GHC.Internal.IO (catchException) import GHC.Internal.IO.Handle.Types (Handle) import GHC.Internal.IO.Handle.Text (hPutStrLn) -import GHC.Internal.Encoding.UTF8 (utf8EncodeByteArray#) {-# DEPRECATED runFinalizerBatch ===================================== m4/fp_prog_cc_linker_target.m4 ===================================== @@ -8,7 +8,7 @@ # a linker AC_DEFUN([FP_PROG_CC_LINKER_TARGET], [ - AC_MSG_CHECKING([whether $CC used as a linker understands --target]) + AC_MSG_CHECKING([whether $1 used as a linker understands --target]) echo 'int foo() { return 0; }' > conftest1.c echo 'int main() { return 0; }' > conftest2.c @@ -20,7 +20,7 @@ AC_DEFUN([FP_PROG_CC_LINKER_TARGET], # See Note [Don't pass --target to emscripten toolchain] in GHC.Toolchain.Program CONF_CC_SUPPORTS_TARGET=NO AC_MSG_RESULT([no]) - elif "$CC" $$3 --target=$LlvmTarget -o conftest conftest1.o conftest2.o; + elif "$1" $$3 --target=$LlvmTarget -o conftest conftest1.o conftest2.o; then $3="--target=$LlvmTarget $$3" AC_MSG_RESULT([yes]) ===================================== testsuite/tests/ghc-e/should_fail/all.T ===================================== @@ -25,7 +25,7 @@ test('T18441fail1', req_interp, makefile_test, ['T18441fail1']) test('T18441fail2', [req_interp, normalise_version('ghc')], makefile_test, ['T18441fail2']) -test('T18441fail3', [ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":! abcde"']) +test('T18441fail3', [req_interp, ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":! abcde"']) test('T18441fail4', req_interp, makefile_test, ['T18441fail4']) @@ -57,7 +57,7 @@ test('T18441fail17', req_interp, makefile_test, ['T18441fail17']) test('T18441fail18', req_interp, makefile_test, ['T18441fail18']) -test('T18441fail19', [ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":cd abcd"']) +test('T18441fail19', [req_interp, ignore_stderr, exit_code(1)], run_command, ['{compiler} -e ":cd abcd"']) test('T23663', [req_interp, normalise_version('ghc')], makefile_test, ['T23663']) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8d578fdd7a8256f1b0ee0ce50533d8f... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8d578fdd7a8256f1b0ee0ce50533d8f... You're receiving this email because of your account on gitlab.haskell.org.