[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 17 commits: gitlab-ci: Disable darwin hadrian job

Fri Jun 7 08:40:05 UTC 2019

 Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:
567894b4 by Matthew Pickering at 2019-06-07T08:36:32Z
gitlab-ci: Disable darwin hadrian job

See #16771

We don't have enough capacity for the two jobs currently.

[skip ci]

- - - - -
91ceb3c0 by Andrew Martin at 2019-06-07T08:39:39Z
[skip ci] Improve the documentation of the CNF primops. In this context, the term "size" is ambiguous and is now avoided. Additionally, the distinction between a CNF and the blocks that comprise it has been emphasize. The vocabulary has been made more consistent with the vocabulary in the C source for CNF.

- - - - -
e4586d44 by Sebastian Graf at 2019-06-07T08:39:40Z
TmOracle: Replace negative term equalities by refutable PmAltCons

The `PmExprEq` business was a huge hack and was at the same time vastly
too powerful and not powerful enough to encode negative term equalities,
i.e. facts of the form "forall y. x ≁ Just y".

This patch introduces the concept of 'refutable shapes': What matters
for the pattern match checker is being able to encode knowledge of the
kind "x can no longer be the literal 5". We encode this knowledge in a
`PmRefutEnv`, mapping a set of newly introduced `PmAltCon`s (which are
just `PmLit`s at the moment) to each variable denoting above
inequalities.

So, say we have `x ≁ 42 ∈ refuts` in the term oracle context and
try to solve an equality like `x ~ 42`. The entry in the refutable
environment will immediately lead to a contradiction.

This machinery renders the whole `PmExprEq` and `ComplexEq` business
unnecessary, getting rid of a lot of (mostly dead) code.

See the Note [Refutable shapes] in TmOracle for a place to start.

Metric Decrease:
    T11195

- - - - -
cd396413 by Matthew Pickering at 2019-06-07T08:39:40Z
Add HEAP_PROF_SAMPLE_END event to mark end of samples

This allows a user to observe how long a sampling period lasts so that
the time taken can be removed from the profiling output.

Fixes #16697

- - - - -
f7c88182 by Roland Senn at 2019-06-07T08:39:42Z
Fix #16700: Tiny errors in output of GHCi commands :forward and :info

`:info Coercible` now outputs the correct section number of the GHCi User's guide together with the secion title.

`:forward x` gives the correct syntax hint.

- - - - -
7c14bb6f by John Ericson at 2019-06-07T08:39:47Z
Factor out 'getLibDir' / 'getBaseDir' into a new GHC.BaseDir ghc-boot module

ghc-pkg and ghc already both needed this. I figure it is better to
deduplicate, especially seeing that changes to one (FreeBSD CPP) didn't
make it to the other.

Additionally in !1090 I make ghc-pkg look up the settings file, which
makes it use the top dir a bit more widely. If that lands, any
difference in the way they find the top dir would be more noticable.

That change also means sharing more code between ghc and ghc-package
(namely the settings file parsing code), so I'd think it better to get
off the slipperly slope of duplicating code now.

- - - - -
773994df by Simon Peyton Jones at 2019-06-07T08:39:47Z
Preserve ShadowInfo when rewriting evidence

When the canonicaliser rewrites evidence of a Wanted, it
should preserve the ShadowInfo (ctev_nosh) field.  That is,
a WDerive should rewrite to WDerive, and WOnly to WOnly.

Previously we were unconditionally making a WDeriv, thereby
rewriting WOnly to WDeriv.  This bit Nick Frisby (issue #16735)
in the context of his plugin, but we don't have a compact test
case.

The fix is simple, but does involve a bit more plumbing,
to pass the old ShadowInfo around, to use when building
the new Wanted.

- - - - -
4fefa798 by Ben Gamari at 2019-06-07T08:39:48Z
Hadrian: Delete target symlink in createFileLinkUntracked

Previously createFileLinkUntracked would fail if the symlink already
existed.

- - - - -
af9aedf8 by Simon Jakobi at 2019-06-07T08:39:51Z
Fix isValidNatural: The BigNat in NatJ# must have at least 2 limbs

Previously the `integer-gmp` variant of `isValidNatural` would fail to
detect values `<= maxBound::Word` that were incorrectly encoded using
the `NatJ#` constructor.

- - - - -
51c28874 by Moritz Angermann at 2019-06-07T08:39:51Z
llvm-targets: Add x86_64 android layout

- - - - -
b59611ad by code5hot at 2019-06-07T08:39:52Z
Update Traversable.hs with a note about an intuitive law
- - - - -
398dd8c7 by code5hot at 2019-06-07T08:39:52Z
Used terminology from a paper. Added it as a reference.
- - - - -
106133a9 by code5hot at 2019-06-07T08:39:52Z
remove backticks from markup - it doesn't mean what I think it means
- - - - -
6bc404c1 by Zejun Wu at 2019-06-07T08:39:54Z
Pass preprocessor options to C compiler when building foreign C files (#16737)

- - - - -
532c4543 by Ben Gamari at 2019-06-07T08:39:55Z
base: Export Finalizers

As requested in #16750.

- - - - -
a1e0296d by Alp Mestanogullari at 2019-06-07T08:39:57Z
Hadrian: use deb9 Docker images instead of deb8 for CI jobs

This should fix #16739, where we seem to be getting extra carets in
a test's output because of the gcc that ships with the deb8 image,
whule we're not observing those extra carets in the deb9-based (Make)
jobs.

- - - - -
ed03ee3f by Ben Gamari at 2019-06-07T08:39:58Z
gitlab-ci: Create index.html in documentation deployment

Otherwise navigating to https://ghc.gitlab.haskell.org/ghc will result
in a 404.

- - - - -

30 changed files:

- .gitlab-ci.yml
- compiler/basicTypes/NameEnv.hs
- compiler/deSugar/Check.hs
- compiler/deSugar/DsMonad.hs
- compiler/deSugar/PmExpr.hs
- + compiler/deSugar/PmPpr.hs
- compiler/deSugar/TmOracle.hs
- compiler/ghc.cabal.in
- compiler/main/DriverPipeline.hs
- compiler/main/SysTools/BaseDir.hs
- compiler/prelude/PrelInfo.hs
- compiler/prelude/primops.txt.pp
- compiler/typecheck/TcCanonical.hs
- compiler/typecheck/TcEvidence.hs
- compiler/typecheck/TcRnTypes.hs
- compiler/typecheck/TcSMonad.hs
- compiler/utils/ListSetOps.hs
- docs/users_guide/eventlog-formats.rst
- ghc/GHCi/UI.hs
- hadrian/src/Hadrian/Utilities.hs
- includes/rts/EventLogFormat.h
- libraries/base/Data/Traversable.hs
- libraries/base/GHC/ForeignPtr.hs
- libraries/base/GHC/Natural.hs
- libraries/base/changelog.md
- libraries/base/tests/all.T
- + libraries/base/tests/isValidNatural.hs
- + libraries/base/tests/isValidNatural.stdout
- + libraries/ghc-boot/GHC/BaseDir.hs
- libraries/ghc-boot/ghc-boot.cabal.in

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/e0cef1b84ad55ec13e8920a8ae7b93f0b574f40b...ed03ee3f7c9c919ed679e35beddba901fea0fa56

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/e0cef1b84ad55ec13e8920a8ae7b93f0b574f40b...ed03ee3f7c9c919ed679e35beddba901fea0fa56
You're receiving this email because of your account on gitlab.haskell.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190607/e485cf9c/attachment-0001.html>