3 years agoComments and white space only
Simon Peyton Jones [Fri, 26 Feb 2016 09:07:39 +0000 (09:07 +0000)] 
Comments and white space only

3 years agoExclude TyVars from the constraint solver
Simon Peyton Jones [Fri, 26 Feb 2016 09:02:07 +0000 (09:02 +0000)] 
Exclude TyVars from the constraint solver

There is a general invariant that the constraint solver doesn't see
TyVars, only TcTyVars.  But when checking the generic-default
signature of a class, we called checkValidType on the generic-default
type, which had the class TyVar free. That in turn meant that it wasn't
considered during flattening, which led to the error reported in
Trac #11608.

The fix is simple: call checkValidType on the /closed/ type. Easy.

While I was at it, I added a bunch of ASSERTs about the TcTyVar

3 years agoGet the right in-scope set in specUnfolding
Simon Peyton Jones [Thu, 25 Feb 2016 15:55:56 +0000 (15:55 +0000)] 
Get the right in-scope set in specUnfolding

This fixes Trac #11600

3 years agoSpecial case for desugaring AbsBinds
Simon Peyton Jones [Thu, 25 Feb 2016 15:53:59 +0000 (15:53 +0000)] 
Special case for desugaring AbsBinds

When AbsBinds has no tyvars and no dicts, a rather simpler
desugaring is possible.  This patch implements it.

I don't think the optimised code changes, but there is
less clutter generated.

3 years agoFix and refactor strict pattern bindings
Simon Peyton Jones [Thu, 25 Feb 2016 15:53:03 +0000 (15:53 +0000)] 
Fix and refactor strict pattern bindings

This patch was triggered by Trac #11601, where I discovered that
-XStrict was really not doing the right thing. In particular,

  f y = let !(Just x) = blah[y] in body[y,x]

This was evaluating 'blah' but not pattern matching it
against Just until x was demanded.  This is wrong.

The patch implements a new semantics which ensures that strict
patterns (i.e. ones with an explicit bang, or with -XStrict)
are evaluated fully when bound.

* There are extensive notes in DsUtils:
  Note [mkSelectorBinds]

* To do this I found I need one-tuples;
  see Note [One-tuples] in TysWiredIn

I updated the user manual to give the new semantics

3 years agoTypos in comments, etc.
Gabor Greif [Fri, 26 Feb 2016 14:48:10 +0000 (15:48 +0100)] 
Typos in comments, etc.

3 years agoUnconditionally handle TH known key names.
Edward Z. Yang [Thu, 25 Feb 2016 20:47:30 +0000 (21:47 +0100)] 
Unconditionally handle TH known key names.

Previously, we didn't add Template Haskell key names to the list
of known uniques when building a stage 1 compiler.  But with
f16ddcee0c64a92ab911a7841a8cf64e3ac671fd we may refer to TH
names even in stage 1, and this was causing uniques to not
be setup properly.

Signed-off-by: Edward Z. Yang <>
Test Plan: validate and run stage1 test suite

Reviewers: osa1, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #10382

3 years agoPrint which warning-flag controls an emitted warning
Michael Walker [Thu, 25 Feb 2016 16:34:07 +0000 (17:34 +0100)] 
Print which warning-flag controls an emitted warning

Both gcc and clang tell which warning flag a reported warning can be
controlled with, this patch makes ghc do the same. More generally, this
allows for annotated compiler output, where an optional annotation is
displayed in brackets after the severity.

This also adds a new flag `-f(no-)show-warning-groups` to control
whether to show which warning-group (such as `-Wall` or `-Wcompat`)
a warning belongs to. This flag is on by default.

This implements #10752

Reviewed By: quchen, bgamari, hvr

Differential Revision:

3 years agoTestsuite: do not write empty files on 'make accept'
Thomas Miedema [Tue, 23 Feb 2016 20:29:59 +0000 (21:29 +0100)] 
Testsuite: do not write empty files on 'make accept'

Also prevent showing '\ No newline at end of file' in diff output.

3 years agoTestsuite: delete empty files [skip ci]
Thomas Miedema [Tue, 23 Feb 2016 20:37:22 +0000 (21:37 +0100)] 
Testsuite: delete empty files [skip ci]

3 years agoMark tests for #11643, #11644, #11645 and #9406 expect_broken
Thomas Miedema [Thu, 25 Feb 2016 13:15:41 +0000 (14:15 +0100)] 
Mark tests for #11643, #11644, #11645 and #9406 expect_broken

For opt_ways or prof_ways only.

indexed-types/should_compile/all.T called setTestOpts to not run
the tests with opt_ways. Since I'm finding regressions for opt_ways, I
removed it. This only makes a difference when running
`./validate --slow` or `make slowtest`.

Update submodule hpc.

3 years agoTestsuite: for tests that use TH, omit *all* prof_ways
Thomas Miedema [Mon, 22 Feb 2016 17:55:30 +0000 (18:55 +0100)] 
Testsuite: for tests that use TH, omit *all* prof_ways

