5 years agoOnly report "could not deduce s~t from ..." for givens that include equalities
Simon Peyton Jones [Wed, 29 Oct 2014 17:49:34 +0000 (17:49 +0000)] 
Only report "could not deduce s~t from ..." for givens that include equalities

This just simplifies the error message in cases where there are no useful
equalities in the context

5 years agoWhen reporting the context of given constraints, stop when you find one
Simon Peyton Jones [Wed, 29 Oct 2014 17:45:34 +0000 (17:45 +0000)] 
When reporting the context of given constraints, stop when you find one
that binds a variable mentioned in the wanted

There is really no point in reporting ones further out; they can't be useful

5 years agoTypechecker debug tracing only
Simon Peyton Jones [Wed, 29 Oct 2014 17:22:57 +0000 (17:22 +0000)] 
Typechecker debug tracing only

5 years agoNormalise the type of an inferred let-binding
Simon Peyton Jones [Wed, 29 Oct 2014 17:21:05 +0000 (17:21 +0000)] 
Normalise the type of an inferred let-binding

With the new constraint solver, we don't guarantee to fully-normalise
all constraints (if doing so is not necessary to solve them). So we
may end up with an inferred type like
      f :: [F Int] -> Bool
which could be simplifed to
      f :: [Char] -> Bool
if there is a suitable family instance declaration.  This patch
does this normalisation, in TcBinds.mkExport

5 years agoGet the Untouchables level right in simplifyInfer
Simon Peyton Jones [Wed, 29 Oct 2014 17:18:33 +0000 (17:18 +0000)] 
Get the Untouchables level right in simplifyInfer

Previously we could get constraints in which the untouchables-level did not
strictly increase, which is one of the main invariants!

This patch also simplifies and modularises the tricky case of generalising
an inferred let-binding

5 years agoRefactor the treatment of lexically-scoped type variables for instance declarations
Simon Peyton Jones [Wed, 29 Oct 2014 16:54:47 +0000 (16:54 +0000)] 
Refactor the treatment of lexically-scoped type variables for instance declarations

Previously the univerally-quantified variables of the DFun were also (bizarrely)
used as the lexically-scoped variables of the instance declaration.  So, for example,
the DFun's type could not be alpha-renamed.  This was an odd restriction, which has
bitten me several times.

This patch does the Right Thing, by adding an ib_tyvars field to the
InstBindings record, which captures the lexically scoped variables.
Easy, robust, nice.  (I think this record probably didn't exist originally,
hence the hack.)

5 years agoRefactor skolemising, and newClsInst
Simon Peyton Jones [Wed, 29 Oct 2014 16:26:53 +0000 (16:26 +0000)] 
Refactor skolemising, and newClsInst

This makes newClsInst (was mkInstance) look more like newFamInst, and simplifies
the plumbing of the overlap flag, and ensures that freshening (required by
the InstEnv stuff) happens in one place.

On the way I also tided up the rather ragged family of tcInstSkolTyVars and
friends.  The result at least has more uniform naming.

5 years agoRename setRole_maybe to downgradeRole_maybe
Simon Peyton Jones [Wed, 29 Oct 2014 16:35:19 +0000 (16:35 +0000)] 
Rename setRole_maybe to downgradeRole_maybe

This change is just for naming uniformity with the existing downgradeRole

5 years agoSimplify the API for tcInstTyVars, and make it more consistent with other similar...
Simon Peyton Jones [Wed, 29 Oct 2014 16:34:05 +0000 (16:34 +0000)] 
Simplify the API for tcInstTyVars, and make it more consistent with other similar functions

5 years agoFix reduceTyFamApp_maybe
Simon Peyton Jones [Wed, 29 Oct 2014 16:30:05 +0000 (16:30 +0000)] 
Fix reduceTyFamApp_maybe

This function previously would expand *data* families even when it was asked
for a *Nominal* coercion.  This patch fixes it, and adds comments.

5 years agoWhite space only
Simon Peyton Jones [Wed, 29 Oct 2014 16:27:50 +0000 (16:27 +0000)] 
White space only

5 years agoAdd the unfolding and inline-pragma for DFuns in DsBinds, not TcInstDcls
Simon Peyton Jones [Wed, 29 Oct 2014 15:36:28 +0000 (15:36 +0000)] 
Add the unfolding and inline-pragma for DFuns in DsBinds, not TcInstDcls

This is a straight refactoring that puts the generation of unfolding
info in one place, which is a lot tidier

