<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<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: -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: -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" style="color: #1068bf;">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/06036d931f51554305ba10add47e702d959619be" style="color: #1068bf;">06036d93</a></strong>
<div>
<span> by Sylvain Henry </span> <i> at 2023-01-18T01:55:10-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>testsuite: req_smp --> req_target_smp, req_ghc_smp
See #22630 and !9552
This commit:
- splits req_smp into req_target_smp and req_ghc_smp
- changes the testsuite driver to calculate req_ghc_smp
- changes a handful of tests to use req_target_smp instead of req_smp
- changes a handful of tests to use req_host_smp when needed
The problem:
- the problem this solves is the ambiguity surrounding req_smp
- on master req_smp was used to express the constraint that the program
being compiled supports smp _and_ that the host RTS (i.e., the RTS used
to compile the program) supported smp. Normally that is fine, but in
cross compilation this is not always the case as was discovered in #22630.
The solution:
- Differentiate the two constraints:
- use req_target_smp to say the RTS the compiled program is linked
with (and the platform) supports smp
- use req_host_smp to say the RTS the host is linked with supports smp
WIP: fix req_smp (target vs ghc)
add flag to separate bootstrapper
split req_smp -> req_target_smp and req_ghc_smp
update tests smp flags
cleanup and add some docstrings
only set ghc_with_smp to bootstrapper on S1 or CC
Only set ghc_with_smp to bootstrapperWithSMP of when testing stage 1
and cross compiling
test the RTS in config/ghc not hadrian
re-add ghc_with_smp
fix and align req names
fix T11760 to use req_host_smp
test the rts directly, avoid python 3.5 limitation
test the compiler in a try block
align out of tree and in tree withSMP flags
mark failing tests as host req smp
testsuite: req_host_smp --> req_ghc_smp
Fix ghc vs host, fix ghc_with_smp leftover
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ee9b78aa17e1eb81b3c4aa6a5ce324de49530e92" style="color: #1068bf;">ee9b78aa</a></strong>
<div>
<span> by Krzysztof Gogolewski </span> <i> at 2023-01-18T01:55:45-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>Use -Wdefault when running Python testdriver (#22727)
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/e9c0537cfbf7b47c64f592f529e402358b66ca7f" style="color: #1068bf;">e9c0537c</a></strong>
<div>
<span> by Vladislav Zavialov </span> <i> at 2023-01-18T01:56:22-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>Enable -Wstar-is-type by default (#22759)
Following the plan in GHC Proposal #143 "Remove the * kind syntax",
which states:
In the next release (or 3 years in), enable -fwarn-star-is-type by default.
The "next release" happens to be 9.6.1
I also moved the T21583 test case from should_fail to should_compile,
because the only reason it was failing was -Werror=compat in our test
suite configuration.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/4efee43db5090aac4dde1293357bdb548ae71c24" style="color: #1068bf;">4efee43d</a></strong>
<div>
<span> by Ryan Scott </span> <i> at 2023-01-18T01:56:59-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>Add missing parenthesizeHsType in cvtSigTypeKind
We need to ensure that the output of `cvtSigTypeKind` is parenthesized (at
precedence `sigPrec`) so that any type signatures with an outermost, explicit
kind signature can parse correctly.
Fixes #22784.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/19d5fde1d7110dfd8a7d66d4c82c07ba2f386bda" style="color: #1068bf;">19d5fde1</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-01-18T02:27:53-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>Bump ghc-tarballs to fix #22497
It turns out that gmp 6.2.1 uses the platform-reserved `x18` register on
AArch64/Darwin. This was fixed in upstream changeset 18164:5f32dbc41afc,
which was merged in 2020. Here I backport this patch although I do hope
that a new release is forthcoming soon.
Bumps gmp-tarballs submodule.
Fixes #22497.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/fc26b6d971ad5f099531cf80f84ae1fa7aec1da3" style="color: #1068bf;">fc26b6d9</a></strong>
<div>
<span> by Ben Gamari </span> <i> at 2023-01-18T02:27:53-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>Bump gmp-tarballs submodule
This backports the upstream fix for CVE-2021-43618, fixing #22789.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ad5a1ed9b102566104cb6b3afb897f5bb44d3a09" style="color: #1068bf;">ad5a1ed9</a></strong>
<div>
<span> by Cheng Shao </span> <i> at 2023-01-18T02:27:54-05:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 0.8125rem; color: #303030; position: relative; font-family: "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: #fafafa; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dbdbdb;'>Fix typo in recent darwin tests fix
Corrects a typo in !9647. Otherwise T18623 will still fail on darwin
and stall other people's work.
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
30 changed files:
</h4>
<ul>
<li class="file-stats">
<a href="#2e5692f568fd7b67a6b172e2a60469da8392508c" style="color: #1068bf;">
compiler/GHC/Driver/Flags.hs
</a>
</li>
<li class="file-stats">
<a href="#cdba811872892f235fe7059df1a6c538fba60816" style="color: #1068bf;">
compiler/GHC/Tc/Errors/Types.hs
</a>
</li>
<li class="file-stats">
<a href="#2eac51f9871ca0c0698aa1fc7f79c05ef8fc4a49" style="color: #1068bf;">
compiler/GHC/ThToHs.hs
</a>
</li>
<li class="file-stats">
<a href="#093cf1ab10ea2bac043566f4a5e4a1c4a1eaf5e6" style="color: #1068bf;">
docs/users_guide/9.6.1-notes.rst
</a>
</li>
<li class="file-stats">
<a href="#e16ae6db99f98868d3603a0c7df0bb6a793a330d" style="color: #1068bf;">
docs/users_guide/using-warnings.rst
</a>
</li>
<li class="file-stats">
<a href="#acb22db8d0fa26a579b612416f02f6a519b4cb9b" style="color: #1068bf;">
hadrian/src/Settings/Builders/RunTest.hs
</a>
</li>
<li class="file-stats">
<a href="#b817c80cbb15890d9a6df41e91d15d7442471f3c" style="color: #1068bf;">
libraries/base/tests/all.T
</a>
</li>
<li class="file-stats">
<a href="#97f10ff6d3080a1528fa6a08128bf8a954416ec5" style="color: #1068bf;">
libraries/ghc-bignum/gmp/gmp-tarballs
</a>
</li>
<li class="file-stats">
<a href="#0318d7198b933e41e458fd7073d9bd9dee267e7d" style="color: #1068bf;">
testsuite/config/ghc
</a>
</li>
<li class="file-stats">
<a href="#e54ca67057bbd4b95e13b94cb689e63b48baa9f0" style="color: #1068bf;">
testsuite/driver/cpu_features.py
</a>
</li>
<li class="file-stats">
<a href="#326e115e015c04db679ca1d9dbc1092906bef3a6" style="color: #1068bf;">
testsuite/driver/runtests.py
</a>
</li>
<li class="file-stats">
<a href="#19a3a16fa9d768a2005142b6cc4b642f0f88713f" style="color: #1068bf;">
testsuite/driver/testglobals.py
</a>
</li>
<li class="file-stats">
<a href="#c591f85f122007bac88228c5ff6fd76b40e6a811" style="color: #1068bf;">
testsuite/driver/testlib.py
</a>
</li>
<li class="file-stats">
<a href="#7b2623ac371a10ea66bc330530343f950eec0e23" style="color: #1068bf;">
testsuite/mk/test.mk
</a>
</li>
<li class="file-stats">
<a href="#6b1c188363067aa37c05e3a281dad45535511b14" style="color: #1068bf;">
testsuite/tests/codeGen/should_compile/all.T
</a>
</li>
<li class="file-stats">
<a href="#b9bba9766faf563ab195fb1402f14fa78ad5c66f" style="color: #1068bf;">
testsuite/tests/codeGen/should_run/all.T
</a>
</li>
<li class="file-stats">
<a href="#a10778d98f5bc56b4e9847f3ed4e98ff7337cda6" style="color: #1068bf;">
testsuite/tests/concurrent/T13615/all.T
</a>
</li>
<li class="file-stats">
<a href="#40142624dc4857a702b52f173a35277f48e3a483" style="color: #1068bf;">
testsuite/tests/concurrent/should_run/all.T
</a>
</li>
<li class="file-stats">
<a href="#b76ba5a65194148eb83ab44132b8421e72c05374" style="color: #1068bf;">
testsuite/tests/driver/T14075/all.T
</a>
</li>
<li class="file-stats">
<a href="#eeb9ebc63cfd1eb40898987094924b086ed8bbd8" style="color: #1068bf;">
testsuite/tests/driver/T20030/test1/all.T
</a>
</li>
<li class="file-stats">
<a href="#80c9c9f94b49b5eda70b1ea5c5f1fa2fda350b93" style="color: #1068bf;">
testsuite/tests/driver/j-space/all.T
</a>
</li>
<li class="file-stats">
<a href="#6926964729d11e14ef9287c60d753b7a253c6244" style="color: #1068bf;">
testsuite/tests/driver/t22391/all.T
</a>
</li>
<li class="file-stats">
<a href="#fbea9a6392407b0fa9ede5b9aa0bb2445af9de4b" style="color: #1068bf;">
testsuite/tests/ffi/should_run/all.T
</a>
</li>
<li class="file-stats">
<a href="#00f87b970a212b1a12b2a5ec9ec7fc3ad7fd8386" style="color: #1068bf;">
testsuite/tests/ghci/scripts/ghci024.stdout
</a>
</li>
<li class="file-stats">
<a href="#82100cceef61af2e89701b8b8428032758a84ffd" style="color: #1068bf;">
testsuite/tests/ghci/scripts/ghci024.stdout-mingw32
</a>
</li>
<li class="file-stats">
<a href="#2060e4a04df848b7e17efef4baf098eb38d945f1" style="color: #1068bf;">
testsuite/tests/rts/T18623/all.T
</a>
</li>
<li class="file-stats">
<a href="#5ced844c5529162410276a1236ca9b8e7186490c" style="color: #1068bf;">
testsuite/tests/rts/all.T
</a>
</li>
<li class="file-stats">
<a href="#9ba7ca0337b412f80b474581c6e9be8ee5bd2fc3" style="color: #1068bf;">
<span class="new-file">
+
testsuite/tests/th/T22784.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#e9983b8c6190f0645c5389109dea1080d2414e45" style="color: #1068bf;">
<span class="new-file">
+
testsuite/tests/th/T22784.stderr
</span>
</a>
</li>
<li class="file-stats">
<a href="#6f885f60b8c0fea6b94dd73a67d02212eedb4498" style="color: #1068bf;">
testsuite/tests/th/all.T
</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: #666;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/compare/9c6d3943bc5f3e627e9bbd07dc7f78e1806d8e83...ad5a1ed9b102566104cb6b3afb897f5bb44d3a09" style="color: #1068bf;">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" style="color: #1068bf;">gitlab.haskell.org</a>. <a href="https://gitlab.haskell.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link" style="color: #1068bf;">Manage all notifications</a> · <a href="https://gitlab.haskell.org/help" target="_blank" rel="noopener noreferrer" class="help-link" style="color: #1068bf;">Help</a>
</p>
</div>
</body>
</html>