Instead of just profasm and profthreaded. And at least until
-fexternal-interpreter is the default.

  * WAY=profc doesn't exist anymore.
  * Omit all threaded_ways for conc039, not just a few.

3 years agoTestsuite: Introduce config.plugin_way_flags.
Thomas Miedema [Thu, 25 Feb 2016 00:00:48 +0000 (01:00 +0100)] 
Testsuite: Introduce config.plugin_way_flags.

Refactoring only.

3 years agoImprove pattern synonym error messages (add `PatSynOrigin`)
Rik Steenkamp [Thu, 25 Feb 2016 18:27:54 +0000 (19:27 +0100)] 
Improve pattern synonym error messages (add `PatSynOrigin`)

Adds a new data constructor `PatSynOrigin Bool Name` to the `CtOrigin`
data type. This allows for better error messages when the origin of a
wanted constraint is a pattern synonym declaration.

Fixes T10873.

Reviewers: mpickering, simonpj, austin, thomie, bgamari

Reviewed By: simonpj, thomie, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #10873

3 years agoNote new GHC.Generics instances in release notes
Ben Gamari [Thu, 25 Feb 2016 18:26:46 +0000 (19:26 +0100)] 
Note new GHC.Generics instances in release notes

3 years agoImprove accuracy of suggestion to use TypeApplications
Matthew Pickering [Thu, 25 Feb 2016 14:51:46 +0000 (15:51 +0100)] 
Improve accuracy of suggestion to use TypeApplications

The suggestion only makes sense when we try
to use an as pattern in an expression context.

It is misleading in the case of a lazy pattern and
view pattern.

Reviewers: austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoHandle multiline named haddock comments properly
Thomas Miedema [Thu, 25 Feb 2016 14:51:38 +0000 (15:51 +0100)] 
Handle multiline named haddock comments properly

Fixes #10398 in a different way, thereby also fixing #11579.

I inverted the logic of the Bool argument to "worker", to hopefully make
it more self-explanatory.

Reviewers: austin, hvr, bgamari

Reviewed By: bgamari

Differential Revision:

3 years ago(Alternative way to) address #8710
George Karachalias [Thu, 25 Feb 2016 14:50:35 +0000 (15:50 +0100)] 
(Alternative way to) address #8710