5 years agoSimplify the generation of superclass constraints in tcInstDecl2
Simon Peyton Jones [Wed, 29 Oct 2014 15:34:14 +0000 (15:34 +0000)] 
Simplify the generation of superclass constraints in tcInstDecl2

The simplified function is tcSuperClasses;
no need for an implication constraint here

5 years agoSome refactoring around endPass and debug dumping
Simon Peyton Jones [Wed, 29 Oct 2014 15:23:14 +0000 (15:23 +0000)] 
Some refactoring around endPass and debug dumping

I forget all the details, but I spent some time trying to
understand the current setup, and tried to simplify it a bit

5 years agoImprove pretty-printing of type variables
Simon Peyton Jones [Wed, 29 Oct 2014 15:15:38 +0000 (15:15 +0000)] 
Improve pretty-printing of type variables

In particular, print a bit of debug info in debug-style and dump-style
Otherwise distinct type variables look the same

5 years agoTidy up pretty-printing of SrcLoc and SrcSpan
Simon Peyton Jones [Wed, 29 Oct 2014 15:13:41 +0000 (15:13 +0000)] 
Tidy up pretty-printing of SrcLoc and SrcSpan

5 years agoFix lost Haddock annotation for `class Monad m`
Herbert Valerio Riedel [Tue, 4 Nov 2014 10:15:51 +0000 (11:15 +0100)] 
Fix lost Haddock annotation for `class Monad m`

This was broken in d94de87252d0fe2ae97341d186b03a2fbe136b04 when `join`
was inserted between `Monad`'s Haddock string and the `class Monad m`
definition thereby breaking the association.

5 years agoRefactor Haddock comments in Data.Bits
Herbert Valerio Riedel [Tue, 4 Nov 2014 10:06:53 +0000 (11:06 +0100)] 
Refactor Haddock comments in Data.Bits

This removes the redundant "Minimal complete definition"-block included
in the Haddock comment since Haddock renders the `MINIMAL`-pragma as
well (which has is moved to the start of `class` definition for better
readability of the source code)

Morever, the references to `testBitDefault`, `bitDefault`, and
`popCountDefault` have been moved to the respective methods' Haddock
strings for which they can be used.

5 years agoMinor Haddock markup improvement to Data.Monoid
Herbert Valerio Riedel [Tue, 4 Nov 2014 09:52:56 +0000 (10:52 +0100)] 
Minor Haddock markup improvement to Data.Monoid

[skip ci]

5 years agoAdd `Alternative` wrapper to Data.Monoid
David Feuer [Tue, 4 Nov 2014 09:13:05 +0000 (10:13 +0100)] 
Add `Alternative` wrapper to Data.Monoid

Complete #9759. Use `coerce` to get nicer definitions of `Sum` and
`Product`; update documentation for `First` and `Last`.

Reviewed By: hvr

Differential Revision:

5 years agoFurther relax T1969’s max_bytes range
Joachim Breitner [Tue, 4 Nov 2014 09:09:50 +0000 (10:09 +0100)] 
Further relax T1969’s max_bytes range

5 years agoMake Foldable's foldr1 and foldl1 defaults lazier
David Feuer [Tue, 4 Nov 2014 09:03:12 +0000 (10:03 +0100)] 
Make Foldable's foldr1 and foldl1 defaults lazier

Fixes #9742. Previously, `foldr1` as applied to a list-like
structure would be strict in the spine, and `foldl1` would
be strict in the spine of a snoc-list.

See also

Differential Revision:

5 years agoLink to oneShot from the User's Guide
Joachim Breitner [Mon, 3 Nov 2014 19:26:25 +0000 (20:26 +0100)] 
Link to oneShot from the User's Guide

thanks to Jan for nudging.

5 years agoUpdate expected profiling output for scc001
Joachim Breitner [Mon, 3 Nov 2014 09:24:10 +0000 (10:24 +0100)] 
Update expected profiling output for scc001

5 years agoUse oneShot in the definition of foldl etc.
Joachim Breitner [Sat, 25 Oct 2014 10:27:06 +0000 (12:27 +0200)] 
Use oneShot in the definition of foldl etc.

This increases the chance of good code after fusing a left fold. See
ticket #7994 and the new Note [Left folds via right fold]

Differential Revision:

5 years agoAdd GHC.Prim.oneShot
Joachim Breitner [Sun, 26 Jan 2014 11:36:23 +0000 (11:36 +0000)] 
Add GHC.Prim.oneShot

to allow the programer to explictitly set the oneShot flag. This helps
with #7994 and will be used in left folds. Also see

This commit touches libraries/base/GHC/Event/Manager.hs (which used to
have a local definition of the name oneShot) to avoid a shadowing error.

