3 years agoSmall simplification (#11777)
Simon Marlow [Mon, 11 Apr 2016 11:59:36 +0000 (04:59 -0700)] 
Small simplification (#11777)

DEAD_WEAK used to have a different layout, see

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

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...

3 years agoDeriving Functor-like classes should unify kind variables
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

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

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

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

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

3 years agoTypos in Note
Joachim Breitner [Sun, 10 Apr 2016 21:47:25 +0000 (23:47 +0200)] 
Typos in Note

3 years agoRtsFlags: Un-constify temporary buffer
Ben Gamari [Sun, 10 Apr 2016 21:28:46 +0000 (23:28 +0200)] 
RtsFlags: Un-constify temporary buffer

Otherwise we get a const-ness mismatch when we free the buffer, which
for some reason gcc 5.3 didn't notice.

3 years agoRemove the instantiation check when deriving Generic(1)
RyanGlScott [Sun, 10 Apr 2016 20:59:37 +0000 (22:59 +0200)] 
Remove the instantiation check when deriving Generic(1)

Previously, deriving `Generic(1)` bailed out when attempting to
instantiate visible type parameters (#5939), but this instantiation
check was quite fragile and doesn't interact well with `-XTypeInType`.
It has been decided that `Generic(1)` shouldn't be subjected to this
check anyway, so it has been removed, and `gen_Generic_binds`'s
machinery has been updated to substitute the type variables in a
generated `Rep`/`Rep1` instance with the user-supplied type arguments.

In addition, this also refactors `Condition` in `TcDeriv` a bit. Namely,
since we no longer need `tc_args` to check any conditions, the `[Type]`
component of `Condition` has been removed.

Fixes #11732.

Test Plan: ./validate

Reviewers: goldfire, kosmikus, simonpj, bgamari, austin

Reviewed By: simonpj, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #5939, #11732

3 years agobase: Fix "since" annotation on GHC.ExecutionStack
Ben Gamari [Sun, 10 Apr 2016 18:00:48 +0000 (20:00 +0200)] 
base: Fix "since" annotation on GHC.ExecutionStack

I have no idea where "4.11" came from.

3 years agoBump haddock submodule
Ben Gamari [Sun, 10 Apr 2016 17:34:59 +0000 (19:34 +0200)] 
Bump haddock submodule

Fixes #11818, where haddock's documentation broke `make install` when
Sphinx is not available.

3 years agoFix suggestions for unbound variables (#11680)
Jason Eisenberg [Sun, 10 Apr 2016 17:17:46 +0000 (19:17 +0200)] 
Fix suggestions for unbound variables (#11680)

When the typechecker generates the error message for an out-of-scope
variable, it now uses the GlobalRdrEnv with respect to which the
variable is unbound, not the GlobalRdrEnv which is available at the time
the error is reported.  Doing so ensures we do not provide suggestions
which themselves are out-of-scope (because they are bound in a later
inter-splice group).

Nonetheless, we do note in the error message if an unambiguous, exact
match to the out-of-scope variable is found in a later inter-splice
group, and we specify where that match is not in scope.

Test Plan: ./validate

Reviewers: goldfire, austin, bgamari

Reviewed By: goldfire

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11680

3 years agoExport zonkEvBinds from TcHsSyn.
Conal Elliott [Sun, 10 Apr 2016 17:13:44 +0000 (19:13 +0200)] 
Export zonkEvBinds from TcHsSyn.

Needed for constructing correct constraint-satisfying code
(particularly type class instances) in a Core-to-Core transformation.

Reviewers: simonpj, austin, bgamari

Reviewed By: austin, bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11804

3 years agoReduce default for -fmax-pmcheck-iterations from 1e7 to 2e6
Herbert Valerio Riedel [Sun, 10 Apr 2016 17:13:16 +0000 (19:13 +0200)] 
Reduce default for -fmax-pmcheck-iterations from 1e7 to 2e6

The commit 28f951edfe50ea5182065144340061ec326781f5 introduced the
`-fmax-pmcheck-iterations` flag and set the default limit to 1e7

However, this value is still high enough that it can result GHC to
exhibit memory spikes beyond 1 GiB of RAM usage (heap profile showed
several `(:)`s, as well as `THUNK_2_0`, and `PmCon` during the memory

A value of 2e6 seems to be a safer upper bound which still manages to
let the checker not run into the limit in most cases.

Test Plan: Validate, try building a few Hackage packages

Reviewers: austin, gkaracha, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoFix Template Haskell bug reported in #11809.
Dominik Bollmann [Sun, 10 Apr 2016 16:57:38 +0000 (18:57 +0200)] 
Fix Template Haskell bug reported in #11809.

Record selectors of data types spliced in with Template Haskell are not
renamer-resolved correctly in GHC HEAD. The culprit is
`newRecordSelector` which violates notes `Note [Binders in Template
Haskell] in Convert.hs` and `Note [Looking up Exact RdrNames] in
RnEnv.hs`. This commit fixes `newRecordSelector` accordingly.

Test Plan: ./validate

Reviewers: thomie, mpickering, bgamari, austin, simonpj, goldfire

Reviewed By: goldfire

Differential Revision:

GHC Trac Issues: #11809

3 years agoRemove spurious STG_UNUSED annotation
Tomas Carnecky [Sun, 10 Apr 2016 16:56:35 +0000 (18:56 +0200)] 
Remove spurious STG_UNUSED annotation

Reviewers: austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoRemove left-over shell-tools.c
Herbert Valerio Riedel [Sun, 10 Apr 2016 16:56:11 +0000 (18:56 +0200)] 
Remove left-over shell-tools.c

The last user of this file was the "-dynload wrapper"
which was removed in 169f5972d5398e75c4cf7f831b6ce703288ec73c
for addressing #4275

Reviewers: austin, erikd, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #4275

3 years agoAdd doc to (<=<) comparing its type to (.)
Chris Martin [Sun, 10 Apr 2016 16:55:45 +0000 (18:55 +0200)] 
Add doc to (<=<) comparing its type to (.)

This is another documentation addition similar to D1989, this time
comparing the type of the Kleisli composition operator (<=<) to that
of plain function composition (.).

Reviewers: hvr, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoProvide an optimized replicateM_ implementation #11795
Michael Snoyman [Sun, 10 Apr 2016 16:52:47 +0000 (18:52 +0200)] 
Provide an optimized replicateM_ implementation #11795

In my testing, the worker/wrapper transformation applied here
significantly decreases the number of allocations performed when using
replicateM_. Additionally, this version of the function behaves
correctly for negative numbers (namely, it will behave the same as
replicateM_ 0, which is what previous versions of base have done).

Reviewers: bgamari, simonpj, hvr, austin

Reviewed By: bgamari, simonpj, austin

Subscribers: nomeata, simonpj, mpickering, thomie

Differential Revision:

GHC Trac Issues: #11795

3 years agoRefactor comments about shutdown
Simon Marlow [Wed, 27 May 2015 11:08:17 +0000 (12:08 +0100)] 
Refactor comments about shutdown

3 years agoFix a comment: triple -> tuple
Bartosz Nitka [Fri, 8 Apr 2016 15:17:58 +0000 (08:17 -0700)] 
Fix a comment: triple -> tuple

Someone must have forgotten to change this.

3 years agoRemove obsolete comment about the implementation of foldl
Joachim Breitner [Fri, 8 Apr 2016 09:09:26 +0000 (11:09 +0200)] 
Remove obsolete comment about the implementation of foldl

3 years agoGHC.Base: Use thenIO in instance Applicative IO
Joachim Breitner [Fri, 8 Apr 2016 06:33:35 +0000 (08:33 +0200)] 
GHC.Base: Use thenIO in instance Applicative IO

Since recent changes to CSE, the previous definition were no longer CSEd
with thenIO, which resulted in extra steps in the simplifier and hence
slightly larger compile times. See ticket:11781#comment:7.

Differential Revision:

3 years agoRevert "testsuite: One more 32-bit performance slip"
Ben Gamari [Thu, 7 Apr 2016 19:18:58 +0000 (21:18 +0200)] 
Revert "testsuite: One more 32-bit performance slip"

This reverts commit 06b7ce21571cc6696ded6126098f0f596f4ba3ca.

3 years agorts: Fix parsing of profiler selectors
Ben Gamari [Thu, 7 Apr 2016 13:26:11 +0000 (15:26 +0200)] 
rts: Fix parsing of profiler selectors

69822f0c5b67161b4d7558081bc94f6f3a7c5dbb broke this as it held on to a
reference into the `arg` string, which is later freed. Humbug.

Test Plan: Try using filtering

Reviewers: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11810

3 years agoFix installation of static sphinx assets
Ben Gamari [Wed, 6 Apr 2016 21:40:44 +0000 (23:40 +0200)] 
Fix installation of static sphinx assets

Previously the `_static` and `_sources` directories were installed in
the wrong parents. See #11803

3 years agotestsuite: One more 32-bit performance slip
Ben Gamari [Wed, 6 Apr 2016 19:36:52 +0000 (21:36 +0200)] 
testsuite: One more 32-bit performance slip

(cherry picked from commit 6d36d8e19a7e9cf3d8e715b1820cb656e937e809)

3 years agoAdjust performance numbers
Joachim Breitner [Thu, 7 Apr 2016 07:21:22 +0000 (09:21 +0200)] 
Adjust performance numbers

to what phabricator found; not sure why my local validation yielded
different numbers.

3 years agoruntime: replace hw.ncpu with hw.logicalcpu for Mac OS X
Eugene Akentyev [Thu, 7 Apr 2016 03:44:59 +0000 (03:44 +0000)] 
runtime: replace hw.ncpu with hw.logicalcpu for Mac OS X

Reviewed By: erikd, austin

Differential Revision:

GHC Trac Issues: #8594

3 years agoSet tct_closed to TopLevel for closed bindings.
Facundo Domínguez [Thu, 17 Mar 2016 15:21:25 +0000 (12:21 -0300)] 
Set tct_closed to TopLevel for closed bindings.

Till now tct_closed determined whether the type of a binding is closed.
With this patch tct_closed indicates whether the binding is closed.

Test Plan: ./validate

Reviewers: simonpj, austin, bgamari

Reviewed By: simonpj

Subscribers: mboes, thomie, simonpj

Differential Revision:

GHC Trac Issues: #11698

3 years agoDemand Analyzer: Do not set OneShot information (second try)
Joachim Breitner [Fri, 1 Apr 2016 11:11:18 +0000 (13:11 +0200)] 
Demand Analyzer: Do not set OneShot information (second try)

as suggested in ticket:11770#comment:1. This code was buggy
(#11770), and the occurrence analyzer does the same job anyways.

This also elaborates the notes in the occurrence analyzer accordingly.

Previously, the worker/wrapper code would go through lengths to transfer
the oneShot annotations from the original function to both the worker
and the wrapper. We now simply transfer the demand on the worker, and
let the subsequent occurrence analyzer push this onto the lambda

This also requires the occurrence analyzer to do this more reliably.
Previously, it would not hand out OneShot annotatoins to things that
would not `certainly_inline` (and it might not have mattered, as the
Demand Analysis might have handed out the annotations). Now we hand out
one-shot annotations unconditionally.

Differential Revision:

3 years agoCSE code cleanup and improvement
Simon Peyton Jones [Fri, 1 Apr 2016 10:24:50 +0000 (12:24 +0200)] 
CSE code cleanup and improvement

Triggered by an observation by Joachim, Simon felt the urge to clean up
the CSE code a bit. This is the result.

(Code by Simon, commit message and other leg-work by Joachim)

Differential Revision:

3 years agoCore pretty printer: Omit wild case binders
Joachim Breitner [Wed, 30 Mar 2016 11:22:26 +0000 (13:22 +0200)] 
Core pretty printer: Omit wild case binders

as they (especially their id info with absence information) clutter the
output too much. They come back with debug_on.

Differential Revision:

3 years agotestsuite: Update 32-bit performance numbers
Ben Gamari [Wed, 6 Apr 2016 16:27:52 +0000 (18:27 +0200)] 
testsuite: Update 32-bit performance numbers

It's been quite a while since this has happened for some of our tests.

3 years agoT10870: Skip on 32-bit architectures
Ben Gamari [Wed, 6 Apr 2016 15:12:45 +0000 (17:12 +0200)] 
T10870: Skip on 32-bit architectures

Shifts by amounts greater-than-or-equal-to the word size are undefined.

3 years agoT10272, T4340: Add 32-bit output
Ben Gamari [Wed, 6 Apr 2016 14:51:56 +0000 (16:51 +0200)] 
T10272, T4340: Add 32-bit output

3 years agoFix misattribution of `-Wunused-local-binds` warnings
Herbert Valerio Riedel [Tue, 5 Apr 2016 13:15:47 +0000 (15:15 +0200)] 
Fix misattribution of `-Wunused-local-binds` warnings

This fixes a bug where warnings actually controlled by

- `Opt_WarnUnusedMatches`
- `Opt_WarnUnusedTypePatterns`
- `Opt_WarnUnusedTopBinds`

were incorrectly reported as being controlled by
`Opt_WarnUnusedLocalBinds` as well

This bug was introduced in bb5afd3c274011c5ea302210b4c290ec1f83209c
while implementing #10752

Test Plan: ./validate still running -- testsuite output wiggles expected

Reviewers: barrucadu, quchen, austin, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoUse exprCtOrigin in tcRnExpr
Simon Peyton Jones [Tue, 5 Apr 2016 12:44:21 +0000 (13:44 +0100)] 
Use exprCtOrigin in tcRnExpr

Richard suggested this, a good idea

3 years agoDon't infer CallStacks
Eric Seidel [Mon, 4 Apr 2016 10:05:01 +0000 (12:05 +0200)] 
Don't infer CallStacks

We originally wanted CallStacks to be opt-in, but dealing with let
binders complicated things, forcing us to infer CallStacks. It turns
out that the inference is actually unnecessary though, we can let the
wanted CallStacks bubble up to the outer context by refusing to
quantify over them. Eventually they'll be solved from a given CallStack
or defaulted to the empty CallStack if they reach the top.

So this patch prevents GHC from quantifying over CallStacks, getting us
back to the original plan. There's a small ugliness to do with
PartialTypeSignatures, if the partial theta contains a CallStack
constraint, we *do* want to quantify over the CallStack; the user asked
us to!

Note that this means that

  foo :: _ => CallStack
  foo = getCallStack callStack

will be an *empty* CallStack, since we won't infer a CallStack for the
hole in the theta. I think this is the right move though, since we want
CallStacks to be opt-in. One can always write

  foo :: (HasCallStack, _) => CallStack
  foo = getCallStack callStack

to get the CallStack and still have GHC infer the rest of the theta.

Test Plan: ./validate

Reviewers: goldfire, simonpj, austin, hvr, bgamari

Reviewed By: simonpj, bgamari

Subscribers: bitemyapp, thomie

Projects: #ghc

Differential Revision:

GHC Trac Issues: #11573

3 years agoBump binary submodule
Ben Gamari [Mon, 4 Apr 2016 09:52:43 +0000 (11:52 +0200)] 
Bump binary submodule

3 years agoElaborate test for #11376
Simon Peyton Jones [Mon, 4 Apr 2016 09:34:35 +0000 (10:34 +0100)] 
Elaborate test for #11376

This just adds the Prox stuff from the Description in Trac #11376
to the test case,

The class stuff seems weird becuase the type is ambiguous

3 years agorts: Make StablePtr derefs thread-safe (#10296)
Jason Eisenberg [Mon, 4 Apr 2016 08:57:39 +0000 (10:57 +0200)] 
rts: Make StablePtr derefs thread-safe (#10296)

Stable pointers can now be safely dereferenced while the stable pointer
table is simultaneously being enlarged.

Test Plan: ./validate

Reviewers: ezyang, austin, bgamari, simonmar

Subscribers: carter, thomie

Differential Revision:

GHC Trac Issues: #10296

3 years agoDeeply instantiate in :type
Simon Peyton Jones [Mon, 4 Apr 2016 09:18:43 +0000 (10:18 +0100)] 
Deeply instantiate in :type

See Trac #11376 and
 Note [Deeply instantiate in :type] in TcRnDriver

Sadly this showed up one new problem (Trac #11786) and one opportunity
(Trac #11787), so test T11549 is now marked expect-broken on these two.

3 years agoImprove printing of pattern synonym types
Rik Steenkamp [Sat, 2 Apr 2016 19:39:10 +0000 (20:39 +0100)] 
Improve printing of pattern synonym types

Add the function `pprPatSynType :: PatSyn -> SDoc` for printing pattern
synonym types, and remove the ambiguous `patSynType` function. Also,
the types in a `PatSyn` are now tidy.

Haddock submodule updated to reflect the removal of `patSynType` by

Fixes: #11213.

Reviewers: goldfire, simonpj, austin, mpickering, bgamari

Reviewed By: simonpj, mpickering

Subscribers: bollmann, simonpj, thomie

Differential Revision:

GHC Trac Issues: #11213

3 years agoMake the example for -M work
Bartosz Nitka [Fri, 1 Apr 2016 20:03:17 +0000 (13:03 -0700)] 
Make the example for -M work

`ghc` fails without `-dep-suffix ''`.

Test Plan: visual inspection

Reviewers: austin, bgamari

Reviewed By: bgamari

Subscribers: thomie, simonmar

Differential Revision:

3 years agoRevert "Demand Analyzer: Do not set OneShot information"
Joachim Breitner [Thu, 31 Mar 2016 16:29:50 +0000 (18:29 +0200)] 
Revert "Demand Analyzer: Do not set OneShot information"

This reverts commit 28fe0eea4d161b707f67aae26fddaa2e60d8a901 due to
various regressions. I’m not sure why my local
./validate --slow
run did not catch this, though.

3 years agoRevert accidental change to collectTyAndValBinders
Simon Peyton Jones [Thu, 31 Mar 2016 09:47:47 +0000 (10:47 +0100)] 
Revert accidental change to collectTyAndValBinders

Richard accidetally introduced this change in his big kind-equality
patch.  The code is wrong, and potentially could cause binders to
be re-ordered.

Worth merging to 8.0.

3 years agoDemand Analyzer: Do not set OneShot information
Joachim Breitner [Wed, 30 Mar 2016 08:05:28 +0000 (10:05 +0200)] 
Demand Analyzer: Do not set OneShot information

as suggested in ticket:11770#comment:1. This code was buggy (#11770),
and the occurrence analyzer does the same job anyways.

This also elaborates the notes in the occurrence analyzer accordingly.

Differential Revision:

3 years agoRefactor error generation for pattern synonyms
Simon Peyton Jones [Wed, 30 Mar 2016 16:31:59 +0000 (17:31 +0100)] 
Refactor error generation for pattern synonyms

The result of a series of patches on type-error messages for
pattern synonyms had become a bit baroque. This tidies it up
a bit.  Still not fantastic, but better.

3 years agoMake SigSkol take TcType not ExpType
Simon Peyton Jones [Wed, 30 Mar 2016 16:23:37 +0000 (17:23 +0100)] 
Make SigSkol take TcType not ExpType

For some reason a SigSkol had an ExpType in it, and there were
lots of places where we needed it to have a TcType.  And was indeed
always a Check.  All a lot of fuss about nothing.

Delete code, fewer failure points, types are more precise.
All good.

3 years agoSmall refactor of TcMType.tauifyExpType
Simon Peyton Jones [Wed, 30 Mar 2016 16:19:51 +0000 (17:19 +0100)] 
Small refactor of TcMType.tauifyExpType

Mainly to make it clearer that tauifyExpType
is a no-op on (Check ty)

3 years agoRefactor in TcMatches
Simon Peyton Jones [Wed, 30 Mar 2016 16:14:11 +0000 (17:14 +0100)] 
Refactor in TcMatches

* Move the several calls of tauifyMultipleMatches into tcMatches,
  so that it can be called only once, and the invariants are

* I discovered in doing this that HsLamCase had a redundant and
  tiresome argument, so I removed it. That in turn allowed some
  modest but nice code simplification

3 years agoComments only
Simon Peyton Jones [Wed, 30 Mar 2016 16:09:10 +0000 (17:09 +0100)] 
Comments only

3 years agoMinor refactoring in mkExport
Simon Peyton Jones [Tue, 29 Mar 2016 08:57:29 +0000 (09:57 +0100)] 
Minor refactoring in mkExport

No change in behaviour

3 years agoComments only
Simon Peyton Jones [Tue, 29 Mar 2016 08:57:06 +0000 (09:57 +0100)] 
Comments only

3 years agoKill the magic of Any
Ben Gamari [Wed, 30 Mar 2016 19:58:24 +0000 (21:58 +0200)] 
Kill the magic of Any

This turns `Any` into a standard wired-in type family defined in
`GHC.Types`, instead its current incarnation as a magical creature
provided by the `GHC.Prim`.  Also kill `AnyK`.

See #10886.

Test Plan: Validate

Reviewers: simonpj, goldfire, austin, hvr

Reviewed By: simonpj

Subscribers: goldfire, thomie

Differential Revision:

GHC Trac Issues: #10886

3 years agoAdd -f(no-)version-macro to explicitly control macros.
Edward Z. Yang [Wed, 30 Mar 2016 19:44:09 +0000 (21:44 +0200)] 
Add -f(no-)version-macro to explicitly control macros.

Test Plan: validate

Reviewers: thomie, austin, bgamari

Reviewed By: bgamari

Subscribers: hvr

Differential Revision:

GHC Trac Issues: #11763

3 years agoDon't require -hide-all-packages for MIN_VERSION_* macros
Thomas Miedema [Wed, 30 Mar 2016 19:43:51 +0000 (21:43 +0200)] 
Don't require -hide-all-packages for MIN_VERSION_* macros

Define MIN_VERSION_pkgname and VERSION_pkgname macros for all exposed
packages, without requiring -hide-all-packages.

See #10970 comment 7-10 for discussion.

Reviewers: duncan, ezyang, bgamari, austin

Reviewed By: ezyang

Subscribers: hvr, rwbarton

Differential Revision:

GHC Trac Issues: #10970

3 years agoghc-prim: Mark unpackCStringUtf8# and unpackNBytes# as NOINLINE
Ben Gamari [Wed, 30 Mar 2016 08:29:02 +0000 (10:29 +0200)] 
ghc-prim: Mark unpackCStringUtf8# and unpackNBytes# as NOINLINE

There is no benefit to be had from inlining this function and it may
defeat rewrite rules if inlined early. See #11772..

Test Plan: Validate, nofib

Reviewers: simonpj, austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11772

3 years agoDefer inlining of Ord methods
Ben Gamari [Wed, 30 Mar 2016 08:46:39 +0000 (10:46 +0200)] 
Defer inlining of Ord methods

This performs the same refactoring performed in D1980 for Eq on Ord,
rewriting the class operations in terms of monomorphic helpers than can
be reliably matched in rewrite rules.

3 years agoghc-prim: Delay inlining of {gt,ge,lt,le}Int to phase 1
Ben Gamari [Wed, 30 Mar 2016 08:09:36 +0000 (10:09 +0200)] 
ghc-prim: Delay inlining of {gt,ge,lt,le}Int to phase 1

Otherwise rewrite rules may not get an opporunity to fire.

3 years agorts/posix/Itimer.c: Handle EINTR when reading timerfd
Erik de Castro Lopo [Mon, 28 Mar 2016 03:29:37 +0000 (14:29 +1100)] 
rts/posix/Itimer.c: Handle EINTR when reading timerfd

Commit 8626d76a72 added checking of the return value when reading from
the `timer_fd` and calling `sysErrorBelch` to print a warning message.
However some error causes (like EINTR) are benign and should just be

Test Plan: validate

Reviewers: hvr, austin, bgamari

Subscribers: thomie

Differential Revision:

3 years agoComments only in Unify.hs
Simon Peyton Jones [Wed, 30 Mar 2016 16:43:14 +0000 (17:43 +0100)] 
Comments only in Unify.hs

To clarify what the "pure unifier" does, compared to the
"impure unifiers" in the type checker.

3 years agoDo not claim that -O2 does not do better than -O
Joachim Breitner [Wed, 30 Mar 2016 14:09:36 +0000 (16:09 +0200)] 
Do not claim that -O2 does not do better than -O

when in fact it does. This was pointed out by Johannes Bechberger and
supported with seemingly statistically sound evidence in his Bachelor
thesis: Of the benchmark shootout programs, 80% benefit significantly by
switchtng from -O to -O2.

for a few raw numbers.

Differential Revision:

3 years agoDon't recompute some free vars in lintCoercion
Bartosz Nitka [Wed, 30 Mar 2016 02:37:54 +0000 (19:37 -0700)] 
Don't recompute some free vars in lintCoercion

As pointed out by @simonpj on D2044 we don't need
to compute the free vars of the range of the substitution
as most of them are already carried by the monad.
This should be a tiny performance improvement over the version
from before D2044.

Also removes an extra function that is now unnecessary.

Test Plan: ./validate && ./validate --slow

Reviewers: goldfire, simonpj, austin, bgamari

Reviewed By: simonpj

Subscribers: thomie, simonmar, simonpj

Differential Revision:

GHC Trac Issues: #11371

3 years agoTypos in non-code
Gabor Greif [Wed, 30 Mar 2016 09:04:37 +0000 (11:04 +0200)] 
Typos in non-code

3 years agoAdd testcase for #11770
Joachim Breitner [Wed, 30 Mar 2016 07:59:09 +0000 (09:59 +0200)] 
Add testcase for #11770

and use normalise_errmsg_fun to check the core output in all.T, instead
relying on code in the Makefile.

3 years agobase: Fix haddock typo
Ben Gamari [Tue, 29 Mar 2016 16:59:57 +0000 (18:59 +0200)] 
base: Fix haddock typo

3 years agousers-guide/rel-notes: Note broken-ness of ImpredicativeTypes
Ben Gamari [Tue, 29 Mar 2016 14:30:29 +0000 (16:30 +0200)] 
users-guide/rel-notes: Note broken-ness of ImpredicativeTypes

3 years agorename: Disallow type signatures in patterns in plain Haskell
Ben Gamari [Tue, 29 Mar 2016 12:11:57 +0000 (14:11 +0200)] 
rename: Disallow type signatures in patterns in plain Haskell

This should require -XScopedTypeVariables. It seems this was previously
handled by RnTypes.rnHsBndrSig which called RnTypes.badKindSigErr but
this was broken in Simon's refactor of wildcards,
1e041b7382b6aa329e4ad9625439f811e0f27232. Here we re-introduce a check
in RnPat. See #11663.

Test Plan: Validate with `T11663`

Reviewers: austin, simonpj

Reviewed By: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #11663

3 years agoTes suite output updates
Joachim Breitner [Tue, 29 Mar 2016 14:47:53 +0000 (16:47 +0200)] 
Tes suite output updates

3 years agoDo not print DmdType in Core output
Joachim Breitner [Wed, 23 Mar 2016 12:38:34 +0000 (13:38 +0100)] 
Do not print DmdType in Core output

too verbose, and usualy preceded by Str= anyways.

3 years agoRename isNopSig to isTopSig
Joachim Breitner [Wed, 23 Mar 2016 09:41:16 +0000 (10:41 +0100)] 
Rename isNopSig to isTopSig

to be consistent with the other uses of nop vs. top in Demand.hs. Also,
stop prettyprinting top strictness signatures in Core dumps.

3 years agoSpecConstr: Transport strictness data to specialization’s argument’s binders
Joachim Breitner [Tue, 22 Mar 2016 14:39:06 +0000 (15:39 +0100)] 
SpecConstr: Transport strictness data to specialization’s argument’s binders

This is a result of the discussion in ticket:11731#comment:9.

3 years agoTypo in Note name
Joachim Breitner [Tue, 22 Mar 2016 10:14:08 +0000 (11:14 +0100)] 
Typo in Note name

3 years agoTicky: Do not count every entry twice
Joachim Breitner [Thu, 17 Mar 2016 16:25:36 +0000 (17:25 +0100)] 
Ticky: Do not count every entry twice

(likely introduced by 99d4e5b4a0bd32813ff8c74e91d2dcf6b3555176, possibly
due to a merge mistake).

3 years agoBe more explicit about closure types in ticky-ticky-report
Joachim Breitner [Thu, 17 Mar 2016 15:33:18 +0000 (16:33 +0100)] 
Be more explicit about closure types in ticky-ticky-report

The report now distinguishes thunks (in the variants single-entry and
standard thunks), constructors and functions (possibly single-entry).

Forthermore, for standard thunks (AP and selector), do not count an
entry when they are allocated. It is not possible to count their
entries, as their code is shared, but better count nothing than count
the wrong thing.

3 years agoRemove all mentions of IND_OLDGEN outside of docs/rts
Joachim Breitner [Fri, 22 Jan 2016 09:31:25 +0000 (10:31 +0100)] 
Remove all mentions of IND_OLDGEN outside of docs/rts

3 years agocleanup POSIX/XOPEN defines for switch to C99
Karel Gardas [Tue, 29 Mar 2016 10:21:54 +0000 (12:21 +0200)] 
cleanup POSIX/XOPEN defines for switch to C99

This patch cleans up various POSIX and XOPEN defines.
We aim to switch to C99 solely and for this the lowest version
of supported POSIX/XOPEN is:

Test Plan:
tested on Solaris 11 and OpenBSD 5.9. Should be good
also on Solaris 10, FreeBSD and DragonFlyBSD. We need to test
on Mac OS X, Linux and MinGW

Reviewers: austin, bgamari, erikd, hvr

Subscribers: thomie

Differential Revision:

3 years agobase: Add comment noting import loop
Ben Gamari [Tue, 29 Mar 2016 11:34:45 +0000 (13:34 +0200)] 
base: Add comment noting import loop

3 years agoAdd Data.Functor.Classes instances for Proxy (trac issue #11756)
Andrew Martin [Tue, 29 Mar 2016 08:57:47 +0000 (10:57 +0200)] 
Add Data.Functor.Classes instances for Proxy (trac issue #11756)

Test Plan: currently no test plan

Reviewers: hvr, RyanGlScott, bgamari, austin

Reviewed By: RyanGlScott, bgamari, austin

Subscribers: thomie, RyanGlScott, andrewthad

Differential Revision:

GHC Trac Issues: #11756

3 years agoUse the correct substitution in lintCoercion
Bartosz Nitka [Tue, 29 Mar 2016 10:42:32 +0000 (12:42 +0200)] 
Use the correct substitution in lintCoercion

We need the free vars of `t2` to satisfy the substitution
invariant. Luckily they are in the in-scope carried around.

Test Plan: ./validate

Reviewers: bgamari, austin, goldfire, simonpj

Reviewed By: simonpj

Subscribers: thomie, simonmar

Differential Revision:

GHC Trac Issues: #11371

3 years agoBuild correct substitution in instDFunType
Bartosz Nitka [Tue, 29 Mar 2016 10:42:16 +0000 (12:42 +0200)] 
Build correct substitution in instDFunType

We will use `ty` in the range of the substitution, hence
the substitution needs `ty`'s free vars in-scope.
They don't seem easily available by other means, so we
just compute them.

Test Plan: ./validate

Reviewers: austin, goldfire, bgamari, simonpj

Reviewed By: simonpj

Subscribers: thomie, simonmar

Differential Revision:

GHC Trac Issues: #11371

3 years agoUse a correct substitution in tcInstType
Bartosz Nitka [Tue, 29 Mar 2016 10:41:59 +0000 (12:41 +0200)] 
Use a correct substitution in tcInstType

`ty` doesn't have to be a closed type, so we need to add its
free vars to the in-scope set. They don't seem to be
available anywhere nearby, so we have to compute them.

Test Plan: ./validate

Reviewers: goldfire, austin, bgamari, simonpj

Reviewed By: simonpj

Subscribers: thomie, simonmar

Differential Revision:

GHC Trac Issues: #11371

3 years agousers-guide: Add references to various issues in bugs section
Ben Gamari [Tue, 29 Mar 2016 08:58:04 +0000 (10:58 +0200)] 
users-guide: Add references to various issues in bugs section

Test Plan: Read it

Reviewers: austin

Reviewed By: austin

Subscribers: thomie

Differential Revision:

GHC Trac Issues: #7411, #11197, #11554, #11715

3 years agousers-guide: Wibbles
Ben Gamari [Mon, 28 Mar 2016 13:40:34 +0000 (15:40 +0200)] 
users-guide: Wibbles

3 years agousers-guide: Provide more depth in table-of-contents
Ben Gamari [Mon, 28 Mar 2016 12:57:56 +0000 (14:57 +0200)] 
users-guide: Provide more depth in table-of-contents

Per Simon's request.

3 years agobase: Document caveats about Control.Concurrent.Chan
Erik de Castro Lopo [Mon, 28 Mar 2016 12:52:35 +0000 (14:52 +0200)] 
base: Document caveats about Control.Concurrent.Chan

These are implemented using `MVars` which have known caveats. Suggest
the use of `TChan` from the stm library instead.

Test Plan: n/a

Reviewers: austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision:

3 years agoReenable external-json linters
Ben Gamari [Mon, 28 Mar 2016 12:51:24 +0000 (14:51 +0200)] 
Reenable external-json linters

This is to be merged once a fix for the Harbormaster build script has
been applied.

This reverts commit a14296c2660521db8ba965065687e45cee4e3401. These were
previously disabled due to Harbormaster validation failures.

Also, apply CPP check to .c and .h files in addition to Haskell sources.

Test Plan: Let Harbormaster validate

Reviewers: austin

Reviewed By: austin

Subscribers: hvr, thomie

Differential Revision:

3 years agofix compilation failure on Solaris 11
Karel Gardas [Mon, 28 Mar 2016 22:06:48 +0000 (00:06 +0200)] 
fix compilation failure on Solaris 11

Solaris is quite picky about C and POSIX version combination.
For recent change to C99 we need to switch _XPG6 on which means
_XOPEN_SOURCE should be defined to 600

Reviewers: austin, bgamari, erikd

Subscribers: thomie

Differential Revision:

3 years agoRemove obsolete --with-hc flag from ./configure
Herbert Valerio Riedel [Mon, 28 Mar 2016 21:20:10 +0000 (23:20 +0200)] 
Remove obsolete --with-hc flag from ./configure

This was probably missed during the big build-system refactoring in

3 years agoUpdate bytestring submodule to latest snapshot
Herbert Valerio Riedel [Mon, 28 Mar 2016 15:28:49 +0000 (17:28 +0200)] 
Update bytestring submodule to latest snapshot

Most notably, this pulls in the following changes

> Fix breakByte and spanByte rewrite rules
> Implement `stripPrefix`/`stripSuffix`

The first patch is related to #11688

3 years agoDo not test for existence of the executable
Kai Harries [Mon, 28 Mar 2016 13:18:05 +0000 (15:18 +0200)] 
Do not test for existence of the executable

The test for the existence of the executable breaks on MS Windows. It is
furthermore needless, because if the test can be executed the executable
is obviously there.

Reviewers: austin, bgamari, Phyx

Reviewed By: Phyx

Subscribers: Phyx, thomie

Differential Revision:

GHC Trac Issues: #4114

3 years agoAutoconf: detect and set CFLAGS/CPPFLAGS needed for C99 mode
Herbert Valerio Riedel [Mon, 28 Mar 2016 12:34:22 +0000 (14:34 +0200)] 
Autoconf: detect and set CFLAGS/CPPFLAGS needed for C99 mode

This is the first phase of addressing #11757 which aims to make C99
support a base-line requirement for GHC and clean up the code-base to
use C99 facilities when sensible.

This patch exploits the logic/heuristic used by `AC_PROG_CC_C99` to
determine the flags needed in case the C compiler isn't able to compile
C99 code in its current mode. We can't use `AC_PROG_CC_C99` directly
though because GHC's build-system expects CC to contain a filename
without any flags, while `AC_PROG_CC_C99` would e.g. result in
`CC="gcc -std=gnu99"`. Morever, we support different `CC`s for
stage0/1/2, so we need a version of `AC_PROG_CC_C99` for which we can
specify the `CC`/`CFLAGS` variables to operate on. This is what
`FP_SET_CFLAGS_C99` does.

Note that Clang has been defaulting to C99+ for a long time, while GCC 5
defaults to C99+ as well. So this has mostly an affect on older GCCs
versions prior to 5.0 and possibly compilers other than GCC/Clang (which
are not officially supported for building GHC anyway).

Reviewers: kgardas, erikd, bgamari, austin

Reviewed By: erikd

Differential Revision:

3 years agoDrop Xcode 4.1 hack and fix ignored CC var issue
Herbert Valerio Riedel [Mon, 28 Mar 2016 10:55:21 +0000 (12:55 +0200)] 
Drop Xcode 4.1 hack and fix ignored CC var issue

Xcode 4.1 was released back in 2011 for Mac OSX 10.6/10.7.
However, OSX 10.7 reached EOL sometime around the end of 2014.
So this `--with-gcc-4.2` hack shouldn't be needed anymore.

Moreover, this patch changes ./configure to honor the CC env-var
again (and thus fix #11231) while giving `--with-gcc=...` a higher
priority over `CC=...`.

So the following 3 invocations are equivalent now:

  CC=... ./configure
  ./configure CC=...
  ./configure --with-gcc=...

Since `--with-{gcc,clang}=...` is a misnomer (as is made apparent by
`--with-gcc=clang` or `--with-clang=gcc`), this would give us a neutral
and idiomatic way to tell ./configure which C compiler to use.

Moreover, `./configure --help` says at the end of its output:

  Some influential environment variables:
    CC C compiler command
    CFLAGS C compiler flags
    LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
    LIBS libraries to pass to the linker, e.g. -l<library>
    CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
    CPP C preprocessor

  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.

Consequently, by honoring CC=... (rather than ignoring it) we increase
consistency and reduce user confusion. Ideally, CC=... would become the
recommended way to set the C compiler, and `--with-{clang,gcc}=...`
would be demoted to legacy aliases.

Reviewed By: erikd, bgamari

Differential Revision:

3 years agoScrap DEC OSF/1 support
Herbert Valerio Riedel [Mon, 28 Mar 2016 10:24:37 +0000 (12:24 +0200)] 
Scrap DEC OSF/1 support

DEC OSF/1 (aka Tru64 UNIX) has been discontinued a few years ago already[1].

This removes the undoubtedly bitrotten support for `OSOsf3 :: OS` from GHC's

Support for `ArchAlpha :: Arch` may be removed at some later point, as there
may still be users out there running a more or less recent Linux/alpha
distribution on their more-than-a-decade old Alpha hardware...


3 years agoScrap IRIX support
Herbert Valerio Riedel [Mon, 28 Mar 2016 09:36:21 +0000 (11:36 +0200)] 
Scrap IRIX support

Long time ago, IRIX was way ahead of its time in the last century with
its SMP capabilities of scaling up to 1024 processors and other features
such as XFS or OpenGL that originated in IRIX and live on to this day in
other operating systems.

However, IRIX's last software update was in 2006 and support ended
around 2013 according to [1], so it's considered an extinct platform by
now. So this commit message is effectively an obituary for GHC's IRIX



3 years agoFix AIX/ppc codegen in `-prof` compilation mode
Herbert Valerio Riedel [Sun, 27 Mar 2016 21:41:12 +0000 (23:41 +0200)] 
Fix AIX/ppc codegen in `-prof` compilation mode

The implementation in df26b95559fd467abc0a3a4151127c95cb5011b9
wrongly assumed that all C-ABI subroutine calls would use a
'ForeignLabel' but it turns out that calls inserted via
'emitRtsCall' use 'CmmLabel's instead.