<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ab2b60b650bb4ae4aa2cb3dcd0bea7b6afd52ca3">ab2b60b6</a></strong>
<div>
<span> by Sven Tennie </span> <i> at 2024-07-08T15:03:41-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>AArch64: Simplify stmtToInstrs type
There's no need to hand `Nothing`s around... (there was no case with a
`BlockId`.)
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/71a7fa8cc4327f7d220c5e006a2413e6648b9cd8">71a7fa8c</a></strong>
<div>
<span> by Sven Tennie </span> <i> at 2024-07-08T15:03:41-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>AArch64: Simplify stmtsToInstrs type
The `BlockId` parameter (`bid`) is never used, only handed around.
Deleting it simplifies the surrounding code.
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/8bf6fd68001bc1dabdd974506fc735e22e8257a9">8bf6fd68</a></strong>
<div>
<span> by Simon Peyton Jones </span> <i> at 2024-07-08T15:04:17-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Fix eta-expansion in Prep
As #25033 showed, we were eta-expanding in a way that broke a join point,
which messed up Note [CorePrep invariants].
The fix is rather easy. See Wrinkle (EA1) of
Note [Eta expansion of arguments in CorePrep]
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/9ce885d1d677fa398e2fab80a2e92937b8d47932">9ce885d1</a></strong>
<div>
<span> by Sjoerd Visscher </span> <i> at 2024-07-08T15:35:39-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>One-shot Haddock
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/c38c37756c1ca131a55b99884b0f8e18346fc834">c38c3775</a></strong>
<div>
<span> by Sjoerd Visscher </span> <i> at 2024-07-08T15:35:39-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Remove haddock-stdout test option
Superseded by output handling of Hadrian
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/8ad0dcebddcada11a09250b5b658cd5fb7ec0e34">8ad0dceb</a></strong>
<div>
<span> by Rodrigo Mesquita </span> <i> at 2024-07-08T15:35:42-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>ghc-boot: Relax Cabal bound
Fixes #25013
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/13fca62b3037076cc512a6d1eb5c2b2c698164a0">13fca62b</a></strong>
<div>
<span> by Matthew Pickering </span> <i> at 2024-07-08T15:35:49-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>ci: Unset ALEX/HAPPY variables when testing bootstrap jobs
Ticket #24826 reports a regression in 9.10.1 when building from a source
distribution. This patch is an attempt to reproduce the issue on CI by
more aggressively removing `alex` and `happy` from the environment.
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/3fe85d8f6a3c70a56ee7173ea5058228a6f4b1a7">3fe85d8f</a></strong>
<div>
<span> by Andrea Bedini </span> <i> at 2024-07-08T15:35:49-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>hadrian: Ignore build-tool-depends fields in cabal files
hadrian does not utilise the build-tool-depends fields in cabal files
and their presence can cause issues when building source distribution
(see #24826)
Ideally Cabal would support building "full" source distributions which
would remove the need for workarounds in hadrian but for now we can
patch the build-tool-depends out of the cabal files.
Fixes #24826
</pre>
</li>
<li>
<strong style="font-weight: 600;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/a888e741336e68a8bf3231300ee9addeb71f8f6b">a888e741</a></strong>
<div>
<span> by Matthew Pickering </span> <i> at 2024-07-08T15:35:50-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>testsuite: Don't attempt to link when checking whether a way is supported
It is sufficient to check that the simple test file compiles as it will
fail if there are not the relevant library files for the requested way.
If you break a way so badly that even a simple executable fails to link
(as I did for profiled dynamic way), it will just mean the tests for
that way are skipped on CI rather than displayed.
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
30 changed files:
</h4>
<ul>
<li class="file-stats">
<a href="#587d266bb27a4dc3022bbed44dfa19849df3044c">
.gitlab-ci.yml
</a>
</li>
<li class="file-stats">
<a href="#157f7634c25bc6366cb7c9c9edb48e819dce38db">
.gitlab/ci.sh
</a>
</li>
<li class="file-stats">
<a href="#6997a0cd37829d3d08db1c48185aaa3d7dfc3e6b">
compiler/GHC/CmmToAsm/AArch64/CodeGen.hs
</a>
</li>
<li class="file-stats">
<a href="#a5d27de4e3111a69f69902c65ecf7b3379f7c49a">
compiler/GHC/CoreToStg/Prep.hs
</a>
</li>
<li class="file-stats">
<a href="#579888c35e9965d115a2349ac57e4ff79e87518f">
hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
</a>
</li>
<li class="file-stats">
<a href="#0ebb2f2be655388ecccd3e7b71ac41cff1c7beba">
libraries/ghc-boot/ghc-boot.cabal.in
</a>
</li>
<li class="file-stats">
<a href="#0318d7198b933e41e458fd7073d9bd9dee267e7d">
testsuite/config/ghc
</a>
</li>
<li class="file-stats">
<a href="#f8e8eb8e08ba45d8cc8238c49482236af3519c6d">
testsuite/tests/haddock/haddock_testsuite/Makefile
</a>
</li>
<li class="file-stats">
<a href="#8c7787d7cebbb142f9faf2e941d8522c8753ccdf">
<span class="new-file">
+
testsuite/tests/simplCore/should_compile/T25033.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#fc07c260b75644727a8cdc1af5c861a44d4bfb5e">
testsuite/tests/simplCore/should_compile/all.T
</a>
</li>
<li class="file-stats">
<a href="#96426db4b60a0db58394bb42b45e36800e75d2be">
utils/haddock/.gitignore
</a>
</li>
<li class="file-stats">
<a href="#0c7000853dcfcb776d971ad2486a1f1f40ef8b6c">
utils/haddock/CHANGES.md
</a>
</li>
<li class="file-stats">
<a href="#1d063a3bc6bead463341dff9fa90c6bf68a62e92">
utils/haddock/doc/invoking.rst
</a>
</li>
<li class="file-stats">
<a href="#116d596254f2e0c86294da3a352000ea0be7da0e">
utils/haddock/haddock-api/src/Haddock.hs
</a>
</li>
<li class="file-stats">
<a href="#8115645f5e1a40a3e52ea8626c373d41d2d3d0f0">
utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker.hs
</a>
</li>
<li class="file-stats">
<a href="#853d9bde89ef714f7c031d49b783d2f8ad361414">
utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
</a>
</li>
<li class="file-stats">
<a href="#4b433a96ed9d5e5ddef6861cc92ffc696d541aff">
utils/haddock/haddock-api/src/Haddock/Backends/Xhtml/Layout.hs
</a>
</li>
<li class="file-stats">
<a href="#34ff95229233a5beec85cc024b68ffc1d878adca">
utils/haddock/haddock-api/src/Haddock/Interface.hs
</a>
</li>
<li class="file-stats">
<a href="#eb5dfcd13d7524e57d4764a1905e403607f04613">
utils/haddock/haddock-api/src/Haddock/Interface/AttachInstances.hs
</a>
</li>
<li class="file-stats">
<a href="#dffd8f88371490d2739689b42e6243e5df222760">
utils/haddock/haddock-api/src/Haddock/Interface/Create.hs
</a>
</li>
<li class="file-stats">
<a href="#1c842fdcd4c826d9282552053559f973a75aee60">
utils/haddock/haddock-api/src/Haddock/Options.hs
</a>
</li>
<li class="file-stats">
<a href="#760e4f6e19c74939a16f2cd06128694a9e47d06b">
utils/haddock/haddock-test/src/Test/Haddock.hs
</a>
</li>
<li class="file-stats">
<a href="#d86893eab71856aa780d4a3ce757adfd5592e178">
utils/haddock/haddock-test/src/Test/Haddock/Config.hs
</a>
</li>
<li class="file-stats">
<a href="#1b9f799a7276b16dee0c8b7dba0d7178820fcbea">
utils/haddock/haddock-test/src/Test/Haddock/Xhtml.hs
</a>
</li>
<li class="file-stats">
<a href="#60a0390af0534f50fc751813c626374a558031e6">
utils/haddock/hoogle-test/Main.hs
</a>
</li>
<li class="file-stats">
<a href="#fc47c741c3a2c3f4bc0ac24ee9e6c37dacbd161a">
utils/haddock/html-test/Main.hs
</a>
</li>
<li class="file-stats">
<a href="#bb9e8fb812665ea2886ac4553d0ea2bc48bb6b0e">
utils/haddock/html-test/ref/Bug1004.html
</a>
</li>
<li class="file-stats">
<a href="#35d45c89531209ee182f4581df03d6feed21160d">
utils/haddock/html-test/ref/Bug310.html
</a>
</li>
<li class="file-stats">
<a href="#a003404ca96003507272f763f126255b1c7d5a85">
utils/haddock/html-test/ref/Bug548.html
</a>
</li>
<li class="file-stats">
<a href="#3cf92967f9c22c5532dccb0c296e30c6af94e17d">
utils/haddock/html-test/ref/BundledPatterns.html
</a>
</li>
</ul>
<h5 style="margin-top: 10px; margin-bottom: 10px; font-size: .875rem;">
The diff was not included because it is too large.
</h5>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/compare/5cc08d8d280fea12e52c0cefd3cf2d93f6bfd6e1...a888e741336e68a8bf3231300ee9addeb71f8f6b">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.haskell.org">gitlab.haskell.org</a>. <a href="https://gitlab.haskell.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.haskell.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
</p>
</div>
</body>
</html>