Differential Revision:

5 years agoPut one-Shot info in the interface
Joachim Breitner [Tue, 28 Oct 2014 12:02:40 +0000 (13:02 +0100)] 
Put one-Shot info in the interface

Differential Revision:

5 years agoTweak the error message for pattern synonym methods,
Dr. ERDI Gergo [Sun, 2 Nov 2014 06:06:24 +0000 (14:06 +0800)] 
Tweak the error message for pattern synonym methods,
since they are disallowed both in class and instance declarations

5 years agoUpdate release notes for #9262 #8953 #9084.
Richard Eisenberg [Sun, 2 Nov 2014 04:08:26 +0000 (00:08 -0400)] 
Update release notes for #9262 #8953 #9084.

5 years agoFix #9738, by handling {-# ANN ... #-} in DsMeta.
Richard Eisenberg [Tue, 28 Oct 2014 18:54:20 +0000 (14:54 -0400)] 
Fix #9738, by handling {-# ANN ... #-} in DsMeta.

5 years agoTest #9738 in th/T9738
Richard Eisenberg [Tue, 28 Oct 2014 18:53:59 +0000 (14:53 -0400)] 
Test #9738 in th/T9738

5 years agoFix testsuite output from #9084.
Richard Eisenberg [Tue, 28 Oct 2014 19:15:02 +0000 (15:15 -0400)] 
Fix testsuite output from #9084.

5 years agoFix #9084 by calling notHandled when unknown bits are enountered.
Richard Eisenberg [Tue, 28 Oct 2014 17:21:34 +0000 (13:21 -0400)] 
Fix #9084 by calling notHandled when unknown bits are enountered.

5 years agoTest #9084 in th/T9084.
Richard Eisenberg [Tue, 28 Oct 2014 17:10:11 +0000 (13:10 -0400)] 
Test #9084 in th/T9084.

The patch includes errors for a whole host of pragmas. But, these
are generated one at a time, and it doesn't seem like a good idea
to add gobs of test-cases here.

5 years agoTestsuite wibbles from fixing #8953
Richard Eisenberg [Tue, 28 Oct 2014 14:42:32 +0000 (10:42 -0400)] 
Testsuite wibbles from fixing #8953

5 years agoAnnotate poly-kinded type patterns in instance reification.
Richard Eisenberg [Tue, 21 Oct 2014 15:27:16 +0000 (11:27 -0400)] 
Annotate poly-kinded type patterns in instance reification.

This should fix #8953.

