ghc.git
16 months agoRename iserv-slave to remote-iserv wip/angerman/win32-cross
Moritz Angermann [Thu, 8 Mar 2018 06:00:44 +0000 (14:00 +0800)] 
Rename iserv-slave to remote-iserv

16 months agoCleanup LD detection.
Moritz Angermann [Thu, 8 Mar 2018 03:12:46 +0000 (11:12 +0800)] 
Cleanup LD detection.

16 months agoAssume `C:` to be system libraries on windows.
Moritz Angermann [Wed, 7 Mar 2018 05:38:44 +0000 (13:38 +0800)] 
Assume `C:` to be system libraries on windows.

16 months agoBetter logging in iserv-remote
Moritz Angermann [Wed, 7 Mar 2018 05:38:28 +0000 (13:38 +0800)] 
Better logging in iserv-remote

16 months agoAdds iserv-slave (via CLI)
Moritz Angermann [Wed, 7 Mar 2018 05:38:09 +0000 (13:38 +0800)] 
Adds iserv-slave (via CLI)

16 months agoAdds iserv-proxy/cabal.project
Moritz Angermann [Wed, 7 Mar 2018 03:01:23 +0000 (11:01 +0800)] 
Adds iserv-proxy/cabal.project

16 months agoMove `iserv` into `utils` and change package name from `iserv-bin` to `iserv`
Moritz Angermann [Thu, 22 Feb 2018 08:53:35 +0000 (16:53 +0800)] 
Move `iserv` into `utils` and change package name from `iserv-bin` to `iserv`

Summary:
This is done for consistency. We usually call the package file the same name the
folder has.  The move into `utils` is done so that we can move the library into
`libraries/iserv` and the proxy into `utils/iserv-proxy` and then break the
`iserv.cabal` apart.  This will make building the cross compiler with TH
simpler, because we can build the library and proxy as separate packages.

Test Plan: ./validate

Reviewers: bgamari, goldfire, erikd

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4436

16 months agoadds .gitignore
Moritz Angermann [Thu, 15 Feb 2018 05:54:55 +0000 (13:54 +0800)] 
adds .gitignore

16 months agotemp fix Makefile
Moritz Angermann [Thu, 15 Feb 2018 04:29:14 +0000 (12:29 +0800)] 
temp fix Makefile

16 months agoMove `iserv` into `utils` and change package name from `iserv-bin` to `iserv`
Moritz Angermann [Sat, 25 Nov 2017 07:10:52 +0000 (15:10 +0800)] 
Move `iserv` into `utils` and change package name from `iserv-bin` to `iserv`

This is done for consistency. We usually call the package file the same name the
folder has.  The move into `utils` is done so that we can move the library into
`libraries/iserv` and the proxy into `utils/iserv-proxy` and then break the
`iserv.cabal` apart.  This will make building the cross compiler with TH
simpler, because we can build the library and proxy as separate packages.

# Conflicts:
# utils/iserv-proxy/iserv-proxy.cabal

16 months agoBump Cabal submodule
Ben Gamari [Sat, 10 Mar 2018 18:47:51 +0000 (13:47 -0500)] 
Bump Cabal submodule

16 months agoRemove splitEithers, use partitionEithers from base
Ömer Sinan Ağacan [Mon, 12 Mar 2018 07:54:17 +0000 (10:54 +0300)] 
Remove splitEithers, use partitionEithers from base

16 months agotestsuite: disable T13615 on non-smp targets
Sergei Trofimovich [Sat, 10 Mar 2018 12:33:59 +0000 (12:33 +0000)] 
testsuite: disable T13615 on non-smp targets

