3 years agorules/build-prog: Ensure programs depend upon their transitive deps ghc-8.0.1-release
Ben Gamari [Tue, 17 May 2016 16:05:24 +0000 (18:05 +0200)] 
rules/build-prog: Ensure programs depend upon their transitive deps

Previously programs only depended upon the direct dependencies; while I
would have thought that this would be sufficient, somehow we were
getting to the link step of building `ghc-pkg` before `ghc-boot-th` was
built (despite the fact that `ghc-boot` has a direct dependency on

See #12078.

(cherry picked from commit 5d80d14196ef048ffe037b2d92af2e9af0cb9e19)

3 years agorules: Fix name of ghc-boot-th library
Ben Gamari [Tue, 17 May 2016 13:18:37 +0000 (15:18 +0200)] 
rules: Fix name of ghc-boot-th library

There was a missing `#`. Hadrian couldn't come soon enough.

(cherry picked from commit a54d87a9e69746446adfe84a38d888861b3ec02b)

3 years agotestsuite: Bump expected 32-bit perf numbers for haddock.base
Ben Gamari [Tue, 17 May 2016 12:10:32 +0000 (14:10 +0200)] 
testsuite: Bump expected 32-bit perf numbers for haddock.base

3 years agoAdd ghc-boot-th to rules/foreachLibrary
Ben Gamari [Tue, 17 May 2016 07:53:00 +0000 (09:53 +0200)] 
Add ghc-boot-th to rules/foreachLibrary

This may have been the cause of various build failures on FreeBSD and

(cherry picked from commit 770d7085d6e3f3e74e3ffe318aeaf135cf3aea72)

3 years agoOne more update to haddock submodule
Ben Gamari [Mon, 16 May 2016 19:04:40 +0000 (21:04 +0200)] 
One more update to haddock submodule

Remove html_theme declaration.

3 years agoCache the size of part_list/scavd_list (#11783)
Simon Marlow [Tue, 12 Apr 2016 02:29:14 +0000 (19:29 -0700)] 
Cache the size of part_list/scavd_list (#11783)

After a parallel GC, it is possible to have a long list of blocks in
ws->part_list, if we did a lot of work stealing but didn't fill up the
blocks we stole.  These blocks persist until the next load-balanced GC,
which might be a long time, and during every GC we were traversing this
list to find its size.  The fix is to maintain the size all the time, so
we don't have to compute it.

(cherry picked from commit 5c4cd0e44657d52f7ca5fee63f8765d17f1fbe85)

3 years agoBump haddock submodule
Ben Gamari [Mon, 16 May 2016 15:03:21 +0000 (17:03 +0200)] 
Bump haddock submodule

This will be the 2.17.2 haddock release.

3 years agoDescribe ghc-boot-th in the release notes
Ben Gamari [Mon, 16 May 2016 15:49:52 +0000 (17:49 +0200)] 
Describe ghc-boot-th in the release notes

3 years agoghc-boot: Don't use reexported-modules
Ben Gamari [Mon, 16 May 2016 14:14:07 +0000 (16:14 +0200)] 
ghc-boot: Don't use reexported-modules

This isn't supported by GHC 7.8

3 years agoMove Extension type to ghc-boot-th
Ben Gamari [Mon, 16 May 2016 13:21:34 +0000 (15:21 +0200)] 
Move Extension type to ghc-boot-th

This creates a new package, `ghc-boot-th`, to contain the `Extension`
type, which now lives in `GHC.LanguageExtension.Type`. This ensures that
the transitive dependency set of the `template-haskell` package remains

The `GHC.LanguageExtensions.Type` module is also re-exported by
`ghc-boot`, which provides an orphan `binary` instance as well.

Test Plan: Validate

Reviewers: goldfire, thomie, hvr, austin

Reviewed By: thomie

Subscribers: RyanGlScott, thomie, erikd, ezyang

Differential Revision:

(cherry picked from commit eed820b672e6c3d23106cd151b1e31ce29326e32)

3 years agotestsuite/ImpSafe03: Normalize version of bytestring
Ben Gamari [Mon, 16 May 2016 13:56:09 +0000 (15:56 +0200)] 
testsuite/ImpSafe03: Normalize version of bytestring

(cherry picked from commit d78faa135921dfe7a6b92f908171af1a2cdce512)

3 years agoPPC: Implement SMP primitives using gcc built-ins
Peter Trommler [Mon, 16 May 2016 13:19:09 +0000 (15:19 +0200)] 
PPC: Implement SMP primitives using gcc built-ins

The SMP primitives were missing appropriate memory barriers
(sync, isync instructions) on all PowerPCs.

Use the built-ins _sync_* provided by gcc and clang. This
reduces code size significantly.

Remove broken mark for concprog001 on powerpc64. The referenced
ticket number (11259) was wrong.

Test Plan: validate on powerpc and ARM

Reviewers: erikd, austin, simonmar, bgamari, hvr

Reviewed By: bgamari, hvr

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #12070

(cherry picked from commit 563a4857abcee4a6e43c68323274309c58f42aa0)

3 years agoPPC NCG: Fix pretty printing of st[wd]ux instr.
Peter Trommler [Mon, 16 May 2016 13:16:49 +0000 (15:16 +0200)] 
PPC NCG: Fix pretty printing of st[wd]ux instr.

Printing STU was mixed up. The tab character must appear
after the 'x'.

Test Plan: validate on powerpc

Reviewers: bgamari, austin, erikd

Reviewed By: austin, erikd

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #12054

(cherry picked from commit 2dbdc79bb9e2760394ebfe630908813b630146c7)

3 years agoBump bytestring submodule to
Ben Gamari [Mon, 16 May 2016 13:19:39 +0000 (15:19 +0200)] 
Bump bytestring submodule to

3 years agoAnother haddock submodule bump
Ben Gamari [Sat, 14 May 2016 07:59:12 +0000 (09:59 +0200)] 
Another haddock submodule bump

This resolves #12058.

Thanks to P├íli for tidentifying this issue so clearly.

3 years agoBump haddock submodule
Ben Gamari [Wed, 11 May 2016 21:16:46 +0000 (23:16 +0200)] 
Bump haddock submodule

Fixes `make clean`.

3 years agoBump haddock submodule
Ben Gamari [Wed, 11 May 2016 21:16:46 +0000 (23:16 +0200)] 
Bump haddock submodule

Ensures that haddock documentation is built as part of the `all` target.

3 years Prepare for 8.0.1 release
Ben Gamari [Tue, 10 May 2016 21:48:38 +0000 (23:48 +0200)] Prepare for 8.0.1 release

3 years agoHandle promotion failures when scavenging a WEAK (#11108)
Takano Akio [Wed, 11 May 2016 12:45:29 +0000 (14:45 +0200)] 
Handle promotion failures when scavenging a WEAK (#11108)

Previously, we ignored promotion failures when evacuating fields of
a WEAK object. When a failure happens, this resulted in an WEAK object
pointing to another object in a younger generation, causing crashes.

I used the test case from #11746 to check that the fix is working.
However I haven't managed to produce a test case that quickly reproduces
the issue.

Test Plan: ./validate

Reviewers: austin, bgamari, simonmar

Reviewed By: simonmar

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11108

(cherry picked from commit 9363f04d0ff22f3d898af35bb5432c4287e6dc9a)

3 years agorelnotes: Fix ticket number yet again
Ben Gamari [Wed, 11 May 2016 08:10:04 +0000 (10:10 +0200)] 
relnotes: Fix ticket number yet again

3 years agorelnotes: Fix typo in ticket number
Ben Gamari [Tue, 10 May 2016 21:38:41 +0000 (23:38 +0200)] 
relnotes: Fix typo in ticket number

Thanks Mikhail!

3 years agorelnotes: Update submodule versions
Ben Gamari [Tue, 10 May 2016 21:36:49 +0000 (23:36 +0200)] 
relnotes: Update submodule versions

3 years agousers-guide: Fix former base version number
Ben Gamari [Tue, 10 May 2016 21:28:57 +0000 (23:28 +0200)] 
users-guide: Fix former base version number

3 years agousers-guide: Add -Wnoncanonical-semigroup-instances to relnotes
Ben Gamari [Tue, 10 May 2016 21:27:01 +0000 (23:27 +0200)] 
users-guide: Add -Wnoncanonical-semigroup-instances to relnotes

3 years agousers-guide: Note #11995 in release notes
Ben Gamari [Tue, 10 May 2016 20:58:27 +0000 (22:58 +0200)] 
users-guide: Note #11995 in release notes

3 years agoBump haddock submodule
Ben Gamari [Tue, 10 May 2016 16:24:34 +0000 (18:24 +0200)] 
Bump haddock submodule

3 years agoRdrHsSyn: Only suggest `type` qualification when appropriate
Ben Gamari [Tue, 10 May 2016 09:02:19 +0000 (11:02 +0200)] 
RdrHsSyn: Only suggest `type` qualification when appropriate

This suggestion only applies to operators.

3 years agoForbid variables to be parents in import lists.
Matthew Pickering [Tue, 10 May 2016 06:41:46 +0000 (08:41 +0200)] 
Forbid variables to be parents in import lists.

In the long discussion on #11432, it was decided that when a type
constructor is parsed as a variable ((--.->) is one example) then in
order to export the type constructor then the user should be required to
use the ExplicitNamespaces keyword.

This was implemented in quite an indirect manner in the renamer. It
is much more direct to enforce this in the parser at the expense of
slighty worse error messages. Further to this, the check in the
renamer was actually slightly wrong. If the variable was in scope
then no error was raised, this was causing panics, see #12026 for an

Reviewers: austin, bgamari

Subscribers: davean, skvadrik, thomie

Differential Revision:

GHC Trac Issues: #12026

3 years agorel-notes: Group together warning-related items, add
Ben Gamari [Sat, 7 May 2016 08:55:31 +0000 (10:55 +0200)] 
rel-notes: Group together warning-related items, add

Mention -fshow-warning-groups, etc.

3 years agorelnotes: Note portability improvements
Ben Gamari [Sat, 7 May 2016 08:43:19 +0000 (10:43 +0200)] 
relnotes: Note portability improvements

3 years agobase: Add release date to changelog
Ben Gamari [Sat, 7 May 2016 07:30:20 +0000 (09:30 +0200)] 
base: Add release date to changelog

3 years agousers-guide/relnotes: Document -Weverything and -Wdefault
Ben Gamari [Sat, 7 May 2016 07:29:41 +0000 (09:29 +0200)] 
users-guide/relnotes: Document -Weverything and -Wdefault

3 years agousers-guide: Document
Ben Gamari [Sat, 7 May 2016 07:16:28 +0000 (09:16 +0200)] 
users-guide: Document

3 years agousers-guide: Clean up version numbers and TODOs
Ben Gamari [Sat, 7 May 2016 07:09:39 +0000 (09:09 +0200)] 
users-guide: Clean up version numbers and TODOs

3 years agoghc-boot: Bump version number in changelog
Ben Gamari [Sat, 7 May 2016 07:09:27 +0000 (09:09 +0200)] 
ghc-boot: Bump version number in changelog

3 years agoUpdate time submodule to release tag
Herbert Valerio Riedel [Sat, 7 May 2016 06:41:54 +0000 (08:41 +0200)] 
Update time submodule to release tag

(cherry picked from commit 633b099cb683b3d2e9bb2776ecaa7a83e5736de7)

3 years agoBump Win32 submodule to
Ben Gamari [Thu, 5 May 2016 12:57:48 +0000 (14:57 +0200)] 
Bump Win32 submodule to

3 years agoBump time submodule
Ben Gamari [Thu, 5 May 2016 09:44:30 +0000 (11:44 +0200)] 
Bump time submodule

This isn't quite a valid release yet but at least it's closer.

3 years agoUpdate bytestring submodule to release tag
Herbert Valerio Riedel [Tue, 3 May 2016 22:45:43 +0000 (00:45 +0200)] 
Update bytestring submodule to release tag

(cherry picked from commit 4466ae6451b9d4ecf5fbb6851c41b00c60ec7d5c)

3 years agoUpdate libraries/hpc submodule to v0.6.0.3 release tag
Herbert Valerio Riedel [Tue, 3 May 2016 20:11:59 +0000 (22:11 +0200)] 
Update libraries/hpc submodule to v0.6.0.3 release tag

(cherry picked from commit 0051ac1786ccdf0fb9babf188a9f9bc0da2ce520)

3 years agoUpdate Cabal submodule to v1.24.0.0 releas tag
Herbert Valerio Riedel [Tue, 3 May 2016 20:16:36 +0000 (22:16 +0200)] 
Update Cabal submodule to v1.24.0.0 releas tag

3 years agoderiveConstants: Fix nm advice one last time
Ben Gamari [Sun, 1 May 2016 16:05:28 +0000 (18:05 +0200)] 
deriveConstants: Fix nm advice one last time

Missing a close paren.

3 years agoBump haddock submodule
Ben Gamari [Sun, 1 May 2016 11:23:20 +0000 (13:23 +0200)] 
Bump haddock submodule

Fixes documentation installation.

3 years agousers-guide: Add index entry for "environment file"
Ben Gamari [Sun, 1 May 2016 11:21:55 +0000 (13:21 +0200)] 
users-guide: Add index entry for "environment file"

(cherry picked from commit 5a7149711a7c15a3434dd8e19bea77c57ff9879d)

3 years agoRecommend more reliable recourse for broken nm
Ben Gamari [Thu, 28 Apr 2016 08:11:13 +0000 (10:11 +0200)] 
Recommend more reliable recourse for broken nm

xcrun --find seems like the appropriate choice here. Thanks to Brandon
Allbery for suggesting this.

(cherry picked from commit a0e10510c64182c7126ff426127ea8fd78c07d00)

3 years agoDocument -fmax-pmcheck-iterations a bit better
Ben Gamari [Wed, 27 Apr 2016 07:57:41 +0000 (09:57 +0200)] 
Document -fmax-pmcheck-iterations a bit better

(cherry picked from commit 5adf8f3b74a4ee11d594b9993493bed4e3521ce2)

3 years agoderiveConstants: Fix nm-classic error message
Ben Gamari [Sun, 24 Apr 2016 09:31:51 +0000 (11:31 +0200)] 
deriveConstants: Fix nm-classic error message

Thanks to George Colpitts for the suggestion.

(cherry picked from commit 28503fe984dbc00f687f0579967d583eebb9afcb)

3 years agoAdjust error check for class method types ghc-8.0.1-rc4
Simon Peyton Jones [Fri, 15 Apr 2016 10:49:23 +0000 (11:49 +0100)] 
Adjust error check for class method types

Fixes Trac #11793.  Nothing deep here.

(cherry picked from commit e24b3b1eeba91bd5b127261652b48eae2d4751b1)

3 years agoBump bytestring submodule
Ben Gamari [Thu, 21 Apr 2016 21:17:18 +0000 (23:17 +0200)] 
Bump bytestring submodule

3 years agoRevert "rts/timer: use timerfd_* on Linux instead of alarm signals"
Ben Gamari [Thu, 21 Apr 2016 11:30:45 +0000 (13:30 +0200)] 
Revert "rts/timer: use timerfd_* on Linux instead of alarm signals"

This reverts commit bbdc52f3a6e6a28e209fb8f65699121d4ef3a4e3.

3 years agoRevert "rtx/posix/Itimer.c: Handle return value of `read`"
Ben Gamari [Thu, 21 Apr 2016 11:30:43 +0000 (13:30 +0200)] 
Revert "rtx/posix/Itimer.c: Handle return value of `read`"

This reverts commit fd3e581b7c9142247601774afc98e49f63b8af45.

3 years agoRevert "rts/posix/Itimer.c: Handle EINTR when reading timerfd"
Ben Gamari [Thu, 21 Apr 2016 11:30:41 +0000 (13:30 +0200)] 
Revert "rts/posix/Itimer.c: Handle EINTR when reading timerfd"

This reverts commit 37936e2b23e58b8a855b7ece5a375b930d1a29bc.

3 years agoMove DFunUnfolding generation to TcInstDcls
Simon Peyton Jones [Wed, 23 Mar 2016 15:37:50 +0000 (15:37 +0000)] 
Move DFunUnfolding generation to TcInstDcls

The desugarer had a fragile case to generate the Unfolding for a
DFun. This patch moves the unfolding generation to TcInstDcls, where
all the pieces are to hand.

Fixes Trac #11742

(cherry picked from commit db9e4eb4e3fe916df7a69da1b211083ad6068aff)

3 years agoBump Cabal submodule
Ben Gamari [Wed, 20 Apr 2016 21:06:19 +0000 (23:06 +0200)] 
Bump Cabal submodule

3 years agoEnsure Typeable declarations end up in boot interface files
Ben Gamari [Wed, 20 Apr 2016 10:05:13 +0000 (12:05 +0200)] 
Ensure Typeable declarations end up in boot interface files

Previously we neglected to emit Typeable TyCon and Module declarations
when typechecking boot interface files. This resulted in #11824.

Ultimately we'll likely want to do a bit of cleaning in this area but in
the interest of getting some sort of fix in I'm merging this. Further
clean-ups to come.

Test Plan: Validate

Reviewers: simonpj, austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11824

(cherry picked from commit 048d6187b5892502e9bc75abfb21f9bd848a29cb)

3 years agoBump haddock submodule
Ben Gamari [Wed, 20 Apr 2016 09:47:31 +0000 (11:47 +0200)] 
Bump haddock submodule

Install files needed for --hyperlinked-source. Fixes #11949.

3 years agoUpdate unix submodule to v2.7.2.0 release
Herbert Valerio Riedel [Tue, 19 Apr 2016 21:40:52 +0000 (23:40 +0200)] 
Update unix submodule to v2.7.2.0 release

(cherry picked from commit 81b14c141dc385dbb0de00ea72217185cfa22a09)

3 years agoUpdate binary submodule to release
Herbert Valerio Riedel [Tue, 19 Apr 2016 20:33:58 +0000 (22:33 +0200)] 
Update binary submodule to release

(cherry picked from commit ff290b86ad237d1a5517ad9414a22840f6e749da)

3 years agoUpdate deepseq submodule to latest snapshot
Herbert Valerio Riedel [Tue, 19 Apr 2016 17:16:01 +0000 (19:16 +0200)] 
Update deepseq submodule to latest snapshot

NB: this needs 91ee5090f1e3f43e9e803cf7005a7f3357e58377
(cherry picked from commit 96e1bb4536a6f130c9242e3c25566c7d2e71ee97)

3 years agoMark GHC.Stack.Types Trustworthy
Herbert Valerio Riedel [Tue, 19 Apr 2016 16:32:29 +0000 (18:32 +0200)] 
Mark GHC.Stack.Types Trustworthy

GHC can't infer this module safe due to the `GHC.Types (Char, Int)`
and the  (dummy) `GHC.Integer ()` import.

If only `GHC.Types` was marked Trustworthy or Safe...

(cherry picked from commit 91ee5090f1e3f43e9e803cf7005a7f3357e58377)

3 years agoUpdate hsc2hs submodule
Herbert Valerio Riedel [Tue, 19 Apr 2016 11:56:54 +0000 (13:56 +0200)] 
Update hsc2hs submodule

This bumps the hsc2hs version to 0.68

(cherry picked from commit 81e227929c15ad82f6f67a7390ee140da85eefdb)

3 years agoUpdate `directory` submodule to v1.2.6.2 release
Herbert Valerio Riedel [Tue, 19 Apr 2016 07:00:54 +0000 (09:00 +0200)] 
Update `directory` submodule to v1.2.6.2 release

The v1.2.6.1 release uploaded to Hackage is broken, we don't
want to bundle a release that's non-installable from Hackage

(cherry picked from commit 8556f56b71f979f70f503e1d23a822b21947f7ab)

3 years agorts: Don't use strndup
Ben Gamari [Mon, 18 Apr 2016 20:32:59 +0000 (22:32 +0200)] 
rts: Don't use strndup

Reviewers: austin

Subscribers: thomie

Differential Revision:

(cherry picked from commit d1ce35d2271ac8b79cb5e37677b1a989749e611c)

3 years agorts: Limit maximum backtrace depth
Ben Gamari [Sun, 10 Apr 2016 22:49:06 +0000 (00:49 +0200)] 
rts: Limit maximum backtrace depth

This prevents us from entering an infinite loop in the event of a
hitting bad unwinding information.

(cherry picked from commit 350ffc3e4c6b3aefd6ae621991564cc28f585d46)

3 years agoMake it easy to get hyperlinked sources
Bartosz Nitka [Mon, 18 Apr 2016 13:29:37 +0000 (06:29 -0700)] 
Make it easy to get hyperlinked sources

The version of `haddock` that ghc has as a submodule has an option
for generating linkified sources. I don't think it hurts to have this
and they are great for exploring the codebase.

I'd be nice if harbormaster or travis published them somewhere, but
I don't know how to do that yet.

Test Plan:
uncomment, run `make` and look at the
nicely linkified sources in `compiler/stage2/doc/html/ghc/`

Reviewers: hvr, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie, simonmar

Differential Revision:

(cherry picked from commit 3dac53fa3ede70e86ddb6f40e1e96feb61301754)

3 years agorelnotes: Add note about #11744 and workaround
Ben Gamari [Mon, 18 Apr 2016 13:13:41 +0000 (15:13 +0200)] 
relnotes: Add note about #11744 and workaround

Test Plan: Read it

Reviewers: hvr, austin

Subscribers: carter, thomie

Differential Revision:

GHC Trac Issues: #11744

(cherry picked from commit 03d1fd63914bd0c769fa0444d3ef1a5ddfee220d)

3 years agoUpdate haskeline submodule to release
Herbert Valerio Riedel [Sun, 17 Apr 2016 18:42:43 +0000 (20:42 +0200)] 
Update haskeline submodule to release

(cherry picked from commit 8a75bb5874070bc879818bba572a94632cf079d5)

3 years agoSilence unused-import warning introduced by 93d85af9fec968b
Herbert Valerio Riedel [Sun, 17 Apr 2016 16:39:36 +0000 (18:39 +0200)] 
Silence unused-import warning introduced by 93d85af9fec968b

(cherry picked from commit dd920e43b887bf5288ec364fd416f5e593c693e6)

3 years agoUpdate `directory` submodule to v1.2.6.1 release
Herbert Valerio Riedel [Sun, 17 Apr 2016 15:39:13 +0000 (17:39 +0200)] 
Update `directory` submodule to v1.2.6.1 release

This fixes a build-failure on OSX

(cherry picked from commit 93d85af9fec968b43452891ec7b10382a4a99a38)

3 years agoResolve symlinks when attempting to find GHC's lib folder on Windows
Tamar Christina [Sun, 17 Apr 2016 15:11:02 +0000 (17:11 +0200)] 
Resolve symlinks when attempting to find GHC's lib folder on Windows

Systools makes some pretty hard assumptions about where GHC is on Windows.
One of these is that ghc be in a folder named `bin` and that `../lib` exists.

This pattern doesn't hold for symlinks as a link `C:\ghc-bin\`
pointing to `C:\ghc\ghc-7.10.3\bin` will break this assumption.

This patch resolves symlinks by finding where they point to and uses that location
as the base for GHC.

This uses an API that's been introduced in Vista. For older systems it falls back to
the current behavior of not resolving symlinks.

Test Plan:
1) Create symlink to GHC's bin folder.
2) Run GHC from that folder.

Reviewers: austin, bgamari

Reviewed By: austin

Subscribers: #ghc_windows_task_force, thomie

Differential Revision:

GHC Trac Issues: #11759

(cherry picked from commit a3922083e8f41fc236972564dc2978f2a2d4ec13)

3 years agoCheck CCS tree for pointers into shared object during checkUnload
Andrew Farmer [Sun, 17 Apr 2016 12:43:24 +0000 (14:43 +0200)] 
Check CCS tree for pointers into shared object during checkUnload

Prevent shared objects from being unloaded if cost centre stacks point
at the object. This will prevent segfault in #11776, but also prevents
objects from ever being unloaded when profiling. Pruning CCS tree will
enable that in another diff.

Test Plan: make TEST=linker_profiled, examine

Reviewers: austin, simonmar, bgamari

Reviewed By: simonmar, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11776

(cherry picked from commit 36a0b6dc27ae0ee2022afbef5d3cd49dfde9e82b)

3 years agovalidate: Note existence of config_args variable
Ben Gamari [Sun, 17 Apr 2016 11:25:05 +0000 (13:25 +0200)] 
validate: Note existence of config_args variable

(cherry picked from commit 07dc330736103eee4b94607ef488b3578155f82b)

3 years agousers-guide: Fix typo
Ben Gamari [Sun, 17 Apr 2016 11:21:07 +0000 (13:21 +0200)] 
users-guide: Fix typo

(cherry picked from commit 7a1c07314c0955db822b84108aba0670adb0f9a5)

3 years agoTH: Tweak Haddock language
Ben Gamari [Sun, 17 Apr 2016 10:58:24 +0000 (12:58 +0200)] 
TH: Tweak Haddock language

(cherry picked from commit 89b66742b770311255a441f7fe641b9e212d87aa)

3 years agoAdd TemplateHaskell support for Overlapping pragmas
Iavor S. Diatchki [Sun, 17 Apr 2016 10:56:31 +0000 (12:56 +0200)] 
Add TemplateHaskell support for Overlapping pragmas

Reviewers: hvr, goldfire, austin, RyanGlScott, bgamari

Reviewed By: RyanGlScott, bgamari

Subscribers: RyanGlScott, thomie

Differential Revision:

(cherry picked from commit 04b70cda4ed006c7e3df40e169550a00aba79524)

3 years agoderiveConstants: Verify sanity of nm
Herbert Valerio Riedel [Sat, 16 Apr 2016 13:25:07 +0000 (15:25 +0200)] 
deriveConstants: Verify sanity of nm

Add a sanity check ensuring that nm emits valid hexadecimal output, as
required by POSIX. See #11744 for motivation.

Reviewers: austin, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11744

(cherry picked from commit bf17fd0e5b5442a87f507b26e64a30c79732838a)

3 years agoUpdate array submodule to v0.5.1.1 release tag
Herbert Valerio Riedel [Sun, 17 Apr 2016 09:10:24 +0000 (11:10 +0200)] 
Update array submodule to v0.5.1.1 release tag

(cherry picked from commit 4cbae1bd70097a2d365ce0644145a8203956d59a)

3 years agoUpdate `directory` submodule to v1.2.6.0 release
Herbert Valerio Riedel [Sat, 16 Apr 2016 19:17:03 +0000 (21:17 +0200)] 
Update `directory` submodule to v1.2.6.0 release

(cherry picked from commit 3f3ad75e7b9127dac72cca56623879fbec0b88c8)

3 years agolibdw: More precise version check
Ben Gamari [Fri, 15 Apr 2016 09:43:41 +0000 (11:43 +0200)] 
libdw: More precise version check

Test Plan: Try configure in an environment with older `libdw`

Reviewers: hvr, austin

Subscribers: thomie, erikd

Differential Revision:

GHC Trac Issues: #11820

(cherry picked from commit e9ad48935fa48aa32dc39a55512168ba5f5bdbd2)

3 years agoIncrease an InScopeSet for a substitution
Richard Eisenberg [Tue, 12 Apr 2016 16:00:55 +0000 (12:00 -0400)] 
Increase an InScopeSet for a substitution

This is a further fix for #11814

(cherry picked from commit 8d66765c4de22c01b8ae97570ed6c5f5c1a16a35)

3 years agoTeach lookupLocalRdrEnv about Exacts. (#11813)
Richard Eisenberg [Fri, 8 Apr 2016 06:01:34 +0000 (08:01 +0200)] 
Teach lookupLocalRdrEnv about Exacts. (#11813)

(cherry picked from commit d81cdc227cd487659995ddea577214314c9b4b97)

3 years agoBump haddock submodule
Ben Gamari [Sat, 16 Apr 2016 15:59:15 +0000 (17:59 +0200)] 
Bump haddock submodule

3 years agotestsuite: Add test for #11827
Ben Gamari [Fri, 15 Apr 2016 09:41:24 +0000 (11:41 +0200)] 
testsuite: Add test for #11827

Test Plan: Validate

Reviewers: austin

Reviewed By: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11827

(cherry picked from commit cb0d29b21ccadde681f80f9e414f78ab42a203c7)

3 years agotestsuite: Add T11824
Ben Gamari [Fri, 15 Apr 2016 09:41:12 +0000 (11:41 +0200)] 
testsuite: Add T11824

Test Plan: Validate

Reviewers: goldfire, austin

Reviewed By: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11824

(cherry picked from commit 116088de1dc3188e82f3f79b39f8e92f30ab88d7)

3 years agoLinker: Fix signedness mismatch
Ben Gamari [Fri, 15 Apr 2016 09:41:34 +0000 (11:41 +0200)] 
Linker: Fix signedness mismatch

Test Plan: Validate on OS X

Reviewers: erikd, austin, Phyx

Reviewed By: austin, Phyx

Subscribers: Phyx, thomie

Differential Revision:

GHC Trac Issues: #11828

(cherry picked from commit 9d063b690766af7d805ff015c0a0f69326ea3db7)

3 years agorel-notes: Add note about UndecidableSuperClasses and #11762
Ben Gamari [Fri, 15 Apr 2016 09:41:45 +0000 (11:41 +0200)] 
rel-notes: Add note about UndecidableSuperClasses and #11762

Test Plan: Read it

Reviewers: austin, kosmikus

Reviewed By: kosmikus

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11318, #11762

(cherry picked from commit 933abfa7ec88bd91e60a62e51bb2f9a068d379f1)

3 years agousers-guide: Note change in LLVM support policy
Ben Gamari [Wed, 13 Apr 2016 11:41:09 +0000 (13:41 +0200)] 
users-guide: Note change in LLVM support policy

(cherry picked from commit aaaa61c8b712cc313c140ec15f6044e13a036d1f)

3 years agoFix #11814 by throwing more stuff into InScopeSets
Richard Eisenberg [Wed, 6 Apr 2016 13:24:34 +0000 (15:24 +0200)] 
Fix #11814 by throwing more stuff into InScopeSets

(cherry picked from commit 0b6dcf6d2ccac3b43037650279256022a352de53)

3 years agoFix #11797.
Richard Eisenberg [Wed, 6 Apr 2016 14:37:22 +0000 (16:37 +0200)] 
Fix #11797.

DsMeta curiously omitted quantified tyvars in certain circumstances.
This patch means it doesn't.

Test case: th/T11797

(cherry picked from commit dd99f2ece1bd139be02beddc6dc672862ee5ae34)

3 years agoFix #11811.
Richard Eisenberg [Thu, 7 Apr 2016 14:44:06 +0000 (16:44 +0200)] 
Fix #11811.

Previously, I had forgotten to omit variables already in scope
from the TypeInType CUSK check. Simple enough to fix.

Test case: typecheck/should_compile/T11811

(cherry picked from commit b1084fd700e6bbe9d0d787046a6aabdb193982c4)

3 years agoAdd linker notes
Tamar Christina [Mon, 11 Apr 2016 04:51:44 +0000 (06:51 +0200)] 
Add linker notes

Summary: Add linker notes following #11223 and D1805

Reviewers: austin, bgamari, erikd

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11223

(cherry picked from commit c6e579bc3820afe71e51b711ee579a4d658ffbf9)

3 years agoUse `@since` annotation in GHC.ExecutionStack
Herbert Valerio Riedel [Mon, 11 Apr 2016 05:28:15 +0000 (07:28 +0200)] 
Use `@since` annotation in GHC.ExecutionStack

While ad532ded871a9a5180388a2b7cdbdc26e053284c fixed the version
number, this fixes the markup...

(cherry picked from commit 2ef35d8fed58cb9f33190c6d9908262535b26f90)

3 years agoDeriving Functor-like classes should unify kind variables ghc-8.0.1-rc3
RyanGlScott [Mon, 11 Apr 2016 00:53:23 +0000 (02:53 +0200)] 
Deriving Functor-like classes should unify kind variables

While the deriving machinery always unifies the kind of the typeclass
argument with the kind of the datatype, this proves not to be sufficient
to produce well kinded instances for some poly-kinded datatypes. For

newtype Compose (f :: k2 -> *) (g :: k1 -> k2) (a :: k1)
  = Compose (f (g a)) deriving Functor

would fail because only `k1` would get unified with `*`, causing the
ill kinded instance to be generated:

instance (Functor (f :: k2 -> *), Functor (g :: * -> k2)) =>
  Functor (Compose f g) where ...

To prevent this, we need to take the subtypes and unify their kinds with
`* -> *`.

Fixes #10524 for good.

Test Plan: ./validate

Reviewers: simonpj, hvr, austin, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #10524, #10561

(cherry picked from commit aadde2b90817c577336da0d4a10ea47551d60c7e)

3 years agoAdded (more) missing instances for Identity and Const
Shane O'Brien [Mon, 11 Apr 2016 00:53:00 +0000 (02:53 +0200)] 
Added (more) missing instances for Identity and Const

  * `Identity` and `Const` now have `Num`, `Real`, `Integral`,
    `Fractional`, `Floating`, `RealFrac` and `RealFloat` instances

  * `Identity` and `Const` now have `Bits` and `FiniteBits` instances

  * `Identity` and `Const` now have `IsString` instances

Reviewers: RyanGlScott, austin, hvr, bgamari, ekmett

Reviewed By: ekmett

Subscribers: nomeata, ekmett, RyanGlScott, thomie

Differential Revision:

GHC Trac Issues: #11790

(cherry picked from commit 8b57cac5974c9fffccbcae3104b5b5d18760749e)

3 years agoFilter out invisible kind arguments during TH reification
RyanGlScott [Mon, 11 Apr 2016 00:34:55 +0000 (02:34 +0200)] 
Filter out invisible kind arguments during TH reification

Previously, all kind arguments were being reified, which would cause
something like this:

type Id a = a
data Proxy (a :: Id k) = Proxy

to output

data Proxy (a :: Id * k) = Proxy

when `Proxy`'s `Info` is reified. The fix is simple: simply call
`filterOutInvisibleTypes` on the kind arguments of a kind synonym

Fixes #11463.

Test Plan: ./validate

Reviewers: austin, bgamari, goldfire

Reviewed By: goldfire

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11463

(cherry picked from commit 02a5c580b6078630842f4c3db5d92631fada21e9)

3 years agoFix a closed type family error message
Rik Steenkamp [Mon, 11 Apr 2016 00:26:06 +0000 (02:26 +0200)] 
Fix a closed type family error message

Now we check whether a closed type family's equation is headed with
the correct type before we kind-check the equation.

Also, instead of "expected only no parameters" we now generate the
message "expected no parameters".

Fixes #11623.

Reviewers: simonpj, austin, bgamari

Reviewed By: simonpj, bgamari

Subscribers: simonpj, goldfire, thomie

Differential Revision:

GHC Trac Issues: #11623

(cherry picked from commit 46e8f199e4d3baffa306a40082fbc2fce67f779f)

3 years agoOmit TEST=T10697_decided_3 WAY=ghci
Thomas Miedema [Fri, 1 Jan 2016 11:46:37 +0000 (12:46 +0100)] 
Omit TEST=T10697_decided_3 WAY=ghci

(cherry picked from commit d935d20988af7f3109b73d7c51a0e4a6b12b926c)

3 years agoChange runtime linker to perform lazy loading of symbols/sections
Tamar Christina [Sun, 10 Apr 2016 22:38:42 +0000 (00:38 +0200)] 
Change runtime linker to perform lazy loading of symbols/sections

The Runtime Linker is currently eagerly loading all object files on all
platforms which do not use the system linker for `GHCi`.

The problem with this approach is that it requires all symbols to be
found.  Even those of functions never used/called. This makes the number
of libraries required to link things like `mingwex` quite high.

To work around this the `rts` was relying on a trick. It itself was
compiled with `MingW64-w`'s `GCC`. So it was already linked against
`mingwex`.  As such, it re-exported the symbols from itself.

While this worked it made it impossible to link against `mingwex` in
user libraries. And with this means no `C99` code could ever run in
`GHCi` on Windows without having the required symbols re-exported from
the rts.

Consequently this rules out a large number of packages on Windows.
SDL2, HMatrix etc.

After talking with @rwbarton I have taken the approach of loading entire
object files when a symbol is needed instead of doing the dependency
tracking on a per symbol basis. This is a lot less fragile and a lot
less complicated to implement.

The changes come down to the following steps:

1) modify the linker to and introduce a new state for ObjectCode:
   `Needed`.  A Needed object is one that is required for the linking to
   succeed.  The initial set consists of all Object files passed as
   arguments to the link.

2) Change `ObjectCode`'s to be indexed but not initialized or resolved.
   This means we know where we would load the symbols,
   but haven't actually done so.

3) Mark any `ObjectCode` belonging to `.o` passed as argument
   as required: ObjectState `NEEDED`.

4) During `Resolve` object calls, mark all `ObjectCode`
   containing the required symbols as `NEEDED`

5) During `lookupSymbol` lookups, (which is called from `linkExpr`
   and `linkDecl` in `GHCI.hs`) is the symbol is in a not-yet-loaded
   `ObjectCode` then load the `ObjectCode` on demand and return the
   address of the symbol. Otherwise produce an unresolved symbols error
   as expected.