5 years agoAnnotate reified poly-kinded tycons when necessary. (#8953)
Richard Eisenberg [Tue, 21 Oct 2014 14:58:05 +0000 (10:58 -0400)] 
Annotate reified poly-kinded tycons when necessary. (#8953)

5 years agoAlways use KindedTV when reifying. (#8953)
Richard Eisenberg [Tue, 21 Oct 2014 14:48:49 +0000 (10:48 -0400)] 
Always use KindedTV when reifying. (#8953)

5 years agoTest #8953 in th/T8953
Richard Eisenberg [Tue, 21 Oct 2014 14:46:27 +0000 (10:46 -0400)] 
Test #8953 in th/T8953

5 years agoBring unbound tyvars into scope during reifyInstances.
Richard Eisenberg [Tue, 21 Oct 2014 13:13:08 +0000 (09:13 -0400)] 
Bring unbound tyvars into scope during reifyInstances.

Fix #9262.

5 years agoTest #9262 in th/T9262, and update other tests.
Richard Eisenberg [Tue, 21 Oct 2014 13:12:34 +0000 (09:12 -0400)] 
Test #9262 in th/T9262, and update other tests.

5 years agoFixed T5435_dyn_asm on Windows. The test code was not in sync with the expected output.
Gintautas Miliauskas [Sat, 1 Nov 2014 13:20:45 +0000 (08:20 -0500)] 
Fixed T5435_dyn_asm on Windows. The test code was not in sync with the expected output.

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #5435

5 years agornMethodBind: reject pattern synonyms in instance definitions (fixes #9705)
Dr. ERDI Gergo [Tue, 21 Oct 2014 12:51:35 +0000 (20:51 +0800)] 
rnMethodBind: reject pattern synonyms in instance definitions (fixes #9705)

5 years agoFix comment about dropWhileEndLE
Joachim Breitner [Sat, 1 Nov 2014 10:37:53 +0000 (11:37 +0100)] 
Fix comment about dropWhileEndLE

5 years agoFix build via Haddock submodule update.
Austin Seipp [Sat, 1 Nov 2014 00:34:56 +0000 (19:34 -0500)] 
Fix build via Haddock submodule update.

Signed-off-by: Austin Seipp <>
5 years agoRemove legacy support for -optdef flags
Thomas Miedema [Fri, 31 Oct 2014 21:15:06 +0000 (16:15 -0500)] 
Remove legacy support for -optdef flags

Summary: -optdef flags were deprecated in or before 2008

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #2773

5 years agoremove old .NET related code
Yuras Shumovich [Fri, 31 Oct 2014 21:12:19 +0000 (16:12 -0500)] 
remove old .NET related code

Summary: It seems to be dead anyway. Also update Haddock submodule.

Test Plan: validate

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, goldfire, carter, simonmar

Differential Revision:

5 years agoSplit off stat (benchmark) test failures into a separate section in the test runner...
Gintautas Miliauskas [Fri, 31 Oct 2014 20:51:16 +0000 (15:51 -0500)] 
Split off stat (benchmark) test failures into a separate section in the test runner summary.

Stat tests are generally less reliable than other types of tests, so it's nice to have
them in a separate section rather than interspersed with potential...

Summary: ...correctness issues.

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

5 years agoUpdate doctest example style in `Data.Bool`
Michael Orlitzky [Fri, 31 Oct 2014 13:34:56 +0000 (14:34 +0100)] 
Update doctest example style in `Data.Bool`

hvr made some suggestions in D352 and D371, this fixes them in the
already-applied patch for Data/Bool.hs as well for consistency.

Reviewed By: austin, hvr

Differential Revision:

5 years agoAdd changelog entry for recent Unicode 7.0 update
Herbert Valerio Riedel [Fri, 31 Oct 2014 13:30:32 +0000 (14:30 +0100)] 
Add changelog entry for recent Unicode 7.0 update

The internal Unicode definitions were updated via

[skip ci]

5 years agoClean-up `Data.Fixed`
Herbert Valerio Riedel [Fri, 31 Oct 2014 13:25:45 +0000 (14:25 +0100)] 
Clean-up `Data.Fixed`

This gets rid of `-fno-warn-unused-binds` by turning the E* types into
constructor-less data types (as they're used as phantom-types only)

Moreover, this modules uses `AutoDeriveTypeable` so we can drop all those
redundant `deriving (Typeable)` lines as well

Reviewed By: austin, ekmett

Differential Revision:

5 years agoUpdate Haddock submodule
Herbert Valerio Riedel [Fri, 31 Oct 2014 13:04:57 +0000 (14:04 +0100)] 
Update Haddock submodule

This pulls in a change to have the new "Examples" sections being in
`base` collapsed by default.

5 years agoAdd doctest examples for Data.Char
Michael Orlitzky [Fri, 31 Oct 2014 08:50:00 +0000 (09:50 +0100)] 
Add doctest examples for Data.Char

This adds doctest examples for every function and data type in `Data.Char`.

Reviewed By: austin, hvr

Differential Revision:

5 years agoFix comment typos
Jan Stolarek [Fri, 31 Oct 2014 09:31:40 +0000 (10:31 +0100)] 
Fix comment typos

5 years agoDrop deprecated `OverlappingInstances` from base
Herbert Valerio Riedel [Fri, 31 Oct 2014 07:52:47 +0000 (08:52 +0100)] 
Drop deprecated `OverlappingInstances` from base

With #9242 the `OverlappingInstances` extension got deprecated, this
commit adapts the only two remaining places in `base` where it was still

Starting with this commit, the `Typeable (s t)` instance (which seemingly
was the motivation for using `OverlappingInstances` in the first place
when `Typeable` was neither polykinded nor auto-derived-only, see also
commit ce3fd0e02826367e6134a3362d8d37aa114236f5 which introduced
overlapping instances) does no longer allow overlapping instances, and
there doesn't seem to be any good reason to keep allowing overlapping
instance now.

This also removes redundant `LANGUAGE`/`OPTIONS_GHC` pragmas from
`Data.Typeable` and refactors the language pragmas into more uniform
single-line pragmas.

Reviewed By: austin

Differential Revision:

5 years agoUpdated testsuite/.gitignore to exclude some test artifacts on Windows.
Gintautas Miliauskas [Thu, 30 Oct 2014 16:57:18 +0000 (11:57 -0500)] 
Updated testsuite/.gitignore to exclude some test artifacts on Windows.

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

5 years agoFixed missing trailing newline bug in pretty printer
Mateusz Lenik [Thu, 30 Oct 2014 16:53:40 +0000 (11:53 -0500)] 
Fixed missing trailing newline bug in pretty printer

Pretty printer didn't produce trailing newline in strings in error

Reviewers: simonpj, austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar, mlen

Differential Revision:

GHC Trac Issues: #9681

5 years agoAdd notes on change to hGetContents semantics
David Feuer [Thu, 30 Oct 2014 16:50:58 +0000 (11:50 -0500)] 
Add notes on change to hGetContents semantics

Additionally, move Unicode 7.0 update notice from the compiler
section to the base libraries section.

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Projects: #ghc

Differential Revision:

5 years agoFix test driver python3 compatibility issues
Mateusz Lenik [Thu, 30 Oct 2014 16:50:41 +0000 (11:50 -0500)] 
Fix test driver python3 compatibility issues

Fixes python3 compatibility issues by replacing filter with a list
comperhension and a potential issue with python2 when override_flags
would be an empty list.

Reviewers: austin, thomie

Reviewed By: austin, thomie

Subscribers: thomie, carter, simonmar, mlen

Differential Revision:

GHC Trac Issues: #9230

5 years agoComments only
Jan Stolarek [Thu, 30 Oct 2014 10:51:10 +0000 (11:51 +0100)] 
Comments only

5 years agoAdded mingw32-specific expected stdout files for tests/driver/sigof{01,02,03}
Gintautas Miliauskas [Thu, 30 Oct 2014 04:15:25 +0000 (23:15 -0500)] 
Added mingw32-specific expected stdout files for tests/driver/sigof{01,02,03}

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

5 years agoAdd __GLASGOW_HASKELL_TH__=YES/NO to CPP definitions
Joachim Breitner [Thu, 30 Oct 2014 04:15:07 +0000 (23:15 -0500)] 
Add __GLASGOW_HASKELL_TH__=YES/NO to CPP definitions

Test Plan: None really.

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #9734

5 years agoDo not use a relative path for echo in tests/ghci/prog013.
Gintautas Miliauskas [Thu, 30 Oct 2014 04:14:38 +0000 (23:14 -0500)] 
Do not use a relative path for echo in tests/ghci/prog013.

Trying to run /usr/bin/echo fails when running tests on Windows,
but using plain "echo" works fine. I think it's fine to assume
the environment is not doing anything particularly funny...


Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar, #ghc_windows_task_force

Differential Revision:

5 years agoUpdated stale ghcpkg05.stderr-mingw32.
Gintautas Miliauskas [Thu, 30 Oct 2014 04:14:28 +0000 (23:14 -0500)] 
Updated stale ghcpkg05.stderr-mingw32.

Looks like the mingw32-specific test was accidentally forgotten after
changing the code and the expected outputs for non OS-specific tests.

Reviewers: austin

Reviewed By: austin

Subscribers: #ghc_windows_task_force, thomie, carter, simonmar

Differential Revision:

5 years agoExtra CRs are now filtered out from the source file for :list.
Gintautas Miliauskas [Thu, 30 Oct 2014 04:14:17 +0000 (23:14 -0500)] 
Extra CRs are now filtered out from the source file for :list.

Fixes #9367.

Reviewers: austin

Reviewed By: austin

Subscribers: #ghc_windows_task_force, thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #9367

5 years agoAvoid setting -Werror=unused-but-set-variable on Windows.
Gintautas Miliauskas [Thu, 30 Oct 2014 04:13:51 +0000 (23:13 -0500)] 
Avoid setting -Werror=unused-but-set-variable on Windows.

The option is not needed (it was only intended to override Debian's default)
and causes an error if the host ghc's mingw is too old (which the script
does not detect).

Fixes T9727

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #9727

5 years agoUse snwprintf instead of swprintf in rts/Linker.c.
Gintautas Miliauskas [Thu, 30 Oct 2014 04:13:31 +0000 (23:13 -0500)] 
Use snwprintf instead of swprintf in rts/Linker.c.

swprintf has different signatures in mingw32, where it does not include the
buffer size, and in mingw-w64, where it does. That of course breaks the code
as mingw-w64 treats the pointer to the format string as a size_t.

snwprintf is available in both environments and is consistent, so use that

Reviewers: simonmar, austin

Reviewed By: austin

Subscribers: #ghc_windows_task_force, thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #9726

5 years agoFix #9236 Error on read from closed handle
David Feuer [Thu, 30 Oct 2014 04:13:07 +0000 (23:13 -0500)] 
Fix #9236 Error on read from closed handle

Fixes #9236. My testing indicates that this does *not* lead to problems with
broken pipes and such, but further testing is required. It found
a bug in haddock; I've submitted a pull request upstream.

Reviewers: ekmett, austin

Reviewed By: ekmett, austin

Subscribers: rwbarton, thomie, carter, simonmar

Differential Revision:

GHC Trac Issues: #9236

5 years agoConvert GHCi sources from .lhs to .hs
Rodlogic [Thu, 30 Oct 2014 04:12:54 +0000 (23:12 -0500)] 
Convert GHCi sources from .lhs to .hs

Summary: Signed-off-by: Rodlogic <>

Test Plan: Does it compile?

Reviewers: hvr, austin

Reviewed By: austin

Subscribers: thomie, carter, simonmar

Differential Revision:

5 years agohsc2hs: Update submodule
Austin Seipp [Thu, 30 Oct 2014 04:04:59 +0000 (23:04 -0500)] 
hsc2hs: Update submodule

This makes sure the --cross-compile mode can handle negative enum

Differential Revision:

Signed-off-by: Austin Seipp <>
5 years agoFixed unused variable warning on mingw32/i686 in rts/Linker.c
Gintautas Miliauskas [Wed, 29 Oct 2014 23:16:12 +0000 (18:16 -0500)] 
Fixed unused variable warning on mingw32/i686 in rts/Linker.c

The warning was breaking runs due to -Wall.

Reviewers: austin

Reviewed By: austin

Subscribers: #ghc_windows_task_force, thomie, carter, simonmar

Differential Revision:

5 years agoReally fix fft2 regression. #9740
David Feuer [Wed, 29 Oct 2014 14:47:57 +0000 (15:47 +0100)] 
Really fix fft2 regression. #9740

Rewrite `take` more aggressively for fusion. Add some more explicit
strictness to `unsafeTake` and `unsafeDrop` that seems to help code size and
allocation just a drop in some nofib tests. They were not previously
strict in their numerical arguments, but always called in contexts where
those had been forced; it didn't make a difference in simple test cases,
but made a small difference for nofib. See #9740.

Differential Revision:

5 years agoUpdate Haddock submodule for collapsible section support
Herbert Valerio Riedel [Wed, 29 Oct 2014 09:08:26 +0000 (10:08 +0100)] 
Update Haddock submodule for collapsible section support

This also updates a few occurences of recently added "Example"
headings to make use of this new feature for testing

5 years agoReorder GHC.List; fix performance regressions
David Feuer [Wed, 29 Oct 2014 07:15:08 +0000 (08:15 +0100)] 
Reorder GHC.List; fix performance regressions

Rearrange some oddly placed code.

Modify `take` to make the fold unconditionally strict in the passed
`Int`. This clears up the `fft2` regression.
This fixes #9740. Differential Revision:

5 years agobase: Refactor/clean-up *List modules
David Feuer [Tue, 28 Oct 2014 14:26:39 +0000 (15:26 +0100)] 
base: Refactor/clean-up *List modules

This gets rid of all hand-unboxing in `GHC.List` and moves `Foldable`
requirements from `Data.OldList` into `GHC.List` (preparatory work for
addressing #9716).  Specifically, this moves the definition of
`maximum`, `minimum`, `foldl'`, `foldl1`, `foldl1'`, `sum`, and
`product` into `GHC.List` (which now needs to import `GHC.Num`)

Make `take`, `drop`, `length`, and `!!` generally saner (see also #9510)

Performance overall seems minimally affected. Some things go up; some
things go down; nothing moves horribly much. The code is much easier to

Differential Revision:

5 years agoMake iterateFB inlineable
Joachim Breitner [Tue, 28 Oct 2014 14:28:59 +0000 (15:28 +0100)] 
Make iterateFB inlineable

When investigating a case of unexpected Call Arity failure I noticed
that iterateFB would not inline as far as desired, as it is recursive.

This patch makes it non-recursive (with a local go), which seem so do
great good.

5 years agotestlib: Get rid of two_normalisers
Joachim Breitner [Tue, 28 Oct 2014 10:21:49 +0000 (11:21 +0100)] 
testlib: Get rid of two_normalisers

And make normalise_fun polyvariadic. After all, this is untyped code, so
lets make use of it :-)

5 years agoAdd n-ary version of `two_normalisers` to testsuite lib
Herbert Valerio Riedel [Tue, 28 Oct 2014 09:42:34 +0000 (10:42 +0100)] 
Add n-ary version of `two_normalisers` to testsuite lib

This is more readable than nesting `two_normalisers()`-invocations

5 years agoNormalise package key hash to make tests less fragile.
Edward Z. Yang [Tue, 28 Oct 2014 00:52:39 +0000 (17:52 -0700)] 
Normalise package key hash to make tests less fragile.

Signed-off-by: Edward Z. Yang <>
5 years agoTypo in comment
Gabor Greif [Mon, 27 Oct 2014 23:17:13 +0000 (00:17 +0100)] 
Typo in comment

5 years agoImprove performance of isSuffixOf (#9676)
David Feuer [Mon, 27 Oct 2014 21:12:07 +0000 (22:12 +0100)] 
Improve performance of isSuffixOf (#9676)

The new implementation avoids reversing the "haystack" list, which can be
very expensive.

Reviewed By: ekmett

Differential Revision:

5 years agoDeactivate T3064 `max_bytes_used`-check
Herbert Valerio Riedel [Mon, 27 Oct 2014 18:37:16 +0000 (19:37 +0100)] 
Deactivate T3064 `max_bytes_used`-check

T3064 is deactivated for now because it's currently too volatile
and causes too much noise in Phabricator's CI

C.f. 4805abf413c02a2ed1af4fbeca2476590e984e37

Reviewers: austin

Subscribers: thomie, carter, ezyang, simonmar

Differential Revision:

5 years agoUn-wire `Integer` type (re #9714)
Herbert Valerio Riedel [Mon, 27 Oct 2014 15:44:36 +0000 (16:44 +0100)] 
Un-wire `Integer` type (re #9714)

Integer is currently a wired-in type for integer-gmp. This requires
replicating its inner structure in `TysWiredIn`, which makes it much
harder to change Integer to a more complex representation (as
e.g. needed for implementing #9281)

This commit stops `Integer` being a wired-in type, and makes it
known-key type instead, thereby simplifying code notably.

Reviewed By: austin

Differential Revision:

5 years agoOptimise atomicModifyIORef' implementation (#8345)
David Feuer [Mon, 27 Oct 2014 09:21:20 +0000 (10:21 +0100)] 
Optimise atomicModifyIORef' implementation (#8345)

This forces the new value before installing it in the IORef.

This optimisation was originally suggested by Patrick Palka
and "exhibits a speedup of 1.7x (vanilla RTS) / 1.4x (threaded RTS)"
according to #8345

Reviewed By: austin, simonmar

Differential Revision:

5 years agoAdd new `Data.Bifunctor` module (re #9682)
Herbert Valerio Riedel [Sun, 26 Oct 2014 07:49:38 +0000 (08:49 +0100)] 
Add new `Data.Bifunctor` module (re #9682)

This adds the module `Data.Bifunctor` providing the
`Bifunctor(bimap,first,second)` class and a couple of instances

This module and the class were previously exported by the `bifunctors`
package.  In contrast to the original module all `INLINE` pragmas have
been removed.

Reviewed By: ekmett, austin, dolio

Differential Revision:

5 years agotestsuite: Fix outdated output for T5979/safePkg01
Austin Seipp [Sun, 26 Oct 2014 05:45:56 +0000 (00:45 -0500)] 
testsuite: Fix outdated output for T5979/safePkg01

Looks like it was broken in aa4799534225.

Signed-off-by: Austin Seipp <>
5 years ago`M-x delete-trailing-whitespace` & `M-x untabify`
Herbert Valerio Riedel [Sat, 25 Oct 2014 14:11:21 +0000 (16:11 +0200)] 
`M-x delete-trailing-whitespace` & `M-x untabify`

This removes all remaining tabs from `base`'s source code

5 years agoPass in CXX to libffi's configure script.
Gintautas Miliauskas [Sat, 25 Oct 2014 00:27:05 +0000 (19:27 -0500)] 
Pass in CXX to libffi's configure script.

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, ezyang, simonmar

Differential Revision:

GHC Trac Issues: #9720

5 years agofix a typo in comments: normaliseFfiType
Yuras Shumovich [Sat, 25 Oct 2014 00:26:55 +0000 (19:26 -0500)] 
fix a typo in comments: normaliseFfiType

The function is defined in TcForeign module, but misspelled comment
makes it hard to find

Reviewers: austin

Reviewed By: austin

Subscribers: thomie, carter, ezyang, simonmar

Differential Revision:

5 years agoFix windows build failure.
Austin Seipp [Fri, 24 Oct 2014 22:57:50 +0000 (17:57 -0500)] 
Fix windows build failure.

Authored-by: Simon Marlow <>
Signed-off-by: Austin Seipp <>
5 years agoImplementation of hsig (module signatures), per #9252
Edward Z. Yang [Thu, 7 Aug 2014 17:32:12 +0000 (18:32 +0100)] 
Implementation of hsig (module signatures), per #9252

Module signatures, like hs-boot files, are Haskell modules which omit
value definitions and contain only signatures.  This patchset implements
one particular aspect of module signature, namely compiling them against
a concrete implementation.  It works like this: when we compile an hsig
file, we must be told (via the -sig-of flag) what module this signature
is implementing.  The signature is compiled into an interface file which
reexports precisely the entities mentioned in the signature file.  We also
verify that the interface is compatible with the implementation.

This feature is useful in a few situations:

    1. Like explicit import lists, signatures can be used to reduce
    sensitivity to upstream changes.  However, a signature can be defined
    once and then reused by many modules.

    2. Signatures can be used to quickly check if a new upstream version
    is compatible, by typechecking just the signatures and not the actual

    3. A signature can be used to mediate separate modular development,
    where the signature is used as a placeholder for functionality which
    is loaded in later.  (This is only half useful at the moment, since
    typechecking against signatures without implementations is not implemented
    in this patchset.)

Unlike hs-boot files, hsig files impose no performance overhead.

This patchset punts on the type class instances (and type families) problem:
instances simply leak from the implementation to the signature.  You can
explicitly specify what instances you expect to have, and those will be checked,
but you may get more instances than you asked for.  Our eventual plan is
to allow hiding instances, but to consider all transitively reachable instances
when considering overlap and soundness.

ToDo: signature merging: when a module is provided by multiple signatures
for the same base implementation, we should not consider this ambiguous.

ToDo: at the moment, signatures do not constitute use-sites, so if you
write a signature for a deprecated function, you won't get a warning
when you compile the signature.

Future work: The ability to feed in shaping information so that we can take
advantage of more type equalities than might be immediately evident.

Signed-off-by: Edward Z. Yang <>
Test Plan: validate and new tests

Reviewers: simonpj, simonmar, hvr, austin

Subscribers: simonmar, relrod, ezyang, carter, goldfire

Differential Revision:

GHC Trac Issues: #9252

5 years agoCheck in up-to-date PDF copies of Backpack docs. [skip ci]
Edward Z. Yang [Fri, 24 Oct 2014 01:20:25 +0000 (18:20 -0700)] 
Check in up-to-date PDF copies of Backpack docs. [skip ci]

Signed-off-by: Edward Z. Yang <>
5 years agoMore updates to Backpack manual [skip ci]
Edward Z. Yang [Fri, 24 Oct 2014 01:19:46 +0000 (18:19 -0700)] 
More updates to Backpack manual [skip ci]

Signed-off-by: Edward Z. Yang <>
5 years agoFix a rare parallel GC bug
Simon Marlow [Thu, 23 Oct 2014 10:12:16 +0000 (11:12 +0100)] 
Fix a rare parallel GC bug

When there's a conflict between two threads evacuating the same TSO,
in some cases we would update the incall->tso pointer to point to the
wrong copy of the TSO.  This would get fixed during the next GC, but
if the thread completed in the meantime, it would likely crash.  We're
seeing this about once per day on a heavily loaded machine (it varies
a lot though).

5 years agoAdd forgotten import to T9692
Joachim Breitner [Wed, 22 Oct 2014 13:02:42 +0000 (15:02 +0200)] 
Add forgotten import to T9692


5 years agoFlush stdout in T9692
Joachim Breitner [Wed, 22 Oct 2014 08:49:35 +0000 (10:49 +0200)] 
Flush stdout in T9692

5 years agobase: Mark WCsubst.c as generated for Phabricator
Austin Seipp [Tue, 21 Oct 2014 21:50:23 +0000 (16:50 -0500)] 
base: Mark WCsubst.c as generated for Phabricator

Signed-off-by: Austin Seipp <>
5 years agorts: Detabify Interpreter.c
Austin Seipp [Tue, 21 Oct 2014 21:45:57 +0000 (16:45 -0500)] 
rts: Detabify Interpreter.c

Signed-off-by: Austin Seipp <>
5 years ago[skip ci] rts: Detabify Schedule.c
Austin Seipp [Tue, 21 Oct 2014 21:45:19 +0000 (16:45 -0500)] 
[skip ci] rts: Detabify Schedule.c

Signed-off-by: Austin Seipp <>
5 years ago[skip ci] rts: Detabify ProfHeap.c
Austin Seipp [Tue, 21 Oct 2014 21:44:41 +0000 (16:44 -0500)] 
[skip ci] rts: Detabify ProfHeap.c

Signed-off-by: Austin Seipp <>