<!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>
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>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/33e37d0619a9d1d0b8088a109f7eeb4c6fd21027">33e37d06</a></strong>
<div>
<span>by Takenobu Tani</span>
<i>at 2019-06-03T02:54:43Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add `-haddock` option under ci condition to fix #16415
In order to use the `:doc` command in ghci, it is necessary
to compile for core libraries with `-haddock` option.
Especially, the `-haddock` option is essential for release building.
Note:
* The `-haddock` option may affect compile time and binary size.
* But hadrian has already set `-haddock` as the default.
* This patch affects the make-based building.
This patch has been split from !532.
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/43a39c3c2195d5b4400efc845a54f153184b1d7f">43a39c3c</a></strong>
<div>
<span>by Takenobu Tani</span>
<i>at 2019-06-03T02:54:43Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add `-haddock` to perf.mk rather than prepare-system.sh
To cover ci conditions from ghc8.6 to 8.9, I add `-haddock` option
to `mk/flavours/perf.mk` rather than `.circleci/prepare-system.sh`.
Because in windows condition of ghc-8.9, `mk/flavours/*` is included
after `prepare-system.sh`.
In addition, in linux condition of ghc-8.6, `mk/flavors/perf.mk` is used.
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/c4f94320a7048a7f263d8d952d4e12cc0227cf72">c4f94320</a></strong>
<div>
<span>by Takenobu Tani</span>
<i>at 2019-06-03T02:54:43Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Add `-haddock` to prepare-system.sh and .gitlab-ci.yml
To cover ci conditions from ghc8.6 to 8.9, I add `-haddock` option
to `.circleci/prepare-system.sh` and .gitlab-ci.yml.
after including `mk/flavours/*`.
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/799b1d26977b5841aa580e07c8f8e65356eed785">799b1d26</a></strong>
<div>
<span>by Ben Gamari</span>
<i>at 2019-06-03T02:55:18Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">gitlab-ci: Use GHC 8.6.5 for Windows CI builds
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/f70a0c42548ae67f20ad2083459cae5e8fa03709">f70a0c42</a></strong>
<div>
<span>by David Eichmann</span>
<i>at 2019-06-03T21:28:48Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">TestRunner: Added --chart to display a chart of performance tests
This uses the Chart.js javascript library.
Everything is put into a standalone .html file and opened with the
default browser.
I also simplified the text output to use the same data as the chart.
You can now use a commit range with git's ".." syntax.
The --ci option will use results from CI (you'll need to fetch them
first):
$ git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/ci/perf
$ python3 testsuite/driver/perf_notes.py --ci --chart --test-env x86_64-darwin --test-name T9630 master~500..master
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/e64fb332774ebad69cf92edd54a6d64b143dd735">e64fb332</a></strong>
<div>
<span>by Andrew Martin</span>
<i>at 2019-06-03T21:28:49Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Use a better strategy for determining the offset applied to foreign function arguments that have an unlifted boxed type. We used to use the type of the argument. We now use the type of the foreign function. Add a test to confirm that the roundtrip conversion between an unlifted boxed type and Any is sound in the presence of a foreign function call.
</pre>
</li>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/30adfea0c58166149bd3804b8622f8e794565889">30adfea0</a></strong>
<div>
<span>by Alp Mestanogullari</span>
<i>at 2019-06-03T21:28:52Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Hadrian: fix OSX build failure and add an OSX/Hadrian CI job
The OSX build failure introduced in 3aa71a22 was due to a change in the
glob we use to collect libffi shared libraries in hadrian/src/Rules/Libffi.hs.
This commit fixes the problem and adds an OSX CI job that builds GHC with
Hadrian, to make sure we don't break it again.
</pre>
</li>
</ul>
<h4>30 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#45c43932d0fb2a4ffce85cea15daa18255dc546d">
.circleci/prepare-system.sh
</a>
</li>
<li class="file-stats">
<a href="#587d266bb27a4dc3022bbed44dfa19849df3044c">
.gitlab-ci.yml
</a>
</li>
<li class="file-stats">
<a href="#c569fe5eb9284314e129c104f265fe360a4b1d3d">
compiler/codeGen/StgCmmExpr.hs
</a>
</li>
<li class="file-stats">
<a href="#ae667aa599c96310c85c0258e4e7d72b00275ae5">
compiler/codeGen/StgCmmForeign.hs
</a>
</li>
<li class="file-stats">
<a href="#731b07c16b2f4bb31dd7defa4ceef54e74473cc7">
compiler/codeGen/StgCmmPrim.hs
</a>
</li>
<li class="file-stats">
<a href="#268617cbbb60bb1447a471b156b77fb5b7ff05cc">
compiler/stgSyn/CoreToStg.hs
</a>
</li>
<li class="file-stats">
<a href="#da0b7b01ca96b39115ee464b3e723c9fd3df8136">
compiler/stgSyn/StgSyn.hs
</a>
</li>
<li class="file-stats">
<a href="#b526b637050952b6307a0695885c438f0db312d2">
hadrian/src/Rules/Libffi.hs
</a>
</li>
<li class="file-stats">
<a href="#a3920077cc322e6cf985dd0b96ea48fa2b566dae">
<span class="new-file">
+
testsuite/driver/js/Chart-2.8.0.min.js
</span>
</a>
</li>
<li class="file-stats">
<a href="#b0f70b2f033dbb3a5f97abdab7d98ccc0111c529">
<span class="new-file">
+
testsuite/driver/js/tooltip.js
</span>
</a>
</li>
<li class="file-stats">
<a href="#6e9e255267780d64d50e2445aee2360e1269dcf1">
testsuite/driver/perf_notes.py
</a>
</li>
<li class="file-stats">
<a href="#c591f85f122007bac88228c5ff6fd76b40e6a811">
testsuite/driver/testlib.py
</a>
</li>
<li class="file-stats">
<a href="#f7e2e917dfdc5406b5ef1180f10be0a2973586c1">
testsuite/driver/testutil.py
</a>
</li>
<li class="file-stats">
<a href="#a7e5813f0bf3dd985b53ad4d03db88386dd4c99f">
<span class="new-file">
+
testsuite/tests/ffi/should_compile/ReducingFfiSignature.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#2d522582226c5b506f235d327c55398645c7877c">
testsuite/tests/ffi/should_compile/all.T
</a>
</li>
<li class="file-stats">
<a href="#c148e2393c0c59e15b422e561ec8182d89aaaea0">
<span class="new-file">
+
testsuite/tests/ffi/should_fail/NonreducingFfiSignature.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#f817bc0e574a53bbd4547e74fb30876ce7c9559e">
<span class="new-file">
+
testsuite/tests/ffi/should_fail/NonreducingFfiSignature.stderr
</span>
</a>
</li>
<li class="file-stats">
<a href="#959604952ad853722a516e17c23d0cf7a5aa7815">
testsuite/tests/ffi/should_fail/all.T
</a>
</li>
<li class="file-stats">
<a href="#ac5631f34010f408a6ba390a97385726d3e1bf0e">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650a.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#4d2d59cc53760e43a02f436de1c11670d264e133">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650a.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#e1e9c1dbdb856798dfd55469d8b8158db35128b8">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650a_c.c
</span>
</a>
</li>
<li class="file-stats">
<a href="#15e06e98c80167eeb2f4865df32f52f8dd4a027a">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650b.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#004a6787d0b874142497e2e3eb2ef9680587b87a">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650b.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#cbdb500ea44f8e79a26002d89bb9498917705584">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650b_c.c
</span>
</a>
</li>
<li class="file-stats">
<a href="#3078312f527c4d01c4785687ab3c900d52b424dc">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650c.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#ff673ac0f2860f6a6d0c3697ca0f289bc98cf63b">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650c.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#d3dc8c6cbc46cd21172fee7060f3698d7526c30d">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650c_c.c
</span>
</a>
</li>
<li class="file-stats">
<a href="#84963a6e62c5eb5c328d4fcde3c495f3e2b80f24">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650d.hs
</span>
</a>
</li>
<li class="file-stats">
<a href="#e4ec1949d3cab2e24fda47e4fcfac3cea5c1ce68">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650d.stdout
</span>
</a>
</li>
<li class="file-stats">
<a href="#bbfeedf06c623aa0f3f487c2956212e97568a447">
<span class="new-file">
+
testsuite/tests/ffi/should_run/T16650d_c.c
</span>
</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/788c8723fbee7e0e8a451ff0cab1b7ca434830e8...30adfea0c58166149bd3804b8622f8e794565889">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>