<!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: "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: "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 master 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/51e3ec839c378f0da7052278a56482f0349e9bc7">51e3ec83</a></strong>
<div>
<span> by Vladislav Zavialov </span> <i> at 2025-01-22T20:41:32+03:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #28272d; position: relative; font-family: "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;'>Rework built-in and punned names (#25174, #25179, #25180, #25182)
This patch rewrites part of the logic for dealing with built-in and
punned names, making it more principled and fixing a few bugs.
* Kill off filterCTuple. Its purpose was to improve pretty-printing of
constraint tuples, and the appropriate place for this is namePun_maybe.
* Remove unitTyCon, unboxedUnitTyCon, and soloTyCon from wiredInTyCons.
Their inclusion in the list was a workaround for shoddy logic in
lookupOrigNameCache. Now we treat tuples of all arities uniformly.
* In isBuiltInOcc_maybe, only match on actual built-in syntax, e.g. "FUN"
shouldn't be there (#25174). Also take ListTuplePuns into account (#25179).
* When matching OccNames, use the ShortByteString directly to avoid
potentially costly conversions to ByteString and String.
* Introduce isInfiniteFamilyOrigName_maybe, a purpose-built helper for
looking up tuples/sums in the OrigNameCache. This clears up the previously
convoluted relation between the orig name cache and built-in syntax.
* Reuse isKnownOrigName_maybe to eliminate the need for isPunOcc_maybe.
* Classify MkSolo and MkSolo# as UserSyntax, thus fixing whole-module
reexports (#25182).
* Teach valid-hole-fits about tuples, unboxed tuples, and unboxed sums,
up to a certain arity (#25180).
* Drop the unnecessary special case for unary constraint tuples in the
type checker (finish_tuple). It was a workaround for the lack of CSolo.
* Update Notes and other comments, add tests.
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
30 changed files:
</h4>
<ul>
<li class="file-stats">
<a href="#0887cf39c5cdf9cf8d6758f410d7dab3023c0d77">
compiler/GHC/Builtin/Names.hs
</a>
</li>
<li class="file-stats">
<a href="#377cfd14c1f92357465df995ec6537b074051322">
compiler/GHC/Builtin/Types.hs
</a>
</li>
<li class="file-stats">
<a href="#8dc7109003a77f8a82e987dc1de31466aa956174">
compiler/GHC/Builtin/Uniques.hs
</a>
</li>
<li class="file-stats">
<a href="#9a679a2680ef6061397f1987091ea9f96ffe095d">
compiler/GHC/Driver/Main.hs
</a>
</li>
<li class="file-stats">
<a href="#4769efc0cb06e92bc7562e31984f6d7d91048e51">
compiler/GHC/Parser/Errors/Ppr.hs
</a>
</li>
<li class="file-stats">
<a href="#4a238b7fd965f958b107d110c96d07962d7a83ec">
compiler/GHC/Plugins.hs
</a>
</li>
<li class="file-stats">
<a href="#86d694037d496c511e28b2c09c8410f67dc19596">
compiler/GHC/Rename/Env.hs
</a>
</li>
<li class="file-stats">
<a href="#897218b3e24728ae9e5b0329b949493f1ede80fb">
compiler/GHC/Tc/Errors/Hole.hs
</a>
</li>
<li class="file-stats">
<a href="#1dd9c7a6bbc222c976a6ec1c4b772232ae60f7e5">
compiler/GHC/Tc/Errors/Ppr.hs
</a>
</li>
<li class="file-stats">
<a href="#9355bef855426caf5f526925edf351b20f9a86c4">
compiler/GHC/Tc/Gen/HsType.hs
</a>
</li>
<li class="file-stats">
<a href="#9ea832ccdb4b5f7508a1efd6caedeafa16b269e7">
compiler/GHC/Tc/Gen/Splice.hs
</a>
</li>
<li class="file-stats">
<a href="#2eac51f9871ca0c0698aa1fc7f79c05ef8fc4a49">
compiler/GHC/ThToHs.hs
</a>
</li>
<li class="file-stats">
<a href="#8905161187cfddae9e9ece36910196e521651b00">
compiler/GHC/Types/Name.hs
</a>
</li>
<li class="file-stats">
<a href="#f754f981fba5b670f7cd508eecbf3806a0d7133f">
compiler/GHC/Types/Name/Cache.hs
</a>
</li>
<li class="file-stats">
<a href="#0f578f1fe8a9ec5a67a0f6fa165f2aa15f113682">
compiler/GHC/Types/Name/Ppr.hs
</a>
</li>
<li class="file-stats">
<a href="#658fa064028089d13fd5ed47614667aef36cd7a8">
libraries/base/src/GHC/Base.hs
</a>
</li>
<li class="file-stats">
<a href="#c733bb6aac1e3ef062efb4b661e75dca90459b11">
libraries/base/src/GHC/Exts.hs
</a>
</li>
<li class="file-stats">
<a href="#bcfb349b3f1b30798c71a2efcedda56bb00a603a">
testsuite/tests/core-to-stg/T24124.stderr
</a>
</li>
<li class="file-stats">
<a href="#5ff2ade90c007a336603fdf2c260560031a87873">
testsuite/tests/ghc-api/T18522-dbg-ppr.hs
</a>
</li>
<li class="file-stats">
<a href="#82b23ae123a1b839f5c9c55e2431169c87d7c3b1">
testsuite/tests/interface-stability/ghc-experimental-exports.stdout
</a>
</li>
<li class="file-stats">
<a href="#fca75268a6e3a0981d7c5438f0cfb55796de4135">
testsuite/tests/interface-stability/ghc-experimental-exports.stdout-mingw32
</a>
</li>
<li class="file-stats">
<a href="#c1718f7d7df2e457dda4fa8e01026843faa96d8d">
<span class="new-file">
+
testsuite/tests/rename/should_compile/ReExportTuples.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#8b9a4e841233b3e9753544ed6e0a31592f6073dc">
<span class="new-file">
+
testsuite/tests/rename/should_compile/T25182.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#a4162a155076487da39ef091cacc50c633652a4d">
testsuite/tests/rename/should_compile/all.T
</a>
</li>
<li class="file-stats">
<a href="#e975406c2469f42f9f4c2f4354b1f12c4c1a450a">
testsuite/tests/simplStg/should_compile/T15226b.stderr
</a>
</li>
<li class="file-stats">
<a href="#4ee75bbc091f78367217f8ac1fc08c837617ad84">
<span class="new-file">
+
testsuite/tests/th/FunNameTH.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#46f95a36e92a2b817c3780c308737c2d8b81e39b">
testsuite/tests/th/T13776.hs
</a>
</li>
<li class="file-stats">
<a href="#76411aa8fc2ee46a38912990a8e75a3c301b7cf0">
testsuite/tests/th/T13776.stderr
</a>
</li>
<li class="file-stats">
<a href="#62469a06ee90e23a5163e0eb36043bcbdc5051d4">
testsuite/tests/th/T17380.stderr
</a>
</li>
<li class="file-stats">
<a href="#357786b679f02ec5326806c857e4ca97088bee6d">
<span class="new-file">
+
testsuite/tests/th/T25174.hs
</span>
</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/-/commit/51e3ec839c378f0da7052278a56482f0349e9bc7">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>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.haskell.org/ghc/ghc/-/commit/51e3ec839c378f0da7052278a56482f0349e9bc7"}}</script>
</p>
</div>
</body>
</html>