<!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>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Ben Gamari pushed to branch wip/backports
at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/3e1c9f615fc424ab2819050fe202f386c3c97bc2">3e1c9f61</a></strong>
<div>
<span>by Tuan Le</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">llvmGen: Consider Relocatable read-only data as not constantReferences: #18137
(cherry picked from commit 0004ccb885e534c386ceae21580fc59ec7ad0ede)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/f01ab28dd71255d9e1dce79b0f2104fb63bb4b79">f01ab28d</a></strong>
<div>
<span>by Ben Gamari</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">rts/CNF: Fix fixup comparison function
Previously we would implicitly convert the difference between two words
to an int, resulting in an integer overflow on 64-bit machines.
Fixes #16992
(cherry picked from commit cf4f1e2f78840d25b132de55bce1e02256334ace)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/c753669dbf8ed2b497a0b7bc5902bc85b2d94e01">c753669d</a></strong>
<div>
<span>by Ryan Scott</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Make boxed 1-tuples have known keys
Unlike other tuples, which use special syntax and are "known" by way
of a special `isBuiltInOcc_maybe` code path, boxed 1-tuples do not
use special syntax. Therefore, in order to make sure that the
internals of GHC are aware of the `data Unit a = Unit a` definition
in `GHC.Tuple`, we give `Unit` known keys. For the full details, see
`Note [One-tuples] (Wrinkle: Make boxed one-tuple names have known keys)`
in `GHC.Builtin.Types`.
Fixes #18097.
(cherry picked from commit 518a63d4d7e31e49a81ad66d5e5ccb1f790f6de9)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/03b1730228b75cb82447fa443309425ae5c96401">03b17302</a></strong>
<div>
<span>by Ryan Scott</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Create di_scoped_tvs for associated data family instances properly
See `Note [Associated data family instances and di_scoped_tvs]` in
`GHC.Tc.TyCl.Instance`, which explains all of the moving parts.
Fixes #18055.
(cherry picked from commit cd8409c26d4370bf2cdcd76801974e99a9adf7b0)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/afa455ec3df81ec6bb40170756a47d4e5a70975f">afa455ec</a></strong>
<div>
<span>by Sebastian Graf</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">PmCheck: Adjust recursion depth for inhabitation test
In #17977, we ran into the reduction depth limit of the typechecker.
That was only a symptom of a much broader issue: The recursion depth
of the coverage checker for trying to instantiate strict fields in the
`nonVoid` test was far too high (100, the `defaultMaxTcBound`).
As a result, we were performing quite poorly on `T17977`.
Short of a proper termination analysis to prove emptyness of a type,
we just arbitrarily default to a much lower recursion limit of 3.
Fixes #17977.
(cherry picked from commit ed58d4fdcbc7b4fa8fbdf3d638a8d53c444ef4f2)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/a2fddfb8c85f244bb6bc99e0906ac0bdf92d4cb9">a2fddfb8</a></strong>
<div>
<span>by Ryan Scott</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Run checkNewDataCon before constraint-solving newtype constructors
Within `checkValidDataCon`, we used to run `checkValidType` on the
argument types of a newtype constructor before running
`checkNewDataCon`, which ensures that the user does not attempt
non-sensical things such as newtypes with multiple arguments or
constraints. This works out in most situations, but this falls over
on a corner case revealed in #17955:
```hs
newtype T = Coercible () T => T ()
```
`checkValidType`, among other things, peforms an ambiguity check on
the context of a data constructor, and that it turn invokes the
constraint solver. It turns out that there is a special case in the
constraint solver for representational equalities (read: `Coercible`
constraints) that causes newtypes to be unwrapped (see
`Note [Unwrap newtypes first]` in `TcCanonical`). This special case
does not know how to cope with an ill formed newtype like `T`, so
it ends up panicking.
The solution is surprisingly simple: just invoke `checkNewDataCon`
before `checkValidType` to ensure that the illicit newtype
constructor context is detected before the constraint solver can
run amok with it.
Fixes #17955.
(cherry picked from commit a0d8e92e9c9b67426aa139d6bc46363d8940f992)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/c72907f828b487ba1e5021f8e0f83b63eaed8ac8">c72907f8</a></strong>
<div>
<span>by Simon Peyton Jones</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Improve skolemisation
This patch avoids skolemiseUnboundMetaTyVar making
up a fresh Name when it doesn't need to.
See Note [Skolemising and identity]
Improves error messsages for partial type signatures.
(cherry picked from commit d7002bccd7d131f8ee9b1ddcd83d62262622294d)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/4ab0db367408112803db5fbc8bd6c6b5290350e0">4ab0db36</a></strong>
<div>
<span>by Simon Peyton Jones</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Improve pretty-printing for TyConBinders
In particular, show their kinds.
(cherry picked from commit fa37940cd72f82abc460f5c0a5de64dd75cee6ae)
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/ec0968e3cd6757501c6b79bdec62b16a5bafc833">ec0968e3</a></strong>
<div>
<span>by Simon Peyton Jones</span>
<i>at 2020-05-30T11:38:56-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Fix scoping of TyCon binders in TcTyClsDecls
This patch fixes #17566 by refactoring the way we decide the final
identity of the tyvars in the TyCons of a possibly-recursive nest
of type and class decls, possibly with associated types.
It's all laid out in
Note [Swizzling the tyvars before generaliseTcTyCon]
Main changes:
* We have to generalise each decl (with its associated types)
all at once: TcTyClsDecls.generaliseTyClDecl
* The main new work is done in TcTyClsDecls.swizzleTcTyConBndrs
* The mysterious TcHsSyn.zonkRecTyVarBndrs dies altogether
Other smaller things:
* A little refactoring, moving bindTyClTyVars from tcTyClDecl1
to tcDataDefn, tcSynRhs, etc. Clearer, reduces the number of
parameters
* Reduce the amount of swizzling required.
Specifically, bindExplicitTKBndrs_Q_Tv doesn't need
to clone a new Name for the TyVarTv, and not
cloning means that in the vasly common case,
swizzleTyConBndrs is a no-op
In detail:
Rename newTyVarTyVar --> cloneTyVarTyVar
Add newTyVarTyTyVar that doesn't clone
Use the non-cloning newTyVarTyVar in
bindExplicitTKBndrs_Q_Tv
Rename newFlexiKindedTyVarTyVar
--> cloneFlexiKindedTyVarTyVar
* Define new utility function and use it
HsDecls.familyDeclName ::
FamilyDecl (GhcPass p) -> IdP (GhcPass p)
Updates haddock submodule.
(cherry picked from commit b9605396f1f1560aea94792646b835cadcb49f45)
</pre>
</li>
</ul>
<h4>30 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#75bfcd03f3ba9315d33104fcb0424c6bfeb4e334">
compiler/GHC/Hs/Decls.hs
</a>
</li>
<li class="file-stats">
<a href="#8d8e5922fde8bc19ffa2bc9cae6b6720abb88564">
compiler/GHC/HsToCore/PmCheck/Oracle.hs
</a>
</li>
<li class="file-stats">
<a href="#d619e33ea242c71188c1a96a25ed85ab1732100f">
compiler/cmm/Cmm.hs
</a>
</li>
<li class="file-stats">
<a href="#61470c7221010080ec380a45874259d0ed73da4a">
compiler/cmm/PprC.hs
</a>
</li>
<li class="file-stats">
<a href="#2ebec45c4dd2cdcc7eea7aefee1aa1ed2abc48b1">
compiler/llvmGen/LlvmCodeGen/Data.hs
</a>
</li>
<li class="file-stats">
<a href="#f171fcd6a9b405926ab6c9973ca110af70daef3b">
compiler/prelude/PrelInfo.hs
</a>
</li>
<li class="file-stats">
<a href="#7b2a3c8a780cfa42412ee2700454599d02c3f69d">
compiler/prelude/PrelNames.hs
</a>
</li>
<li class="file-stats">
<a href="#0ceba1cc065fc4d13769caf47b225c97d54e2ffc">
compiler/prelude/TysWiredIn.hs
</a>
</li>
<li class="file-stats">
<a href="#e41a2a88012b97213e3706fe27159af08ba0bf30">
compiler/typecheck/TcHsSyn.hs
</a>
</li>
<li class="file-stats">
<a href="#350c4076427c611b8f14e875a4ca553041c2b847">
compiler/typecheck/TcHsType.hs
</a>
</li>
<li class="file-stats">
<a href="#4c1af4850cb90ab2963edb06b69b57e87ccdf9c1">
compiler/typecheck/TcInstDcls.hs
</a>
</li>
<li class="file-stats">
<a href="#367db94fc37c8c7548dbe545a5302c7a5108e41e">
compiler/typecheck/TcMType.hs
</a>
</li>
<li class="file-stats">
<a href="#bdfa0cc139f61d1236abc1598c5d684b43c357f9">
compiler/typecheck/TcTyClsDecls.hs
</a>
</li>
<li class="file-stats">
<a href="#02ab52057b25cd107220549e7027dd4c9a6ba32c">
compiler/types/TyCon.hs
</a>
</li>
<li class="file-stats">
<a href="#7d52a0d7f6cc47777a2112b358ad80dea9078a76">
<span class="new-file">
+
libraries/ghc-compact/tests/T16992.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#c9772e1df1f55ce60ad9cc09320da1c6bbe4d913">
<span class="new-file">
+
libraries/ghc-compact/tests/T16992.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#d8df9f361ffd907f41fa597e5b0638c73e9843ae">
libraries/ghc-compact/tests/all.T
</a>
</li>
<li class="file-stats">
<a href="#84507939a4554de9c515fb6ece9c30b5178af638">
rts/sm/CNF.c
</a>
</li>
<li class="file-stats">
<a href="#f398269c059fd9c8d44cc8b3c48e9da2be905555">
<span class="new-file">
+
testsuite/tests/codeGen/should_gen_asm/T18137.asm
</span>
</a>
</li>
<li class="file-stats">
<a href="#e63b7b6330152fcfabaacb1a8719667b4f164398">
<span class="new-file">
+
testsuite/tests/codeGen/should_gen_asm/T18137.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#47a3b36acbc6601cd2d1c201a9406fcb8d08d34c">
testsuite/tests/codeGen/should_gen_asm/all.T
</a>
</li>
<li class="file-stats">
<a href="#36a6579ad6acf1e0db82a8dae6edcb33d8717111">
<span class="new-file">
+
testsuite/tests/deriving/should_compile/T18055.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#e7bc29da08da2be1b3bd264c751322dc3e8c1905">
testsuite/tests/deriving/should_compile/all.T
</a>
</li>
<li class="file-stats">
<a href="#5c594a243fe4c6ec3314ffbdf9b6cf9a6c8f23dd">
testsuite/tests/partial-sigs/should_compile/ExprSigLocal.stderr
</a>
</li>
<li class="file-stats">
<a href="#2430cf6bd49f7c94008b89548971a935c1b1cd77">
testsuite/tests/partial-sigs/should_compile/SplicesUsed.stderr
</a>
</li>
<li class="file-stats">
<a href="#396a6e11945f5b15dae3aaf5293c6d36321aefa0">
testsuite/tests/partial-sigs/should_compile/T10519.stderr
</a>
</li>
<li class="file-stats">
<a href="#5bc71bc0886d0f8575f09e4641db9cc39e7882c7">
testsuite/tests/partial-sigs/should_compile/T12844.stderr
</a>
</li>
<li class="file-stats">
<a href="#f1eecc598d7f9764bf831257d1a6e1455250570e">
testsuite/tests/partial-sigs/should_compile/T13482.stderr
</a>
</li>
<li class="file-stats">
<a href="#440df5c176256febfc9ea86170fe9a6e2fe71003">
testsuite/tests/partial-sigs/should_compile/T14217.stderr
</a>
</li>
<li class="file-stats">
<a href="#1fd9911bd422ea4464eced9af36c9431a3d05a83">
testsuite/tests/partial-sigs/should_compile/T14715.stderr
</a>
</li>
</ul>
<h5>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: #777;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/compare/99e643baf247fa5276ab4199cfd5a18e4c1d76d2...ec0968e3cd6757501c6b79bdec62b16a5bafc833">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.haskell.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>