6) On `unloadObj` we then change the state of the object and remove
   it's symbols from the `reqSymHash` table so it can be reloaded.

This change affects all platforms and OSes which use the runtime linker.
It seems there are no real perf tests for `GHCi`, but performance
shouldn't be impacted much. We gain a lot of time not loading all `obj`
files, and we lose some time in `lookupSymbol` when we're finding
sections that have to be loaded. The actual finding itself is O(1)
(Assuming the hashtnl is perfect)

It also consumes slighly more memory as instead of storing just the
address of a symbol I also store some other information, like if the
symbol is weak or not.

This change will break any packages relying on renamed POSIX functions
that were re-named and re-exported by the rts. Any packages following
the proper naming for functions as found on MSDN will work fine.

Test Plan: ./validate on all platforms which use the Runtime linker.

Reviewers: thomie, rwbarton, simonmar, erikd, bgamari, austin, hvr

Reviewed By: erikd

Subscribers: kgardas, gridaphobe, RyanGlScott, simonmar,
             rwbarton, #ghc_windows_task_force

Differential Revision:

GHC Trac Issues: #11223

(cherry picked from commit 90538d86af579595987826cd893828d6f379f35a)

3 years agoReduce fragmentation from m32_allocator
Bartosz Nitka [Sun, 6 Mar 2016 21:18:12 +0000 (13:18 -0800)] 
Reduce fragmentation from m32_allocator

This patch brings in two improvements:
a) m32_allocator will now reuse the pages that are no longer
used by anyone else.
b) m32_allocator will preallocate the "filling" area,
so that the pages it allocates end up as a big chunk
instead of being allocated on demand in random places,
fragmenting the precious lower 2G address space.

Test Plan: testsuite - 3 tests failing with substTy asserts

Reviewers: ezyang, austin, bgamari, erikd, hsyl20, simonmar

Reviewed By: hsyl20, simonmar

Subscribers: hvr, thomie

Differential Revision:

(cherry picked from commit 82e36edcbd831e9b7c05e1c2cb918ad5de56cd3a)

3 years agoFix Windows build after D1874
Tamar Christina [Tue, 2 Feb 2016 11:36:52 +0000 (12:36 +0100)] 
Fix Windows build after D1874

Windows uses wchar_t* for paths. The code committed won't compile for
Windows as the types are incorrect and the types in the branches of the
ternary operator aren't consistent.

Test Plan: ./validate --fast

Reviewers: austin, rwbarton, erikd, bgamari

Subscribers: thomie

Differential Revision:

(cherry picked from commit 01c587c03764de52cd01a3464c1a4a5c5bce7c00)