<!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: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.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,0.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: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/121c9ab76cf8dccd07b03e2add519d6eb10dcefa">121c9ab7</a></strong>
<div>
<span> by David Binder </span> <i> at 2023-11-22T21:12:29-05: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;'>Unify the hpc testsuites
The hpc testsuite was split between testsuite/tests/hpc
and the submodule libraries/hpc/test. This commit unifies
the two testsuites in the GHC repository in the directory
testsuite/tests/hpc.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/d2733a055584964eb4a1d3a4764de4d678ffa313">d2733a05</a></strong>
<div>
<span> by Alan Zimmerman </span> <i> at 2023-11-22T21:13:05-05: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;'>EPA: empty tup_tail has noAnn
In Parser.y, the tup_tail rule had the following option
| {- empty -} %shift { return [Left noAnn] }
Once this works through PostProcess.hs, it means we add an extra
Missing constructor if the last item was a comma.
Change the annotation type to a Bool to indicate this, and use the
EpAnn Anchor for the print location for the others.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/bf162c0779f8b5642a5de9849618b60aab1016ce">bf162c07</a></strong>
<div>
<span> by Andreas Klebinger </span> <i> at 2023-11-24T05:29:06-05: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 FMA primops generating broken assembly on x86.
`genFMA3Code` assumed that we had to take extra precations to avoid overwriting
the result of `getNonClobberedReg`. One of these special cases caused a bug resulting
in broken assembly.
I believe we don't need to hadle these cases specially at all, which means this MR simply
deletes the special cases to fix the bug.
Fixes #24160
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/fb39b94acf904bee4826b17757423a5e31657cf0">fb39b94a</a></strong>
<div>
<span> by Alan Zimmerman </span> <i> at 2023-11-24T05:29:07-05: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;'>EPA: Remove parenthesizeHsType
This is called from PostProcess.hs, and adds spurious parens.
With the looser version of exact printing we had before we could
tolerate this, as they would be swallowed by the original at the same
place.
But with the next change (remove EpAnnNotUsed) they result in
duplicates in the output.
For Darwin build:
Metric Increase:
MultiLayerModulesTH_OneShot
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
30 changed files:
</h4>
<ul>
<li class="file-stats">
<a href="#2bae5947e9412f6deebf4db7dcb89d780913130f">
compiler/GHC/CmmToAsm/X86/CodeGen.hs
</a>
</li>
<li class="file-stats">
<a href="#7b360ca84c1b9aaecc0f9de207a7698dc36514fe">
compiler/GHC/CmmToAsm/X86/Instr.hs
</a>
</li>
<li class="file-stats">
<a href="#64e68d52c0898049455e20b0d001ffe1dd07ff83">
compiler/GHC/Driver/Pipeline/Execute.hs
</a>
</li>
<li class="file-stats">
<a href="#cc97d81e7223ad4a3a5e801156ca632f9fa75654">
compiler/GHC/Hs/Expr.hs
</a>
</li>
<li class="file-stats">
<a href="#018be522bc4813b147a1525e4f96a7a493207d96">
compiler/GHC/Hs/Type.hs
</a>
</li>
<li class="file-stats">
<a href="#7a1af22e4c32b9aa6ec708d9d3788e1c4db5da9a">
compiler/GHC/Hs/Utils.hs
</a>
</li>
<li class="file-stats">
<a href="#bf951467d4a9aa443cb109cb4c84a2891945649b">
compiler/GHC/Parser.y
</a>
</li>
<li class="file-stats">
<a href="#446cb12ca6cefaf1c6eb79b7db643632744263c7">
compiler/GHC/Parser/PostProcess.hs
</a>
</li>
<li class="file-stats">
<a href="#211a448f1df996899df14cfbd91d498ffa77b8bd">
compiler/GHC/Parser/Types.hs
</a>
</li>
<li class="file-stats">
<a href="#42bcd36e5791e64370e1cb55417c82c34538bb7a">
libraries/hpc
</a>
</li>
<li class="file-stats">
<a href="#5189ae08e900cc2158ad7bf91b1c28ae2b99b63f">
<span class="new-file">
+
testsuite/tests/hpc/.gitignore
</span>
</a>
</li>
<li class="file-stats">
<a href="#56bd52c919a65f3bbf05e324f99095acbfda394e">
<span class="new-file">
+
testsuite/tests/hpc/fork/Makefile
</span>
</a>
</li>
<li class="file-stats">
<a href="#712f1a60722cd32180a49eb34efbb0a1af378c4f">
<span class="new-file">
+
testsuite/tests/hpc/fork/hpc_fork.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#68cf1c1777e0d39d5f524555e03635af44260f08">
<span class="new-file">
+
testsuite/tests/hpc/fork/hpc_fork.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#3b8ac820d8515cf824cb58d54f6a8ac425ebd974">
<span class="new-file">
+
testsuite/tests/hpc/fork/test.T
</span>
</a>
</li>
<li class="file-stats">
<a href="#675dac255c3c7765d19db4ce5a634f90faa9011b">
<span class="new-file">
+
testsuite/tests/hpc/function/Makefile
</span>
</a>
</li>
<li class="file-stats">
<a href="#cbd65c7226edb38349f6746425b38b0caf3d4fdc">
<span class="new-file">
+
testsuite/tests/hpc/function/test.T
</span>
</a>
</li>
<li class="file-stats">
<a href="#ab51f0e5c021ae18193c9843a8d35c142a6a1384">
<span class="new-file">
+
testsuite/tests/hpc/function/tough.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#9e2f6929ce7f7bb2fcd51ba45073028c70ffda67">
<span class="new-file">
+
testsuite/tests/hpc/function/tough.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#8d910334633769ceb4e9c561839416a32a2e06d4">
<span class="new-file">
+
testsuite/tests/hpc/function2/Makefile
</span>
</a>
</li>
<li class="file-stats">
<a href="#6f7755b908d48e66423e20ba11e6330848b25756">
<span class="new-file">
+
testsuite/tests/hpc/function2/subdir/tough2.lhs
</span>
</a>
</li>
<li class="file-stats">
<a href="#b8e1320db388f8ed6117b64efa92040ee85c684e">
<span class="new-file">
+
testsuite/tests/hpc/function2/test.T
</span>
</a>
</li>
<li class="file-stats">
<a href="#b9bef408a10c54610550924cae3d1c40c4c477ff">
<span class="new-file">
+
testsuite/tests/hpc/function2/tough2.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#d07cbbbf28483ca4b78b665e9cf981f42fb40519">
<span class="new-file">
+
testsuite/tests/hpc/ghc_ghci/A.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#b65459a1031a125e432a58c8e83d4f67bc763395">
<span class="new-file">
+
testsuite/tests/hpc/ghc_ghci/B.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#27eb5f85bbfc80b14a4c800c8d461888e09b916f">
<span class="new-file">
+
testsuite/tests/hpc/ghc_ghci/Makefile
</span>
</a>
</li>
<li class="file-stats">
<a href="#ccb60598fec6a12696b4f4e0b80c762243f92d2f">
<span class="new-file">
+
testsuite/tests/hpc/ghc_ghci/hpc_ghc_ghci.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#ff7c8a005835a4a901d4d27507d6f2cb26c01e0c">
<span class="new-file">
+
testsuite/tests/hpc/ghc_ghci/test.T
</span>
</a>
</li>
<li class="file-stats">
<a href="#7dbd61597a117fa374827c5a475bfbeca7b47c91">
<span class="new-file">
+
testsuite/tests/hpc/hpc.ovr
</span>
</a>
</li>
<li class="file-stats">
<a href="#5da0264021aab990d275e3f5d81f048df923d87b">
<span class="new-file">
+
testsuite/tests/hpc/hpcrun.pl
</span>
</a>
</li>
</ul>
<h5 style="margin-top: 10px; margin-bottom: 10px; font-size: 0.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/d4e26b605af4f74e7e3980e20139430c20083c99...fb39b94acf904bee4826b17757423a5e31657cf0">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>