Issue a separate warning per redundant (or inaccessible) clause.
This way each warning can have more precice location information
(the location of the clause under consideration and not the whole

I thought that this could be too much but actually the number of
such warnings is bound by the number of cases matched against (in
contrast to the non-exhaustive warnings which may be exponentially

Test Plan: validate

Reviewers: simonpj, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #8710

3 years agocmpTypeX: Avoid kind comparison when possible
Ben Gamari [Thu, 25 Feb 2016 14:44:20 +0000 (15:44 +0100)] 
cmpTypeX: Avoid kind comparison when possible

This comparison is only necessary when the types being compared contain
casts. Otherwise the structural equality of the types implies that their
kinds are equal.

Test Plan: Validate

Reviewers: goldfire, austin, simonpj

Reviewed By: simonpj

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11597

3 years agoBump haddock.base allocations
Ben Gamari [Thu, 25 Feb 2016 14:35:25 +0000 (15:35 +0100)] 
Bump haddock.base allocations

I believe this is probably due to the recent RuntimeRep change.

3 years agoReconstruct record expression in bidir pattern synonym
Matthew Pickering [Thu, 25 Feb 2016 13:52:39 +0000 (14:52 +0100)] 
Reconstruct record expression in bidir pattern synonym

Reviewers: austin, rdragon, bgamari

Reviewed By: bgamari

Subscribers: rdragon, thomie

Differential Revision:

3 years agoMake warning names more consistent
Manav Rathi [Thu, 25 Feb 2016 13:51:32 +0000 (14:51 +0100)] 
Make warning names more consistent

- Replace "Sigs" with "Signatures" in WarningFlag data constructors.
- Replace "PatSyn" with "PatternSynonym" in WarningFlag data
- Deprecate "missing-local-sigs" in favor of "missing-local-signatures".
- Deprecate "missing-exported-sigs" in favor of
- Deprecate "missing-pat-syn-signatures" in favor of
- Replace "ddump-strsigs" with "ddump-str-signatures"

These complete the tasks that were explicitly mentioned in #11583

Test Plan:
Executed `ghc --show-options` and verified that the flags were changed
as expected.

Reviewers: svenpanne, austin, bgamari

Reviewed By: austin, bgamari

Subscribers: mpickering, thomie

Differential Revision:

GHC Trac Issues: #11583

3 years agoAdd more type class instances for GHC.Generics
RyanGlScott [Thu, 25 Feb 2016 13:49:48 +0000 (14:49 +0100)] 
Add more type class instances for GHC.Generics

GHC.Generics provides several representation data types that have
obvious instances of various type classes in base, along with various
other types of meta-data (such as associativity and fixity).
Specifically, instances have been added for the following type classes
(where possible):

    - Applicative
    - Data
    - Functor
    - Monad
    - MonadFix
    - MonadPlus
    - MonadZip
    - Foldable
    - Traversable
    - Enum
    - Bounded
    - Ix
    - Generic1

Thanks to ocharles for starting this!

Test Plan: Validate

Reviewers: ekmett, austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: RyanGlScott, thomie

Differential Revision:

GHC Trac Issues: #9043

3 years agoHscMain: Delete some unused code
Ömer Sinan Ağacan [Thu, 25 Feb 2016 13:47:47 +0000 (14:47 +0100)] 
HscMain: Delete some unused code

Reviewers: bgamari, austin

Reviewed By: austin

Subscribers: thomie

Differential Revision:

3 years agoApplicativeDo: Handle terminal `pure` statements
Ben Gamari [Thu, 25 Feb 2016 13:47:34 +0000 (14:47 +0100)] 
ApplicativeDo: Handle terminal `pure` statements

ApplicativeDo handled terminal `return` statements properly, but not

Test Plan: Validate with included testcase

Reviewers: austin, simonmar

Reviewed By: austin, simonmar

Subscribers: simonpj, thomie

Differential Revision:

GHC Trac Issues: #11607

3 years agobase: A selection of fixes to the comments in GHC.Stats
David Turner [Thu, 25 Feb 2016 13:46:28 +0000 (14:46 +0100)] 
base: A selection of fixes to the comments in GHC.Stats

Use `-- |` comments throughout.
Note that numByteUsageSamples is also the number of major GCs
Note that numGcs counts GCs for all generations
Note that 'current' really means 'at the end of the last major GC'

Reviewers: ezyang, hvr, simonmar, austin, bgamari

Reviewed By: ezyang, simonmar, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11603

3 years agotestsuite: mark tests broken on powerpc64
Peter Trommler [Thu, 25 Feb 2016 13:46:13 +0000 (14:46 +0100)] 
testsuite: mark tests broken on powerpc64

The following tests fail on powerpc64 and have a ticket.
Mark those tests as expect_broken.

Here are the details:
The PowerPC native code generator does not support DWARF debug
information. This is tracked in ticket #11261. Mark the respective
tests broken on powerpc64.

testsuite: mark print022 broken on powerpc64
Ticket #11262 tracks difference in stdout for print022.

testsuite: mark recomp015 broken on powerpc64
testsuite: mark recomp011 broken on powerpc64
This is tracked as ticket #11323 and #11260.

testsuite: mark linker tests broken on powerpc64
Ticket #11259 tracks tests failing because there is no RTS
linker on powerpc64.

Test Plan: validate

Reviewers: erikd, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11259, #11260, #11261, #11262, #11323

3 years agoOverload the static form to reduce verbosity.
Facundo Domínguez [Thu, 25 Feb 2016 13:33:43 +0000 (14:33 +0100)] 
Overload the static form to reduce verbosity.

Static pointers are rarely used naked: most often they are defined at
the base of a Closure, as defined in e.g. the distributed-closure and
distributed-static packages. So a typical usage pattern is:

    distributeMap (closure (static (\x -> x * 2)))

which is more verbose than it needs to be. Ideally we'd just have to

    distributeMap (static (\x -> x * 2))

and let the static pointer be lifted to a Closure implicitly. i.e.
what we want is to overload static literals, just like we already
overload list literals and string literals.

This is achieved by introducing the IsStatic type class and changing
the typing rule for static forms slightly:

    static (e :: t) :: IsStatic p => p t

Test Plan: ./validate

Reviewers: austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: simonpj, mboes, thomie

Differential Revision:

GHC Trac Issues: #11585

3 years agoTyCoRep: Add haddock sections
Ben Gamari [Wed, 24 Feb 2016 10:20:26 +0000 (11:20 +0100)] 
TyCoRep: Add haddock sections

3 years agoRemove "use mask" from StgAlt syntax
Ömer Sinan Ağacan [Wed, 24 Feb 2016 21:22:36 +0000 (16:22 -0500)] 
Remove "use mask" from StgAlt syntax

Reviewers: austin, bgamari, simonpj

Reviewed By: simonpj

Subscribers: thomie

Differential Revision:

3 years agoAddress #11471 by putting RuntimeRep in kinds.
Richard Eisenberg [Thu, 4 Feb 2016 15:42:56 +0000 (10:42 -0500)] 
Address #11471 by putting RuntimeRep in kinds.

See Note [TYPE] in TysPrim. There are still some outstanding
pieces in #11471 though, so this doesn't actually nail the bug.

This commit also contains a few performance improvements:

* Short-cut equality checking of nullary type syns

* Compare types before kinds in eqType

* INLINE coreViewOneStarKind

* Store tycon binders separately from kinds.

This resulted in a ~10% performance improvement in compiling
the Cabal package. No change in functionality other than
performance. (This affects the interface file format, though.)

This commit updates the haddock submodule.

3 years agoFollow-up to 32a9a7f514bdd33ff72a673ade
Herbert Valerio Riedel [Tue, 23 Feb 2016 22:55:23 +0000 (23:55 +0100)] 
Follow-up to 32a9a7f514bdd33ff72a673ade

...forgot to stage/add this alpha renaming to the previous commit

3 years agoExtend `-Wunrecognised-warning-flag` to cover `-f(no-)warn-*`
Herbert Valerio Riedel [Tue, 23 Feb 2016 22:13:33 +0000 (23:13 +0100)] 
Extend `-Wunrecognised-warning-flag` to cover `-f(no-)warn-*`

The original implementation for #11429 covers only `-W*` flags. However,
old packages will continue to use `-f(no-)warn-*` flags, so it seems
desirable to have `-Wunrecognised-warning-flag` apply to those legacy aliases
as well.

Reviewed By: bgamari

Differential Revision:

3 years agoTestsuite: MAKEFLAGS is magic, do not unexport it
Thomas Miedema [Tue, 23 Feb 2016 18:27:43 +0000 (19:27 +0100)] 
Testsuite: MAKEFLAGS is magic, do not unexport it

Call `+$(PYTHON) ...` to fix #11569 instead.

See Note [Communicating options and variables to a submake].

3 years agoAllow combining characters in identifiers (#7650)
Thomas Miedema [Sat, 20 Feb 2016 22:50:28 +0000 (23:50 +0100)] 
Allow combining characters in identifiers (#7650)

Reviewed by: austin, rwbarton

Differential Revision:

3 years agoTestsuite: failing profiling tests (#10037)
Thomas Miedema [Mon, 22 Feb 2016 16:57:43 +0000 (17:57 +0100)] 
Testsuite: failing profiling tests (#10037)

These tests fail not only for WAY=prof, but also for WAY=profllvm.

3 years agoFilter out -prof callstacks from test output (#11521)
Thomas Miedema [Mon, 22 Feb 2016 16:44:17 +0000 (17:44 +0100)] 
Filter out -prof callstacks from test output (#11521)

3 years agoTestsuite: cleanup profiling/should_run/all.T (#11521)
Thomas Miedema [Sun, 21 Feb 2016 12:40:56 +0000 (13:40 +0100)] 
Testsuite: cleanup profiling/should_run/all.T (#11521)

Refactoring only. I compared before and after with 'make slow', and it
still runs each test with the same 'ways' as before.

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:32:51 +0000 (21:32 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:32:51 +0000 (21:32 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoTestsuite: accept output without Windows line endings (#11631)
Thomas Miedema [Tue, 23 Feb 2016 01:25:17 +0000 (02:25 +0100)] 
Testsuite: accept output without Windows line endings (#11631)

3 years agoTestsuite: accept output without Windows line endings (#11631)
Thomas Miedema [Tue, 23 Feb 2016 01:57:53 +0000 (02:57 +0100)] 
Testsuite: accept output without Windows line endings (#11631)

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:32:51 +0000 (21:32 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:32:51 +0000 (21:32 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:32:51 +0000 (21:32 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:31:35 +0000 (21:31 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoTestsuite: delete Windows line endings [skip ci] (#11631)
Thomas Miedema [Mon, 22 Feb 2016 20:31:24 +0000 (21:31 +0100)] 
Testsuite: delete Windows line endings [skip ci] (#11631)

3 years agoAdd missing files
Simon Marlow [Tue, 23 Feb 2016 09:05:37 +0000 (09:05 +0000)] 
Add missing files

3 years agoDocs: -keep-llvm-file(s)/-ddump-llvm imply -fllvm
Thomas Miedema [Mon, 22 Feb 2016 13:31:40 +0000 (14:31 +0100)] 
Docs: -keep-llvm-file(s)/-ddump-llvm imply -fllvm

This fixes #9917.

3 years agoFix GHC.Stats documentation markup (#11619)
Thomas Miedema [Sun, 21 Feb 2016 17:31:00 +0000 (18:31 +0100)] 
Fix GHC.Stats documentation markup (#11619)

3 years agoBuild system: fix sed expression (#11537)
Thomas Miedema [Sun, 21 Feb 2016 11:23:25 +0000 (12:23 +0100)] 
Build system: fix sed expression (#11537)

This allows building ghc in '/ghc'.

3 years agoTestsuite: pass '-s --no-print-directory' to MAKE
Thomas Miedema [Sun, 21 Feb 2016 00:50:22 +0000 (01:50 +0100)] 
Testsuite: pass '-s --no-print-directory' to MAKE

This seems necessary after 9634e24 (#11569).

3 years agoAdd test for #6132: hash bang + CPP
Thomas Miedema [Sat, 20 Feb 2016 22:07:50 +0000 (23:07 +0100)] 
Add test for #6132: hash bang + CPP

3 years agounexport MAKEFLAGS when running tests (#11569)
Thomas Miedema [Sat, 20 Feb 2016 20:09:12 +0000 (21:09 +0100)] 
unexport MAKEFLAGS when running tests (#11569)

3 years agoAdd test (only) to assure that #11535 is fixed
Takayuki Muranushi [Sat, 20 Feb 2016 12:28:32 +0000 (13:28 +0100)] 
Add test (only) to assure that #11535 is fixed

Ticket #11535 dealt with derived Read instances of infix Unicode
value constructors. GHC 7.10.3 used to derive (Read/Show)
instances so that `read . show` for values of such types had no

The issue has been fixed by other compiler update. This patch
adds only tests, so that derived instance of Read/Show for infix
Unicode value constructors has correct parse, satisfying Haskell
2010 Specification.

Resolves: #11535

Test Plan: `make test TEST=T11535`

Reviewers: austin, rwbarton, thomie, bgamari

Reviewed By: rwbarton, thomie, bgamari

Subscribers: rwbarton, thomie

Projects: #ghc

Differential Revision:

GHC Trac Issues: #11535

3 years agoUse a better test for profiling
Simon Marlow [Sat, 20 Feb 2016 08:25:50 +0000 (08:25 +0000)] 
Use a better test for profiling

The previous test failed for me because I had

    GhcRTSWays += thr_debug_p

in my, which doesn't enable profiling by itself.

3 years agoFix a double-free bug in -fexternal-interpreter
Simon Marlow [Sat, 20 Feb 2016 07:39:34 +0000 (07:39 +0000)] 
Fix a double-free bug in -fexternal-interpreter

Originally I planned to make this reference manually managed, but it
looks like at some point I gave it a finalizer on the GHC side, but
forgot to remove the manual free here.  The result is that ghc-iserv
could crash in getStablePtr sometimes when using TH.

3 years agoFix a bug in ApplicativeDo (#11612)
Simon Marlow [Sat, 20 Feb 2016 07:23:37 +0000 (07:23 +0000)] 
Fix a bug in ApplicativeDo (#11612)

In some cases ApplicativeDo would miss some opportunities, due to a
wrong calculation of free variables in RnExpr.segments.

3 years agoRefactoring only: use ExprLStmt
Simon Marlow [Sat, 20 Feb 2016 06:59:10 +0000 (06:59 +0000)] 
Refactoring only: use ExprLStmt

3 years agoDocs: no space in `-i⟨dir1⟩:⟨dir2⟩` [skip ci]
Thomas Miedema [Fri, 19 Feb 2016 17:58:03 +0000 (18:58 +0100)] 
Docs: no space in `-i⟨dir1⟩:⟨dir2⟩` [skip ci]

3 years agoPass -haddock to tests in should_compile_*flag*_nohaddock
Thomas Miedema [Fri, 19 Feb 2016 16:37:29 +0000 (17:37 +0100)] 
Pass -haddock to tests in should_compile_*flag*_nohaddock

should_compile_flag_nohaddock and should_compile_noflag_nohaddock
contain the exact same tests. By passing `-haddock` to the tests in
should_compile_**flag**_nohaddock, at least they're now testing
different things.

Add documentation.

3 years agoModifier letter in middle of identifier is ok
Thomas Miedema [Fri, 19 Feb 2016 14:25:40 +0000 (15:25 +0100)] 
Modifier letter in middle of identifier is ok

Refactoring only. Cleanup some loose ends from #10196.

Initially the idea was to only allow modifier letters at the end of
identifiers. Since we later decided to allow modifier letters also in
the middle of identifiers (because not doing so would not fix the
regression completely), the names `suffix` and `okIdSuffixChar` don't
seem appropriate anymore.

Remove TODO. Move test from should_fail to should_compile.

3 years agoDelete support for deprecated "-- # ..."-style haddock options
Thomas Miedema [Fri, 19 Feb 2016 09:27:02 +0000 (10:27 +0100)] 
Delete support for deprecated "-- # ..."-style haddock options

A long time ago, you could use `"-- # <haddock options>"` to mean that
`<haddock options.` should be passed to `haddock`. Since 2007
(03d8585e0940e28e024548654fe3505685aca94f), using `OPTIONS_HADDOCK` is
the preferred way to do this.

Why is ok to remove support for "-- # .."?

* It is not mentioned in the Haddock user's guide, nor are there any
  tests that use it.

* Ever since 2011 (b3e30449aa6d6eaa978eb3c7447ca85985d9d251), it doesn't
  actually work anymore. The function `getOptionsFromFile` uses
  `gopt_unset dflags Opt_Haddock` for other reasons, so even when
  running ghc with `--haddock`, the following rule always fires when the
  lexer sees "-- # ..", and it gets treated as a normal comment:

    -- Next, match Haddock comments if no -haddock flag
    "-- " [$docsym \#] .* / { ifExtension (not . haddockEnabled) } { lineCommentToken }

Reviewed by: bgamari

Differential Revision:

3 years agoA few more typos in non-code
Gabor Greif [Fri, 19 Feb 2016 11:57:03 +0000 (12:57 +0100)] 
A few more typos in non-code

3 years agoBump haddock submodule
Ben Gamari [Thu, 18 Feb 2016 22:16:19 +0000 (23:16 +0100)] 
Bump haddock submodule

3 years agoUnwire Typeable representation types
Ben Gamari [Thu, 18 Feb 2016 21:05:02 +0000 (22:05 +0100)] 
Unwire Typeable representation types

In order to make this work I needed to shuffle around typechecking a bit
such that `TyCon` and friends are available during compilation of
GHC.Types.  I also did a bit of refactoring of `TcTypeable`.

Test Plan: Validate

Reviewers: simonpj, austin

Subscribers: simonpj, thomie

Differential Revision:

GHC Trac Issues: #11120

3 years agoTake type-function arity into account
Simon Peyton Jones [Thu, 18 Feb 2016 12:52:18 +0000 (12:52 +0000)] 
Take type-function arity into account

...when computing the size of a call on the RHS of a type
instance declaration.

This came up in Trac #11581.  The change is in
which now trims the type arguments in a call.  See the
comments with that function definition.

3 years agoImprove piResultTys and friends
Simon Peyton Jones [Thu, 18 Feb 2016 11:34:12 +0000 (11:34 +0000)] 
Improve piResultTys and friends

Several things here:

* Re-implement piResultTys so that its substitution has
  the correct in-scope set

  That means paying close attention to performance, since as we
  discovered in Trac #11371, it's a heavily used function and
  is often used on ordinary function types, with no foralls to
  worry about substituting.

* Kill off applyTys, which was just the same as piResultTys.

* Re-engineer MkCore.mkCoreApps so that it calls piResultTys,
  rather than repeatedly calling piResultTy.

3 years ago(Another) minor refactoring of substitutions
Simon Peyton Jones [Thu, 18 Feb 2016 11:25:38 +0000 (11:25 +0000)] 
(Another) minor refactoring of substitutions

No change in functionality here, but greater clarity:

* In FamInstEnv.FlattenEnv, kill off the fi_in_scope field
  We are already maintaining an in-scope set in the fe_subst field,
  so it's silly do to it twice.

  (This isn't strictly connected to the rest of this patch, but
  the nomenclature changes below affect the same code, so I put
  them together.)

* TyCoRep.extendTCVSubst used to take a TyVar or a CoVar and work
  out what to do, but in fact we almost always know which of the
  two we are doing.  So:
    - define extendTvSubst, extendCvSubst
    - and use them

* Similar renamings in TyCoRep:
   - extendTCvSubstList        -->   extendTvSubstList
   - extendTCvSubstBinder      -->   extendTvSubstBinder
   - extendTCvSubstAndInScope  --> extendTvSubstAndInScope

* Add Type.extendTvSubstWithClone, extendCvSubstWithClone

* Similar nomenclature changes in Subst, SimplEnv, Specialise

* Kill off TyCoRep.substTelescope (never used)

3 years agoFix desugaring of bang-pattern let-bindings
Simon Peyton Jones [Thu, 18 Feb 2016 11:05:45 +0000 (11:05 +0000)] 
Fix desugaring of bang-pattern let-bindings

When implementing Strict Haskell, the patch 46a03fbe didn't faithfully
implement the semantics given in the manual. In particular there was
an ad-hoc case in mkSelectorBinds for "strict and no binders" that
didn't work.

This patch fixes it, curing Trac #11572.

Howver it forced me to think about banged let-bindings, and I rather
think we do not have quite the right semantics yet, so I've opened
Trac #11601.

3 years agoFix thinko that crept into D1908
Ben Gamari [Wed, 17 Feb 2016 20:18:00 +0000 (21:18 +0100)] 
Fix thinko that crept into D1908

RyanGlScott updated the Diff only after I had merged it.

3 years agoComments only (#11513)
Richard Eisenberg [Wed, 17 Feb 2016 21:22:22 +0000 (16:22 -0500)] 
Comments only (#11513)

3 years agousers-guide: Fix typos
Mark Christiaens [Wed, 17 Feb 2016 13:04:42 +0000 (14:04 +0100)] 
users-guide: Fix typos

Reviewers: austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11590

3 years agoRemove superfluous code when deriving Foldable/Traversable
RyanGlScott [Wed, 17 Feb 2016 11:06:17 +0000 (12:06 +0100)] 
Remove superfluous code when deriving Foldable/Traversable

Currently, `-XDeriveFoldable` and `-XDeriveTraversable` generate
unnecessary `mempty` and `pure` expressions when it traverses of an
argument of a constructor whose type does not mention the last type
parameter. Not only is this inefficient, but it prevents `Traversable`
from being derivable for datatypes with unlifted arguments (see
Trac #11174).

The solution to this problem is to adopt a slight change to the
algorithms for `-XDeriveFoldable` and `-XDeriveTraversable`, which is
described in [this wiki
The wiki page also describes why we don't apply the same changes to the
algorithm for `-XDeriveFunctor`.

This is techincally a breaking change for users of `-XDeriveFoldable`
and `-XDeriveTraversable`, since if someone was using a law-breaking
`Monoid` instance with a derived `Foldable` instance (i.e., one where `x
<> mempty` does not equal `x`) or a law-breaking `Applicative` instance
with a derived `Traversable` instance, then the new generated code could
result in different behavior. I suspect the number of scenarios like
this is very small, and the onus really should be on those users to fix
up their `Monoid`/`Applicative` instances.

Fixes #11174.

Test Plan: ./validate

Reviewers: hvr, simonpj, austin, bgamari

Reviewed By: simonpj, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11174

3 years agoDerive Eq and Ord instance for SrcLoc and RealSrcLoc
Gabriel Gonzalez [Wed, 17 Feb 2016 09:59:09 +0000 (10:59 +0100)] 
Derive Eq and Ord instance for SrcLoc and RealSrcLoc

The Eq and Ord instance were previously hand-written and this change
updates them to be automatically derived by the compiler.  The derived
behavior should be equivalent to the original.

Reviewers: hvr, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoFix #11313.
Richard Eisenberg [Wed, 10 Feb 2016 14:38:09 +0000 (09:38 -0500)] 
Fix #11313.

Previously, we looked through synonyms when counting arguments,
but that's a bit silly.

3 years agoFix #11246.
Richard Eisenberg [Wed, 10 Feb 2016 14:09:26 +0000 (09:09 -0500)] 
Fix #11246.

We have to instantiate any invisible arguments to type families
right away. This is now done in tcTyCon in TcHsType.

testcase: typecheck/should_compile/T11246

3 years agoFix #11241.
Richard Eisenberg [Wed, 10 Feb 2016 13:35:22 +0000 (08:35 -0500)] 
Fix #11241.

When renaming a type, now looks for wildcards in bound variables'

testcase: dependent/should_compile/T11241

3 years agoUse CoercionN and friends in TyCoRep
Richard Eisenberg [Wed, 10 Feb 2016 13:03:56 +0000 (08:03 -0500)] 
Use CoercionN and friends in TyCoRep

3 years agoRemove extraneous fundeps on (~)
Richard Eisenberg [Thu, 4 Feb 2016 23:31:25 +0000 (18:31 -0500)] 
Remove extraneous fundeps on (~)

3 years agoAdd missing kind cast to pure unifier.
Richard Eisenberg [Sat, 30 Jan 2016 21:49:22 +0000 (16:49 -0500)] 
Add missing kind cast to pure unifier.

3 years agoExistentials should be specified.
Richard Eisenberg [Fri, 29 Jan 2016 18:09:42 +0000 (13:09 -0500)] 
Existentials should be specified.

This addresses point (2) from #11513.

3 years agoMake exactTyCoVarsOfTypes closed over kinds.
Richard Eisenberg [Thu, 28 Jan 2016 22:39:03 +0000 (17:39 -0500)] 
Make exactTyCoVarsOfTypes closed over kinds.

3 years agoSmall refactor and comments
Simon Peyton Jones [Wed, 17 Feb 2016 14:37:42 +0000 (14:37 +0000)] 
Small refactor and comments

Related to the fix to Trac #9611

3 years agoSimplify the defn of coreViewOneStarKind
Simon Peyton Jones [Wed, 17 Feb 2016 14:36:49 +0000 (14:36 +0000)] 
Simplify the defn of coreViewOneStarKind

I discussed it with Richard, but this version is much
simmpler and more efficient.

3 years agoComments only
Simon Peyton Jones [Wed, 17 Feb 2016 09:20:41 +0000 (09:20 +0000)] 
Comments only

3 years agoTestsuite: delete compiler_lt/le/gt/ge setup functions
Thomas Miedema [Tue, 16 Feb 2016 13:17:35 +0000 (14:17 +0100)] 
Testsuite: delete compiler_lt/le/gt/ge setup functions

Since we're not consisently keeping track of which tests should pass
with which compiler versions, there is no point in keeping these

Update submodules containers, hpc and stm.

3 years agoDynFlags: Don't panic on incompatible Safe Haskell flags
Ben Gamari [Tue, 16 Feb 2016 21:45:57 +0000 (22:45 +0100)] 
DynFlags: Don't panic on incompatible Safe Haskell flags

We just return an arbitrary value since we are destined to fail due to
the error anyways.

Fixes #11580.

Test Plan: Needs to be tested

Reviewers: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11580

3 years agoRemove documentation for -Wlazy-unlifted-bindings
Ben Gamari [Tue, 16 Feb 2016 21:45:33 +0000 (22:45 +0100)] 
Remove documentation for -Wlazy-unlifted-bindings

This flag was supposed to be removed in 7.10. This finally resolves
Trac #8022.

Test Plan: Read it

Reviewers: austin

Reviewed By: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #8022

3 years agoSuggest candidate instances in error message
Yuras Shumovich [Tue, 16 Feb 2016 21:45:13 +0000 (22:45 +0100)] 
Suggest candidate instances in error message

See Trac #9611. In "No instance..." error message we suggest instances
for other types with the same occ name. It is usefull e.g. when we have
two different versions of the same package installed.

Test Plan: typecheck/should_fail/tcfail224

Reviewers: austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #9611

3 years agoFix typos
Rik Steenkamp [Tue, 16 Feb 2016 21:44:42 +0000 (22:44 +0100)] 
Fix typos

Reviewers: bgamari, austin

Reviewed By: austin

Subscribers: thomie

Differential Revision:

3 years agoPowerPC: Improve float register assignment.
Peter Trommler [Tue, 16 Feb 2016 21:44:25 +0000 (22:44 +0100)] 
PowerPC: Improve float register assignment.

On Linux assign F5 and F6 and D3 through D6 to caller-saved registers.

Fixes #11273

Test Plan: validate on powerpc (I validated on powerpc64)

Reviewers: bgamari, erikd, austin

Reviewed By: erikd, austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11273

3 years agoFix two wrong uses of "data constructor" in error msgs
Rik Steenkamp [Tue, 16 Feb 2016 21:42:08 +0000 (22:42 +0100)] 
Fix two wrong uses of "data constructor" in error msgs

Replace `NoDataKinds :: PromotionErr` by `NoDataKindsTC` and
`NoDataKindsDC` (just like there is `NoTypeInTypeTC` and
`NoTypeInTypeDC`). This allows for a correct error message when a kind
signature contains a type constructor and `-XDataKinds` is not

Apply a small fix to `TcError.hs` where instead of "data constructor" we
should say "pattern synonym".

Reviewers: austin, goldfire, bgamari

Reviewed By: bgamari

Subscribers: goldfire, thomie

Differential Revision:

3 years agoImproved error message about exported type operators.
Ulya Trofimovich [Tue, 16 Feb 2016 21:41:50 +0000 (22:41 +0100)] 
Improved error message about exported type operators.

There is ambiguty between (1) type constructors and (2) data
constructors in export lists, e.g. '%%' can stand for both of them. This
ambiguity is resolved in favor of (2).

If the exported data constructor is not in scope, but type constructor
with the same name is in scope, GHC should suggest adding 'type' keyword
to resolve ambiguity in favor of (1) and enabling 'TypeOperators'

The patch only extends the error message.

See Trac #11432.

Test Plan: `make test`

Reviewers: simonpj, bgamari, austin

Reviewed By: simonpj

Subscribers: mpickering, thomie, goldfire, kosmikus

Differential Revision:

GHC Trac Issues: #11432

3 years agoMake bootstrapping more robust
Herbert Valerio Riedel [Tue, 16 Feb 2016 21:41:29 +0000 (22:41 +0100)] 
Make bootstrapping more robust

Starting with GHC 8.0 we rely on GHC's native cabal macro generation.

As a side-effect, this limits the packages in scope when compiling
`ghc-cabal` for all bootstrapping GHCs.

Reviewers: ezyang, austin, thomie, bgamari

Reviewed By: thomie, bgamari

Differential Revision:

GHC Trac Issues: #11413

3 years agoBump haddock submodule
Ben Gamari [Fri, 12 Feb 2016 09:04:48 +0000 (10:04 +0100)] 
Bump haddock submodule

3 years agoTestsuite: delete only_compiler_types, assume ghc
Thomas Miedema [Mon, 15 Feb 2016 22:31:58 +0000 (23:31 +0100)] 
Testsuite: delete only_compiler_types, assume ghc

Update submodules stm, hpc and unix.

Differential Revision:

3 years agoAdd missing newlines at end of file [skip ci]
Thomas Miedema [Mon, 15 Feb 2016 22:20:56 +0000 (23:20 +0100)] 
Add missing newlines at end of file [skip ci]

3 years agoRename missing-pat-syn-sigs to missing-pat-syn-signatures
Matthew Pickering [Mon, 15 Feb 2016 23:33:04 +0000 (23:33 +0000)] 
Rename missing-pat-syn-sigs to missing-pat-syn-signatures

3 years agoMake T11361 actually run with reversed uniques
Bartosz Nitka [Mon, 15 Feb 2016 17:36:17 +0000 (09:36 -0800)] 
Make T11361 actually run with reversed uniques

`-dunique-increment` doesn't work inside the file.

Test Plan: I've discovered it doesn't work in D1917.

Reviewers: simonpj, bgamari, austin

Subscribers: thomie, simonmar

Differential Revision:

GHC Trac Issues: #11361