T13615 needs multicore support from RTS:
    T13615: unknown RTS option: -N15

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
16 months agoFix a debug print in disassembler (#14905)
Ömer Sinan Ağacan [Fri, 9 Mar 2018 12:38:58 +0000 (15:38 +0300)] 
Fix a debug print in disassembler (#14905)

When interpreter is not profiled (see `interpreterProfiled` in
`DynFlags`) bytecode generator generates a NULL pointer as the cost
centre of a `BRK_FUN` instruction:

    let cc | interpreterProfiled dflags = cc_arr ! tick_no
           | otherwise = toRemotePtr nullPtr
    let breakInstr = BRK_FUN (fromIntegral tick_no) (getUnique this_mod) cc
    return $ breakInstr `consOL` code

We now take this into account when disassembling `BRK_FUN`.

Reviewers: bgamari, simonmar, erikd

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4490

16 months agoUNREG: fix implicit declarations from pdep and pext
Sergei Trofimovich [Fri, 9 Mar 2018 17:43:01 +0000 (17:43 +0000)] 
UNREG: fix implicit declarations from pdep and pext

Unreg build failed as:

  $ ./configure --enable-unregisterised
  $ make

  HC [stage 1] libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.o
    ghc_1.hc: In function 'ghczmprim_GHCziPrimopWrappers_pdep8zh_entry':

    ghc_1.hc:1810:9: error:
     error: implicit declaration of function 'hs_pdep8'; did you mean 'hs_ctz8'?
       [-Werror=implicit-function-declaration]
     _c3jz = hs_pdep8(*Sp, Sp[1]);
             ^~~~~~~~
             hs_ctz8
       |
  1810 | _c3jz = hs_pdep8(*Sp, Sp[1]);
       |         ^

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
16 months agoCompacted arrays are pinned for isByteArrayPinned#
Simon Marlow [Thu, 8 Mar 2018 08:54:01 +0000 (08:54 +0000)] 
Compacted arrays are pinned for isByteArrayPinned#

Test Plan: New unit test

Reviewers: andrewthad, niteria, bgamari, erikd

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14900

Differential Revision: https://phabricator.haskell.org/D4485

16 months agoconfigure: Accept suffix in OpenBSD triple's OS name
Ben Gamari [Thu, 8 Mar 2018 18:29:01 +0000 (13:29 -0500)] 
configure: Accept suffix in OpenBSD triple's OS name

Reviewers: hvr

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D4483

16 months agoRemove outdated documentation bits concerning -Wmissing-methods
Ryan Scott [Thu, 8 Mar 2018 18:23:27 +0000 (13:23 -0500)] 
Remove outdated documentation bits concerning -Wmissing-methods

In commit 503219e3e1667ac39607021b2d9586260fbab32b, we
stopped suppressing `-Wmissing-methods` warnings on class methods
whose names begin with an underscore. However, it seems the users'
guide documentation concerning this was never updated. Let's do so.

Test Plan: Read it

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #12959

Differential Revision: https://phabricator.haskell.org/D4476

16 months agoghc-prim: Silence -Wsync-nand warning in atomic.c
Ben Gamari [Thu, 8 Mar 2018 18:22:37 +0000 (13:22 -0500)] 
ghc-prim: Silence -Wsync-nand warning in atomic.c

GCC throws this warning to inform us that __sync_fetch_and_nand's
behavior changed in GCC 4.4. However, this causes the build to fail when
-Werror is used.

Test Plan: Validate with -Werror

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4481

16 months agoghc-prim: Reduce scope of Clang sync_fetch_and_nand workaround
Ben Gamari [Thu, 8 Mar 2018 18:22:22 +0000 (13:22 -0500)] 
ghc-prim: Reduce scope of Clang sync_fetch_and_nand workaround

As described in https://bugs.llvm.org/show_bug.cgi?id=8842, Clang
removed the __sync_fetch_and_nand builtins due to inconsistency in GCC's
behavior in 2010.  However, GCC has since clarified the behavior of
their builtins and consequently Clang re-added them in 2014.
Consequently this workaround should no longer be necessary.

Test Plan: Validate building with Clang

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4480

16 months agoError message and doc improvements for #14335
Ömer Sinan Ağacan [Thu, 8 Mar 2018 18:19:33 +0000 (13:19 -0500)] 
Error message and doc improvements for #14335

- Show a more friendly error message when -fplugin is used with
  -fexternal-interpreter

- Add a few words to users guide about the interaction with -fplugin and
  -fexternal-interpreter

- Update test for #14335

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14335

Differential Revision: https://phabricator.haskell.org/D4456

16 months agoRevert "GHCi: Don't remove shadowed bindings from typechecker scope."
Ömer Sinan Ağacan [Thu, 8 Mar 2018 18:42:22 +0000 (21:42 +0300)] 
Revert "GHCi: Don't remove shadowed bindings from typechecker scope."

This reverts commit 59d7ee53906b9cee7f279c1f9567af7b930f8636 and enables
the test for #14052.

(See #14052 for the discussion)

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14052

Differential Revision: https://phabricator.haskell.org/D4478

16 months agoAdd -fexternal-dynamic-refs
Simon Marlow [Wed, 28 Feb 2018 19:03:37 +0000 (11:03 -0800)] 
Add -fexternal-dynamic-refs

Summary:
The `-dynamic` flag does two things:

* In the code generator, it generates code designed to link against
  external shared libraries.  References outside of the current module
  go through platform-specific indirection tables (e.g. the GOT on ELF).

* It enables a "way", which changes which hi files we look
  for (`Foo.dyn_hi`) and which libraries we link against.

Some specialised applications want the first of these without the
second. (I could go into detail here but it's probably not all that
important).

This diff splits out the code-generation effects of `-dynamic` from the
"way" parts of its behaviour, via a new flag `-fexternal-dynamic-refs`.

Test Plan: validate

Reviewers: niteria, bgamari, erikd

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4477

16 months agoFix typo in description of -V RTS flag
Tej Chajed [Tue, 6 Mar 2018 18:46:01 +0000 (13:46 -0500)] 
Fix typo in description of -V RTS flag

16 months agoUsers Guide: Add that --numa is available on Windows too
Simon Jakobi [Mon, 5 Mar 2018 05:19:20 +0000 (06:19 +0100)] 
Users Guide: Add that --numa is available on Windows too

Windows support was added in c93813d96b1da53a2ebd9c9ac5af6cc3e3443c43

16 months agoFix a typo about pattern synonyms in documentation.
HE, Tao [Mon, 5 Mar 2018 15:52:29 +0000 (23:52 +0800)] 
Fix a typo about pattern synonyms in documentation.

16 months agoUse docker images with non-root user
mrkkrp [Wed, 28 Feb 2018 09:33:59 +0000 (16:33 +0700)] 
Use docker images with non-root user

That image creates an unprivileged user to run the test suite under.

16 months agoSchedule.c: remove unreachable code block
Ömer Sinan Ağacan [Wed, 7 Mar 2018 11:34:46 +0000 (14:34 +0300)] 
Schedule.c: remove unreachable code block

16 months agoAdd bindist-list.uniq to .gitignore
Ömer Sinan Ağacan [Wed, 7 Mar 2018 10:01:20 +0000 (13:01 +0300)] 
Add bindist-list.uniq to .gitignore

16 months agoAdd perf test for #14052
Ömer Sinan Ağacan [Wed, 7 Mar 2018 08:52:05 +0000 (11:52 +0300)] 
Add perf test for #14052

16 months agoFix interpreter with profiling
Simon Marlow [Mon, 5 Mar 2018 20:12:57 +0000 (15:12 -0500)] 
Fix interpreter with profiling

This was broken by D3746 and/or D3809, but unfortunately we didn't
notice because CI at the time wasn't building the profiling way.

Test Plan:
```
cd testsuite/test/profiling/should_run
make WAY=ghci-ext-prof
```

Reviewers: bgamari, michalt, hvr, erikd

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14705

Differential Revision: https://phabricator.haskell.org/D4437

16 months agoBump nofib submodule
Ben Gamari [Mon, 5 Mar 2018 20:30:25 +0000 (15:30 -0500)] 
Bump nofib submodule

16 months agoMake accumArray and accum stricter
David Feuer [Mon, 5 Mar 2018 20:18:05 +0000 (15:18 -0500)] 
Make accumArray and accum stricter

`accumArray` was lazier than documented. `accum` did not have
documented strictness. The extra laziness allowed thunks to build
up in the array. Force the results of applying the accumulating
function to resolve.

Reviewers: hvr, bgamari

Reviewed By: bgamari

Subscribers: alpmestan, rwbarton, thomie, carter

GHC Trac Issues: #14785

Differential Revision: https://phabricator.haskell.org/D4403

16 months agocmm/: Avoid using lazy left folds
Michal Terepeta [Mon, 5 Mar 2018 20:16:02 +0000 (15:16 -0500)] 
cmm/: Avoid using lazy left folds

This basically replaces all uses of `foldl` with `foldl'`. I've looked
at all the call sites and there doesn't seem to be any reason to prefer
the lazy version.

Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
Test Plan: ./validate

Reviewers: bgamari, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4463

16 months agoCorrect -g flag description
Bartosz Nitka [Mon, 5 Mar 2018 19:10:11 +0000 (11:10 -0800)] 
Correct -g flag description

Since 7aaeaf81ea95c36fe1dc4da449cf6092a792fd09
`-g1` and `-g2` are actually different.
The tutorial below is correct.

Test Plan: harbormaster

Reviewers: bgamari, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4471

16 months agoAllow top level ticked string literals
Bartosz Nitka [Fri, 2 Mar 2018 13:33:07 +0000 (05:33 -0800)] 
Allow top level ticked string literals

This reverts f5b275a239d2554c4da0b7621211642bf3b10650
and changes the places that looked for `Lit (MachStr _))`
to use `exprIsMbTickedLitString_maybe` to unwrap ticks as
necessary.
Also updated relevant comments.

Test Plan:
I added 3 new tests that previously reproduced.
GHC HEAD now builds with -g

Reviewers: simonpj, simonmar, bgamari, hvr, goldfire

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14779

Differential Revision: https://phabricator.haskell.org/D4470

16 months agoSchedule.c: remove a redundant CPP guard
Ömer Sinan Ağacan [Tue, 6 Mar 2018 11:16:00 +0000 (14:16 +0300)] 
Schedule.c: remove a redundant CPP guard

(the CPP guard is already wrapped with the same guard in line 1549)

16 months agoadd CCX=$(CXX) to integer-gmp
Moritz Angermann [Tue, 6 Mar 2018 03:20:22 +0000 (11:20 +0800)] 
add CCX=$(CXX) to integer-gmp

Summary:
This came up when trying to build GHC HEAD with nix. We
do not set CCX for integer-gmp when running ./configure. We do
this however for libffi.

The result is, that if CCX is not set, we default to the system
one, of which there might be none (as in nixos's case).  This
will not show on a debian+nix or similar setup, where the system
`cxx` is still in place, and only shows up when the system tries
hard to sandbox everything (even cxx) as nixOS does.

We use `CXX`, which is set to either `clang` or `CC_STAGE1`, and
also usedfor `CC`, similar to what we do for libffi.c

Test Plan: ./validate

Reviewers: bgamari, hvr

Reviewed By: hvr

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4473

16 months ago`--via-asm` only for windows targets
Moritz Angermann [Mon, 5 Mar 2018 09:18:25 +0000 (17:18 +0800)] 
`--via-asm` only for windows targets

Reviewers: trofi, bgamari

Reviewed By: trofi, bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4467

16 months agoFixup include of gmp/config.mk to use new location
Herbert Valerio Riedel [Mon, 5 Mar 2018 20:13:28 +0000 (21:13 +0100)] 
Fixup include of gmp/config.mk to use new location

This wasn't spotted rightaway in
8f0b2f5eadf0fcb47c581907205a9db686214a69
because the include-site deliberately ignored include-errors as
a Hack with the justification below:

> Hack. The file gmp/config.mk doesn't exist yet after running ./configure in
> the toplevel (ghc) directory. To let some toplevel make commands such as
> sdist go through, right after ./configure, don't consider this an error.

This may have contributed to #14891.

16 months agoSimplify rnLHsInstType
Simon Peyton Jones [Mon, 5 Mar 2018 14:40:37 +0000 (14:40 +0000)] 
Simplify rnLHsInstType

This patch is preparatory for the main fix for Trac #13324

Here, we simplify rnLHsInstType so that it does not try
to figure out the class name.  This turns out to have a good
(rather than bad) effect on error messages, and it prepares
the way for the main event.

Plus, less code!

16 months agoFix #14888 by adding more special cases for ArrowT
Ryan Scott [Mon, 5 Mar 2018 13:57:04 +0000 (08:57 -0500)] 
Fix #14888 by adding more special cases for ArrowT

Summary:
There were previously some situations where `(->)` would
not be desugared or reified as `ArrowT`, leading to various oddities
such as those observed in #14888. We now uniformly treat `(->)` as
`ArrowT` in Template Haskell–world by checking for any tycon that
has the same name as `(->)`, and converting that to `ArrowT`.

Test Plan: make test TEST=T14888

Reviewers: goldfire, bgamari, simonpj

Reviewed By: goldfire, simonpj

Subscribers: simonpj, rwbarton, thomie, carter

GHC Trac Issues: #14888

Differential Revision: https://phabricator.haskell.org/D4466

16 months agoRespect Note [The tcType invariant]
Simon Peyton Jones [Fri, 2 Mar 2018 17:26:58 +0000 (17:26 +0000)] 
Respect Note [The tcType invariant]

I tried to do this with

    commit 0a12d92a8f65d374f9317af2759af2b46267ad5c
    Author: Simon Peyton Jones <simonpj@microsoft.com>
    Date:   Wed Dec 13 12:53:26 2017 +0000

    Further improvements to well-kinded types

    The typechecker has the invariant that every type should be well-kinded
    as it stands, without zonking.  See Note [The well-kinded type invariant]
    in TcType.

    That invariant was not being upheld, which led to Trac #14174.  I fixed
    part of it, but T14174a showed that there was more.  This patch finishes
    the job.

But I didn't get it quite right as Trac #14873 showed.

This patch fixes the problem; although I am still a bit unhappy.
(See "A worry" in the HsApp case of tc_infer_hs_type.)

16 months agoWombling around in Trac #14808
Simon Peyton Jones [Fri, 2 Mar 2018 17:12:03 +0000 (17:12 +0000)] 
Wombling around in Trac #14808

Comment:4 in Trac #14808 explains why I'm unhappy with the current
state of affairs -- at least the lack of documentation.

This smallpatch does nothing major:

* adds comments
* uses existing type synonyms more (notably FreeKiTyVarsWithDups)
* adds another test case to T14808

16 months agoBump Cabal submodule
Ben Gamari [Sun, 4 Mar 2018 03:05:44 +0000 (22:05 -0500)] 
Bump Cabal submodule

16 months agoBump Cabal submodule to 2.2
Moritz Angermann [Sat, 3 Mar 2018 21:16:41 +0000 (16:16 -0500)] 
Bump Cabal submodule to 2.2

Requires some ghc-cabal changes as well.

Test Plan: ./validate

Reviewers: hvr, bgamari

Reviewed By: bgamari

Subscribers: hsyl20, erikd, alpmestan, rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4453

16 months agoBump hsc2hs submodule
Moritz Angermann [Sun, 4 Mar 2018 02:37:58 +0000 (10:37 +0800)] 
Bump hsc2hs submodule

This should have been part of 5f6fcf78.

16 months agoParenthesize (() :: Constraint) in argument position
Ryan Scott [Sat, 3 Mar 2018 18:48:38 +0000 (13:48 -0500)] 
Parenthesize (() :: Constraint) in argument position

Summary:
A simple oversight in the pretty-printer lead to a special
case for `() :: Constraint` not being parenthesized correctly when
used in an argument position. Easily fixed with a `maybeParen`.

Test Plan: make test TEST=T14796

Reviewers: alanz, goldfire, bgamari, simonpj

Reviewed By: bgamari, simonpj

Subscribers: simonpj, rwbarton, thomie, carter

GHC Trac Issues: #14796

Differential Revision: https://phabricator.haskell.org/D4408

16 months agoFix the coverage checker's treatment of existential tyvars
Ryan Scott [Fri, 2 Mar 2018 21:18:04 +0000 (16:18 -0500)] 
Fix the coverage checker's treatment of existential tyvars

Previously, the pattern-match coverage checker was far too
eager to freshen the names of existentially quantified type
variables, which led to incorrect sets of type constraints that
misled GHC into thinking that certain programs that involve nested
GADT pattern matches were non-exhaustive (when in fact they were).
Now, we generate extra equality constraints in the ConCon case of
the coverage algorithm to ensure that these fresh tyvars align
with existing existential tyvars. See
`Note [Coverage checking and existential tyvars]` for the full story.

Test Plan: make test TEST="T11984 T14098"

Reviewers: gkaracha, bgamari, simonpj

Reviewed By: simonpj

Subscribers: simonpj, rwbarton, thomie, carter

GHC Trac Issues: #11984, #14098

Differential Revision: https://phabricator.haskell.org/D4434

16 months agoCorrect default -A value in RTS flag usage info
Simon Jakobi [Fri, 2 Mar 2018 21:17:44 +0000 (16:17 -0500)] 
Correct default -A value in RTS flag usage info

Reviewers: bgamari, erikd, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4441

16 months agodoCorePass: Expand catch-all
Simon Jakobi [Fri, 2 Mar 2018 21:17:12 +0000 (16:17 -0500)] 
doCorePass: Expand catch-all

This doesn't remedy problem, but at least it's more explicit than
the catch-all

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14544

Differential Revision: https://phabricator.haskell.org/D4435

16 months agoCompile with `--via-asm` when cross compiling.
Moritz Angermann [Fri, 2 Mar 2018 21:16:52 +0000 (16:16 -0500)] 
Compile with `--via-asm` when cross compiling.

This bumps `hsc2hs` and adds the new `--via-asm` flag,
which allows to successfully cross compile the win32
lirbary.

- Compile with `--via-asm` when cross compiling. This requires
haskell/hsc2hs#5 (https://github.com/haskell/hsc2hs/pull/5)

Test Plan: ./validate

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4439

16 months agoFix #14838 by marking TH-spliced code as FromSource
Ryan Scott [Fri, 2 Mar 2018 21:16:17 +0000 (16:16 -0500)] 
Fix #14838 by marking TH-spliced code as FromSource

Previously, any Template Haskell code that was spliced would
be marked as `Generated`, which would completely suppress pattern-
match coverage warnings for it, which several folks found confusing.
Indeed, Template Haskell-spliced code is "source" code in some sense,
as users specifically request that it be put into their program, so
changing its designation to `FromSource` makes sense from that
perspective.

Test Plan: make test TEST=T14838

Reviewers: goldfire, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14838

Differential Revision: https://phabricator.haskell.org/D4440

16 months agoPermit conversion of partially applied PromotedTupleTs
Ryan Scott [Fri, 2 Mar 2018 21:15:38 +0000 (16:15 -0500)] 
Permit conversion of partially applied PromotedTupleTs

Summary:
We were simply missing a case in `Convert` for when have a
`PromotedTupleT` that wasn't fully saturated. Easily fixed.

Test Plan: make test TEST=T14843

Reviewers: goldfire, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14843

Differential Revision: https://phabricator.haskell.org/D4442

16 months agoAdds *-cross-ncg flavour.
Moritz Angermann [Fri, 2 Mar 2018 21:15:09 +0000 (16:15 -0500)] 
Adds *-cross-ncg flavour.

Our *-cross flavours force -fllvm, this adds flavours for cross
compilation to x86_64, where we can use our native code generator.

Test Plan: ./validate

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4443

16 months agoAdd Applicative, Semigroup, and Monoid instances in GHC.Generics
Lysxia [Fri, 2 Mar 2018 21:14:36 +0000 (16:14 -0500)] 
Add Applicative, Semigroup, and Monoid instances in GHC.Generics

Reviewers: hvr, bgamari, alpmestan, RyanGlScott

Reviewed By: RyanGlScott

Subscribers: RyanGlScott, rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4447

16 months agoconfigure: Enable LD_NO_GOLD is set in all codepaths
Ben Gamari [Fri, 2 Mar 2018 21:13:53 +0000 (16:13 -0500)] 
configure: Enable LD_NO_GOLD is set in all codepaths

Test Plan: `./configure --disable-ld-override; make; make install`

Reviewers: trofi, hvr

Reviewed By: trofi

Subscribers: rwbarton, thomie, erikd, carter, simonmar

GHC Trac Issues: #14675

Differential Revision: https://phabricator.haskell.org/D4448

16 months agorts/win32: Assert that the IO manager has been initialised
Simon Jakobi [Fri, 2 Mar 2018 21:13:26 +0000 (16:13 -0500)] 
rts/win32: Assert that the IO manager has been initialised

Reviewers: bgamari, erikd, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4450

16 months agoAdd @since annotations for derived instances in base
Chaitanya Koparkar [Fri, 2 Mar 2018 21:12:56 +0000 (16:12 -0500)] 
Add @since annotations for derived instances in base

Test Plan: ./validate

Reviewers: hvr, goldfire, bgamari, RyanGlScott

Reviewed By: RyanGlScott

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #11767

Differential Revision: https://phabricator.haskell.org/D4452

16 months agoImprove missing-home-modules warning formatting
Matthew Pickering [Fri, 2 Mar 2018 21:12:22 +0000 (16:12 -0500)] 
Improve missing-home-modules warning formatting

Previously the modules were smashed together at the end of the line. As
the header is quite long, this meant for quite long lines which wrapped
on smaller terminals.

err msg: A
         B

Now they are nested underneath the long first line of the error message.

err msg:
  A
  B

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4454

16 months agoGHCi info: Use src file for cache invalidation
alexbiehl [Fri, 2 Mar 2018 21:11:45 +0000 (16:11 -0500)] 
GHCi info: Use src file for cache invalidation

Prior to this patch GHCi used the modification time of a module's object
file to invalidate the info cache.

We now look at the modification time of the source file, if present.

This addresses part of
https://ghc.haskell.org/trac/ghc/ticket/12706#comment:3.

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: lelf, alpmestan, rwbarton, thomie, carter

GHC Trac Issues: #12706

Differential Revision: https://phabricator.haskell.org/D4459

16 months agoDynFlags: Support British spelling of GeneralisedNewtypeDeriving
Ben Gamari [Fri, 2 Mar 2018 19:18:48 +0000 (14:18 -0500)] 
DynFlags: Support British spelling of GeneralisedNewtypeDeriving

Reviewers: dfeuer

Reviewed By: dfeuer

Subscribers: dfeuer, rwbarton, thomie, carter

GHC Trac Issues: #14819

Differential Revision: https://phabricator.haskell.org/D4422

16 months agoVarious Windows / Cross Compile to Windows fixes
Moritz Angermann [Fri, 2 Mar 2018 19:19:58 +0000 (14:19 -0500)] 
Various Windows / Cross Compile to Windows fixes

- Adds quick-cross-ncg flavour.
- Fix windows wchar with `_s` for mingw
- Lookup windres, dllwrap and objdump
- Fix type.

Reviewers: bgamari, hvr, Phyx, erikd, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D4430

16 months agoFix #14817 by not double-printing data family instance kind signatures
Ryan Scott [Fri, 2 Mar 2018 19:18:15 +0000 (14:18 -0500)] 
Fix #14817 by not double-printing data family instance kind signatures

Within `pprDataFamInstDecl`, we were invoking `pprFamInstLHS` to
pretty-print a data family instance header, and we were passing `Just` a
kind signature to `pprFamInstLHS` to make it pretty-print the kind
signature alongside it (this is a consequence of commit
d1ef223cfebd23c25489a4b0c67fbaa2f91c1ec6). But this is silly, because
then invoke `pp_data_defn`, which //also// pretty-prints the kind
signature, resulting in the kind signature being printed twice by
mistake.

This fix is simple—pass `Nothing` to `pprFamInstLHS` instead.

Test Plan: make test TEST=T14817

Reviewers: alanz, bgamari, mpickering

Reviewed By: mpickering

Subscribers: mpickering, rwbarton, thomie, carter

GHC Trac Issues: #14817

Differential Revision: https://phabricator.haskell.org/D4418

16 months agoAdd regression test for #12790
Ryan Scott [Fri, 2 Mar 2018 19:17:52 +0000 (14:17 -0500)] 
Add regression test for #12790

Test Plan: make test TEST=T12790

Reviewers: bgamari, mpickering

Reviewed By: mpickering

Subscribers: mpickering, dfeuer, rwbarton, thomie, carter

GHC Trac Issues: #12790

Differential Revision: https://phabricator.haskell.org/D4412

16 months agoImprove exhaustive checking for guards in pattern bindings and MultiIf.
HE, Tao [Fri, 2 Mar 2018 19:16:24 +0000 (14:16 -0500)] 
Improve exhaustive checking for guards in pattern bindings and MultiIf.

Previously we didn't do exhaustive checking on MultiIf expressions
and guards in pattern bindings.

We can construct the `LMatch` directly from GRHSs or [LHsExpr]
(MultiIf's alts) then feed it to checkMatches, without construct the
MatchGroup and using function `matchWrapper`.

Signed-off-by: HE, Tao <sighingnow@gmail.com>
Test Plan: make test TEST="T14773a T14773b"

Reviewers: bgamari, RyanGlScott, simonpj

Reviewed By: bgamari, simonpj

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14773

Differential Revision: https://phabricator.haskell.org/D4400

16 months agoMove Data.Functor.Contravariant from the contravariant package to base.
Andrew Martin [Fri, 2 Mar 2018 19:14:13 +0000 (14:14 -0500)] 
Move Data.Functor.Contravariant from the contravariant package to base.

Move Data.Functor.Contravariant from the contravariant package to base.
Since base is the bottom of the dependency hierarchy, several instances
have been removed. They will need to be added to the following packages:
transformers, StateVar, and possibly tagged. There may not actually have
been any types from tagged that previous had instanced provided by this
module though, since it may have only been used for Data.Proxy. Additionally,
all CPP has been removed. Derived Typeable instances have been removed
(since Typeable is now automatically derived for everything). The language
extension Safe is still used, although it is unclear to ATM whether or not
it is necessary.

This resolves trac issue #14767.

Test Plan: validate

Reviewers: RyanGlScott, ekmett, hvr, bgamari

Reviewed By: RyanGlScott

Subscribers: rwbarton, thomie, ekmett, carter, RyanGlScott

GHC Trac Issues: #14767

Differential Revision: https://phabricator.haskell.org/D4399

16 months agoMake cost centre symbol names deterministic.
Shea Levy [Fri, 2 Mar 2018 17:59:06 +0000 (12:59 -0500)] 
Make cost centre symbol names deterministic.

Previously, non-CAF cost centre symbol names contained a unique,
leading to non-deterministic object files which, among other issues,
can lead to an inconsistency causing linking failure when using cached
builds sourced from multiple machines, such as with nix. Now, each
cost centre symbol is annotated with the type of cost centre it
is (CAF, expression annotation, declaration annotation, or HPC) and,
when a single module has multiple cost centres with the same name and
type, a 0-based index.

Reviewers: bgamari, simonmar

Reviewed By: bgamari

Subscribers: niteria, simonmar, RyanGlScott, osa1, rwbarton, thomie, carter

GHC Trac Issues: #4012, #12935

Differential Revision: https://phabricator.haskell.org/D4388

16 months agoOnly load plugins once
Matthew Pickering [Fri, 2 Mar 2018 18:45:47 +0000 (18:45 +0000)] 
Only load plugins once

Summary: This is part of D4342 which is worthwhile to merge on its own.

Reviewers: nboldi, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4410

Co-authored-by: Boldizsar Nemeth <nboldi@elte.hu>
16 months agorts: Note functions which must take all_tasks_mutex.
Ben Gamari [Fri, 2 Mar 2018 16:13:14 +0000 (11:13 -0500)] 
rts: Note functions which must take all_tasks_mutex.

16 months agoforkProcess: fix task mutex release order
Ömer Sinan Ağacan [Fri, 2 Mar 2018 16:15:03 +0000 (11:15 -0500)] 
forkProcess: fix task mutex release order

`all_tasks_mutex` should be released before calling `releaseCapability_`
in the parent process as `releaseCapability_` spawns worker tasks in
some cases.

Reviewers: bgamari, erikd, simonmar

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14538

Differential Revision: https://phabricator.haskell.org/D4460

16 months agoCache the fingerprint of sOpt_P
Bartosz Nitka [Thu, 22 Feb 2018 14:44:59 +0000 (06:44 -0800)] 
Cache the fingerprint of sOpt_P

Before this change we would compute a hash of
all the command line -optP flags once per file.
With a lot of files and many -optP flags, that's a lot
of repeated work.

I added a new Note that explains the approach and rationale.

Test Plan: new test

Reviewers: simonmar, simonpj, bgamari

Reviewed By: simonpj

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14697

Differential Revision: https://phabricator.haskell.org/D4445

16 months agoRevert "Better stats for T5837"
Ben Gamari [Thu, 1 Mar 2018 19:06:04 +0000 (14:06 -0500)] 
Revert "Better stats for T5837"

This reverts commit d675a354e8db67d87d1f257c3d1d2bf2d58c2b3f.

16 months agoBuild quick flavor and run some tests on Windows
mrkkrp [Fri, 16 Feb 2018 11:53:31 +0000 (18:53 +0700)] 
Build quick flavor and run some tests on Windows

This build fits into the 90 minutes window.

16 months agoFix test for Trac #13075
Simon Peyton Jones [Tue, 27 Feb 2018 08:53:10 +0000 (08:53 +0000)] 
Fix test for Trac #13075

I'd put the stderr file in my link tree, not in the source tree,
so my original push had the wrong file, even though my tree
validated.  Sorry!

16 months agoComments only
Simon Peyton Jones [Tue, 27 Feb 2018 08:51:06 +0000 (08:51 +0000)] 
Comments only

16 months agoTest for Trac #13075 is working now
Simon Peyton Jones [Tue, 27 Feb 2018 08:46:50 +0000 (08:46 +0000)] 
Test for Trac #13075 is working now

16 months agoBetter stats for T5837
Simon Peyton Jones [Tue, 27 Feb 2018 08:43:51 +0000 (08:43 +0000)] 
Better stats for T5837

I'm not sure why. It's an odd test, mind you; a weird type-function
recursion thing.  So I'm not inclined to investigate.

Anyway, good!

16 months agoFix a nasty bug in the pure unifier
Simon Peyton Jones [Mon, 26 Feb 2018 17:44:55 +0000 (17:44 +0000)] 
Fix a nasty bug in the pure unifier

The pure unifier was building an infinite type, through a defective
occurs check.  So GHC went into an infinite loop.

Reason: we were neglecting the 'kco' part of the type, which
'unify_ty' maintains.  Yikes.

The fix is easy.  I refactored a bit to make it harder to
go wrong in future.

16 months agoComments only
Simon Peyton Jones [Tue, 20 Feb 2018 11:34:45 +0000 (11:34 +0000)] 
Comments only

16 months agoTiny refactor in Core Lint
Simon Peyton Jones [Tue, 20 Feb 2018 10:45:21 +0000 (10:45 +0000)] 
Tiny refactor in Core Lint

16 months agocircleci: Simplify Hadrian build
Ben Gamari [Mon, 26 Feb 2018 16:37:44 +0000 (11:37 -0500)] 
circleci: Simplify Hadrian build

This uses the build.sh script included in the Hadrian tree, ensuring that we
will build Cabal from git if necessary.

16 months agoUpdate .gitignore
Ömer Sinan Ağacan [Mon, 26 Feb 2018 06:04:13 +0000 (09:04 +0300)] 
Update .gitignore

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4446

16 months agotestsuite: Bump allocations for T9630
Ben Gamari [Sun, 25 Feb 2018 21:23:39 +0000 (16:23 -0500)] 
testsuite: Bump allocations for T9630

16 months agoboot: Create GNUmakefiles for libraries
Ben Gamari [Wed, 21 Feb 2018 14:58:19 +0000 (09:58 -0500)] 
boot: Create GNUmakefiles for libraries

D3918 neglected to implement this when it rewrote boot in python.

16 months agoIntroduce the flag -dsuppress-timestamps to avoid timestamps in dumps.
Andreas Klebinger [Tue, 20 Feb 2018 18:19:19 +0000 (13:19 -0500)] 
Introduce the flag -dsuppress-timestamps to avoid timestamps in dumps.

This makes it easier to diff dumps which are otherwise identical.

Also updated the description of -dsuppress-all as parts of these also
apply to stages other than core.

Test Plan: Looking at dump result.

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4429

16 months agoRTS: Remove unused retainer schemes
Simon Jakobi [Tue, 20 Feb 2018 18:18:52 +0000 (13:18 -0500)] 
RTS: Remove unused retainer schemes

Reviewers: bgamari, erikd, simonmar

Reviewed By: simonmar

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #11777

Differential Revision: https://phabricator.haskell.org/D4427

16 months agoRTS: Remember to free some pointers
Simon Jakobi [Tue, 20 Feb 2018 18:17:50 +0000 (13:17 -0500)] 
RTS: Remember to free some pointers

Reviewers: bgamari, erikd, simonmar

Reviewed By: bgamari, simonmar

Subscribers: Phyx, rwbarton, thomie, carter

GHC Trac Issues: #11777

Differential Revision: https://phabricator.haskell.org/D4428

16 months agodriver/utils/dynwrapper.c: Remove unused variable
Simon Jakobi [Tue, 20 Feb 2018 18:17:27 +0000 (13:17 -0500)] 
driver/utils/dynwrapper.c: Remove unused variable

The variable was already unused when the file was introduced in
b35a6ce0e34255d200ddcf341ffc645fd237ea32.

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #11777

Differential Revision: https://phabricator.haskell.org/D4426

16 months agoUpdate Hadrian submodule
Andrey Mokhov [Sat, 24 Feb 2018 15:00:22 +0000 (15:00 +0000)] 
Update Hadrian submodule

  * Make shell.nix less broken (hadrian/510)
  * Add --configure flag to the script
  * Undo iserv changes (hadrian/507)
  * Fix ghc-cabal: Parsec modules are now found in libraries/parsec/src (hadrian/506)
  * Move a bunch of types into dedicated modules (hadrian/502)
  * Add --quickjump to Haddock (hadrian/505)
  * Add iserv library (hadrian/504)
  * Merge pull request hadrian/503 from snowleopard/angerman-patch-1
  * Merge pull request hadrian/500 from snowleopard/runtime-deps
  * Fix Hadrian after Cabal changes (hadrian/498)
  * Drop custom logic for Scav_thr and Evac_thr (hadrian/497)
  * Fix Haddock (hadrian/496)

16 months agoComments in Unify, fixing #12442
Richard Eisenberg [Thu, 22 Feb 2018 15:44:18 +0000 (10:44 -0500)] 
Comments in Unify, fixing #12442

[ci skip]

16 months agoDon't use ld.gold when building libraries for GHCi
Simon Marlow [Wed, 21 Feb 2018 14:16:00 +0000 (14:16 +0000)] 
Don't use ld.gold when building libraries for GHCi

Summary:
ld.gold is buggy when using -r and a linker script.  See upstream bug
https://sourceware.org/bugzilla/show_bug.cgi?id=22266

This has been causing various brokenness for the GHC runtime linker,
where we load these broken object files.

Test Plan: Test program from #14675

Reviewers: bgamari, RyanGlScott, alpmestan, hvr, erikd

Subscribers: rwbarton, thomie, erikd, carter

GHC Trac Issues: #14328, #14675, #14291

Differential Revision: https://phabricator.haskell.org/D4431

16 months agoAdd references to #6087
Ömer Sinan Ağacan [Wed, 21 Feb 2018 06:47:13 +0000 (09:47 +0300)] 
Add references to #6087

[skip ci]

16 months agoRevert "Move `iserv` into `utils` and change package name
Ben Gamari [Tue, 20 Feb 2018 05:26:45 +0000 (00:26 -0500)] 
Revert "Move `iserv` into `utils` and change package name

See Phab:D4377 for the rationale. We will try this again.

This reverts commit 7c173b9043f7a9a5da46c5b0cc5fc3b38d1a7019.

16 months agoSlight refactor of stock deriving internals
Ryan Scott [Tue, 20 Feb 2018 17:50:34 +0000 (12:50 -0500)] 
Slight refactor of stock deriving internals

Summary:
Before, the `hasStockDeriving` function, which determines
how derived bindings should be generated for stock classes, was
awkwardly separated from the `checkSideConditions` function, which
checks invariants of the same classes that `hasStockDeriving` does.
As a result, there was a fair deal of hoopla needed to actually use
`hasStockDeriving`.

But this hoopla really isn't required—we should be using
`hasStockDeriving` from within `checkSideConditions`, since they're
looking up information about the same classes! By doing this, we can
eliminate some kludgy code in the form of `mk_eqn_stock'`, which had
an unreachable `pprPanic` that was stinking up the place.

Reviewers: bgamari, dfeuer

Reviewed By: bgamari

Subscribers: dfeuer, rwbarton, thomie, carter

GHC Trac Issues: #13154

Differential Revision: https://phabricator.haskell.org/D4370

16 months agoAdd ghc-prim.buildinfo to .gitignore
Ryan Scott [Tue, 20 Feb 2018 17:49:19 +0000 (12:49 -0500)] 
Add ghc-prim.buildinfo to .gitignore

16 months agocircleci: Skip performance tests
Ben Gamari [Tue, 20 Feb 2018 05:26:45 +0000 (00:26 -0500)] 
circleci: Skip performance tests

Once we finally get the automation for #12758 we can re-enable these.

16 months agoDocument missing dataToTag# . tagToEnum# rule
David Feuer [Tue, 20 Feb 2018 04:48:22 +0000 (23:48 -0500)] 
Document missing dataToTag# . tagToEnum# rule

Explain why we don't have a rule to optimize `dataToTag# (tagToEnum# x)`
to `x`.

[skip ci]

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, carter

GHC Trac Issues: #14282

Differential Revision: https://phabricator.haskell.org/D4375

16 months agoChange how includes for input file directory works
Tamar Christina [Tue, 20 Feb 2018 03:13:46 +0000 (22:13 -0500)] 
Change how includes for input file directory works

GHC Used to only allow for one include mode, namely `-I`.  The problem
with `-I` includes is that it supercedes all other includes, including
the system include paths.

This is not a problem for paths requested by the user, but it is a
problem for the ones we implicitly derive and add.

In particular we add the source directory of the input file to the
include path. This is problematic because it causes any file with the
name of a system include, to inadvertently loop as the wrong file gets
included.

Since this is an implicitly include, and as far as I can tell, only done
so local includes are found (as the sources given to GCC reside in a
temp folder) then switch from `-I` to `-iquote`.

This requires a submodule update for haddock

Test Plan: ./validate

Reviewers: austin, bgamari, hvr

Reviewed By: bgamari

Subscribers: carter, rwbarton, thomie

GHC Trac Issues: #14312

Differential Revision: https://phabricator.haskell.org/D4080

16 months agotestsuite: Bump allocations for T1969 and T5837
Ben Gamari [Tue, 20 Feb 2018 00:36:22 +0000 (19:36 -0500)] 
testsuite: Bump allocations for T1969 and T5837

Sadly it's not immediately obvious where this regression came from:

 * T5837 started failing on OS X with 0c2350c293b82e4cb24a66e00b904933bdb1c8f3
 * It's not clear when T1969 started failing due to the recent out of memory
   issues on Harbormaster