Simon Marlow [Thu, 6 May 2010 12:21:18 +0000 (12:21 +0000)]
add the proper library dependencies for GhcProfiled=YES
simonpj@microsoft.com [Tue, 11 May 2010 07:50:26 +0000 (07:50 +0000)]
Fix Trac #4003: fix the knot-tying in checkHiBootIface
I had incorrectly "optimised" checkHiBootIface so that it forgot
to update the "knot-tied" type environment.
This patch fixes the HEAD
simonpj@microsoft.com [Mon, 10 May 2010 13:33:33 +0000 (13:33 +0000)]
Re-engineer the derived Ord instance generation code (fix Trac #4019)
As well as fixing #4019, I rejigged the way that Ord instances are
generated, which should make them faster in general. See the
Note [Generating Ord instances].
I tried to measure the performance difference from this change, but
the #4019 fix only removes one conditional branch per iteration, and
I couldn't measure a consistent improvement. But still, tihs is
better than before.
simonpj@microsoft.com [Mon, 10 May 2010 13:30:05 +0000 (13:30 +0000)]
Make arity of INLINE things consistent
We eta-expand things with INLINE pragmas;
see Note [Eta-expanding INLINE things].
But I eta-expanded it the wrong amount when the function
was overloaded. Ooops.
Simon Marlow [Mon, 10 May 2010 08:23:25 +0000 (08:23 +0000)]
Compacting GC fix, we forgot to thread the new bq field of StgTSO.
Ian Lynagh [Sun, 9 May 2010 17:50:51 +0000 (17:50 +0000)]
Add version constraints for the boot packages; fixes trac #3852
When using the bootstrapping compiler, we now explicitly constrain
the version of boot packages (Cabal, extensible-exceptions, etc) to the
in-tree version, so that the build system is less fragile should the
user have a newer version installed for the bootstrapping compiler.
Ian Lynagh [Sun, 9 May 2010 13:05:11 +0000 (13:05 +0000)]
Don't include inter-package dependencies when compiling with stage 0; #4031
This fixes a problem when building with GHC 6.12 on Windows, where
dependencies on stage 0 (bootstrapping compiler) packages have absolute
paths c:/ghc/..., and make gets confused by the colon.
Ian Lynagh [Sat, 8 May 2010 22:39:11 +0000 (22:39 +0000)]
Add a ghc.mk for bindisttest/
Ian Lynagh [Sat, 8 May 2010 21:24:05 +0000 (21:24 +0000)]
Move some make variables around so they are available when cleaning
Ian Lynagh [Sat, 8 May 2010 20:20:06 +0000 (20:20 +0000)]
Optimise checkremove a bit
Ian Lynagh [Sat, 8 May 2010 19:54:50 +0000 (19:54 +0000)]
Improve the bindisttest Makefile
Ian Lynagh [Sat, 8 May 2010 19:41:05 +0000 (19:41 +0000)]
Add tools to test that cleaning works properly
Ian Lynagh [Sat, 8 May 2010 12:58:15 +0000 (12:58 +0000)]
Tweak the ghc-pkg finding code
It now understand the ghc-stage[123] names we use in-tree, and it won't
go looking for any old ghc-pkg if it can't find the one that matches
ghc.
Ian Lynagh [Sat, 8 May 2010 12:24:38 +0000 (12:24 +0000)]
Add a way to show what cleaning would be done, without actually doing it
Ian Lynagh [Sat, 8 May 2010 11:57:45 +0000 (11:57 +0000)]
Tidy up the "rm" flags in the build system
Simon Marlow [Fri, 7 May 2010 09:32:22 +0000 (09:32 +0000)]
Fix crash in nested callbacks (#4038)
Broken by "Split part of the Task struct into a separate struct
InCall".
Simon Marlow [Wed, 28 Apr 2010 20:52:41 +0000 (20:52 +0000)]
Add $(GhcDynamic) knob, set to YES to get stage2 linked with -dynamic
Default currently NO.
Validate passed with GhcDynamic=YES on x86/Linux here.
The compiler is currently slower on x86 when linked -dynamic,
because the GC inner loop has been adversely affected by -fPIC, I'm
looking into how to fix it.
Simon Marlow [Wed, 28 Apr 2010 20:49:14 +0000 (20:49 +0000)]
omit "dyn" from the way appended to the __stginit label
When GHCi is linked dynamically, we still want to be able to load
non-dynamic object files.
Simon Marlow [Thu, 6 May 2010 11:54:27 +0000 (11:54 +0000)]
improvements to findPtr(), a neat hack for browsing the heap in gdb
Simon Marlow [Thu, 6 May 2010 11:07:39 +0000 (11:07 +0000)]
Fix +RTS -G1
Ian Lynagh [Thu, 6 May 2010 17:53:51 +0000 (17:53 +0000)]
Enable the "redundant specialise pragmas" warning; fixes trac #3855
simonpj@microsoft.com [Thu, 6 May 2010 16:41:35 +0000 (16:41 +0000)]
Find the correct external ids when there's a wrapper
We were failing to externalise the wrapper id for a function
that had one.
simonpj@microsoft.com [Thu, 6 May 2010 16:40:27 +0000 (16:40 +0000)]
Add a comment about pattern coercions
simonpj@microsoft.com [Thu, 6 May 2010 16:38:29 +0000 (16:38 +0000)]
Comments only
simonpj@microsoft.com [Thu, 6 May 2010 16:38:13 +0000 (16:38 +0000)]
Make a missing name in mkUsageInfo into a panic
We really want to know about this!
simonpj@microsoft.com [Thu, 6 May 2010 16:37:37 +0000 (16:37 +0000)]
Refactoring of hsXxxBinders
This patch moves various functions that extract the binders
from a HsTyClDecl, HsForeignDecl etc into HsUtils, and gives
them consistent names.
simonpj@microsoft.com [Thu, 6 May 2010 16:33:37 +0000 (16:33 +0000)]
Fix Trac #3966: warn about useless UNPACK pragmas
Warning about useless UNPACK pragmas wasn't as easy as I thought.
I did quite a bit of refactoring, which improved the code by refining
the types somewhat. In particular notice that in DataCon, we have
dcStrictMarks :: [HsBang]
dcRepStrictness :: [StrictnessMarks]
The former relates to the *source-code* annotation, the latter to
GHC's representation choice.
simonpj@microsoft.com [Thu, 6 May 2010 16:27:19 +0000 (16:27 +0000)]
Make tcg_dus behave more sanely; fixes a mkUsageInfo panic
The tcg_dus field used to contain *uses* of type and class decls,
but not *defs*. That was inconsistent, and it really went wrong
for Template Haskell bracket. What happened was that
foo = [d| data A = A
f :: A -> A
f x = x |]
would find a "use" of A when processing the top level of the module,
which in turn led to a mkUsageInfo panic in MkIface. The cause was
the fact that the tcg_dus for the nested quote didn't have defs for
A.
simonpj@microsoft.com [Thu, 6 May 2010 16:15:23 +0000 (16:15 +0000)]
Add a HsExplicitFlag to SpliceDecl, to improve Trac #4042
The issue here is that
g :: A -> A
f
data A = A
is treated as if you'd written $(f); that is the call of
f is a top-level Template Haskell splice. This patch
makes sure that we *first* check the -XTemplateHaskellFlag
and bleat about a parse error if it's off. Othewise we
get strange seeing "A is out of scope" errors.
simonpj@microsoft.com [Thu, 6 May 2010 16:11:11 +0000 (16:11 +0000)]
Change an assert to a warn
This is in the constraint simplifier which I'm about
to rewrite, so I'm hoping the assert isn't fatal!
simonpj@microsoft.com [Thu, 6 May 2010 16:10:27 +0000 (16:10 +0000)]
Tidy up debug print a little
simonpj@microsoft.com [Thu, 6 May 2010 16:10:12 +0000 (16:10 +0000)]
Remove useless UNPACK pragmas
simonpj@microsoft.com [Thu, 6 May 2010 16:08:08 +0000 (16:08 +0000)]
Add WARNM2 macro, plus some refactoring
simonpj@microsoft.com [Thu, 6 May 2010 16:07:50 +0000 (16:07 +0000)]
Use -Wwarn for the binary package, becuase it has redundant UNPACK pragmas
simonpj@microsoft.com [Fri, 9 Apr 2010 20:18:12 +0000 (20:18 +0000)]
Fix Trac #3966: warn about unused UNPACK pragmas
simonpj@microsoft.com [Fri, 9 Apr 2010 20:17:48 +0000 (20:17 +0000)]
Fix Trac #3953: fail earlier when using a bogus quasiquoter
simonpj@microsoft.com [Fri, 9 Apr 2010 18:44:20 +0000 (18:44 +0000)]
Fix Trac #3965: tighten conditions when deriving Data
It's tricky to set up the context for a Data instance. I got it wrong
once, and fixed it -- hence the "extra_constraints" in
TcDeriv.inferConstraints.
But it still wasn't right! The tricky bit is that dataCast1 is only
generated when T :: *->*, and dataCast2 when T :: *->*->*. (See
the code in TcGenDeriv for dataCastX.
simonpj@microsoft.com [Fri, 9 Apr 2010 16:55:57 +0000 (16:55 +0000)]
Fix Trac #3964: view patterns in DsArrows
Just a missing case; I've eliminated the catch-all so
that we get a warning next time we extend HsPat
simonpj@microsoft.com [Fri, 9 Apr 2010 16:37:10 +0000 (16:37 +0000)]
Fix Trac #3955: renamer and type variables
The renamer wasn't computing the free variables of a type declaration
properly. This patch refactors a bit, and makes it more robust,
fixing #3955 and several other closely-related bugs. (We were
omitting some free variables and that could just possibly lead to a
usage-version tracking error.
simonpj@microsoft.com [Fri, 9 Apr 2010 16:35:06 +0000 (16:35 +0000)]
Layout only
Ian Lynagh [Thu, 6 May 2010 13:09:10 +0000 (13:09 +0000)]
Give a better deprecated message for INCLUDE pragmas; fixes #3933
We now have a DeprecatedFullText constructor, so we can override the
"-#include is deprecated: " part of the warning.
Ian Lynagh [Thu, 6 May 2010 12:36:07 +0000 (12:36 +0000)]
De-haddock a comment that confuses haddock
Ian Lynagh [Thu, 6 May 2010 11:36:42 +0000 (11:36 +0000)]
Fix comment to not confuse haddock
Ian Lynagh [Thu, 6 May 2010 00:08:30 +0000 (00:08 +0000)]
Detect EOF when trying to parse a string in hp2ps
simonpj@microsoft.com [Wed, 5 May 2010 20:09:36 +0000 (20:09 +0000)]
Make the demand analyser sdd demands for strict constructors
This opportunity was spotted by Roman, and is documented in
Note [Add demands for strict constructors] in DmdAnal.
simonpj@microsoft.com [Wed, 5 May 2010 20:07:23 +0000 (20:07 +0000)]
Fix interaction of exprIsCheap and the lone-variable inlining check
See Note [Interaction of exprIsCheap and lone variables] in CoreUnfold
This buglet meant that a nullary definition with an INLINE pragma
counter-intuitively didn't get inlined at all. Roman identified
the bug.
simonpj@microsoft.com [Wed, 5 May 2010 20:05:43 +0000 (20:05 +0000)]
Matching cases in SpecConstr and Rules
This patch has zero effect. It includes comments,
a bit of refactoring, and a tiny bit of commment-out
code go implement the "matching cases" idea below.
In the end I've left it disabled because while I think
it does no harm I don't think it'll do any good either.
But I didn't want to lose the idea totally. There's
a thread called "Storable and constant memory" on
the libraries@haskell.org list (Apr 2010) about it.
Note [Matching cases]
~~~~~~~~~~~~~~~~~~~~~
{- NOTE: This idea is currently disabled. It really only works if
the primops involved are OkForSpeculation, and, since
they have side effects readIntOfAddr and touch are not.
Maybe we'll get back to this later . -}
Consider
f (case readIntOffAddr# p# i# realWorld# of { (# s#, n# #) ->
case touch# fp s# of { _ ->
I# n# } } )
This happened in a tight loop generated by stream fusion that
Roman encountered. We'd like to treat this just like the let
case, because the primops concerned are ok-for-speculation.
That is, we'd like to behave as if it had been
case readIntOffAddr# p# i# realWorld# of { (# s#, n# #) ->
case touch# fp s# of { _ ->
f (I# n# } } )
simonpj@microsoft.com [Tue, 4 May 2010 16:36:29 +0000 (16:36 +0000)]
Comments only
simonpj@microsoft.com [Tue, 4 May 2010 16:35:29 +0000 (16:35 +0000)]
Comments only
simonpj@microsoft.com [Tue, 4 May 2010 16:34:57 +0000 (16:34 +0000)]
Comments only
simonpj@microsoft.com [Sat, 17 Apr 2010 14:50:32 +0000 (14:50 +0000)]
Comments only (about type families)
Ian Lynagh [Wed, 5 May 2010 19:19:21 +0000 (19:19 +0000)]
Fix hp2ps when the .hp file has large string literals
Ian Lynagh [Tue, 4 May 2010 22:50:35 +0000 (22:50 +0000)]
In build system, call package-config after including package data
Otherwise the $1_$2_HC_OPTS variable gets clobbered.
Simon Marlow [Wed, 5 May 2010 13:38:48 +0000 (13:38 +0000)]
runghc: flush stdout/stderr on an exception (#3890)
Simon Marlow [Wed, 5 May 2010 12:12:02 +0000 (12:12 +0000)]
Remove the Unicode alternative for ".." (#3894)
Simon Marlow [Wed, 5 May 2010 11:50:15 +0000 (11:50 +0000)]
tidyup; no functional changes
Simon Marlow [Wed, 5 May 2010 11:49:47 +0000 (11:49 +0000)]
Make the running_finalizers flag task-local
Fixes a bug reported by Lennart Augustsson, whereby we could get an
incorrect error from the RTS about re-entry from a finalizer,
Simon Marlow [Wed, 5 May 2010 11:47:46 +0000 (11:47 +0000)]
add a MAYBE_GC() in killThread#, fixes throwto003(threaded2) looping
Simon Marlow [Wed, 5 May 2010 10:11:39 +0000 (10:11 +0000)]
Allow filepath-1.2.*
Simon Marlow [Wed, 5 May 2010 09:45:34 +0000 (09:45 +0000)]
BlockedOnMsgThrowTo is possible in resurrectThreads (#4030)
Simon Marlow [Wed, 5 May 2010 09:45:06 +0000 (09:45 +0000)]
Don't raise a throwTo when the target is masking and BlockedOnBlackHole
Ian Lynagh [Tue, 4 May 2010 18:03:02 +0000 (18:03 +0000)]
Fix build with GHC 6.10
In GHC 6.10, intersectionWith is (a -> b -> a) instead of (a -> b -> c),
so we need to jump through some hoops to get the more general type.
Ian Lynagh [Tue, 4 May 2010 17:16:03 +0000 (17:16 +0000)]
The libffi patches are no longer needed
Ian Lynagh [Tue, 4 May 2010 17:09:41 +0000 (17:09 +0000)]
Use the in-tree windres; fixes trac #4032
Simon PJ [Mon, 3 May 2010 18:18:22 +0000 (18:18 +0000)]
Print unfoldings on lambda-bound variables
...in the unusual case where they have one;
see Note [Case binders and join points] in Simplify.lhs
Milan Straka [Mon, 3 May 2010 17:13:15 +0000 (17:13 +0000)]
Replace FiniteMap and UniqFM with counterparts from containers.
The original interfaces are kept. There is small performance improvement:
- when compiling for five nofib, we get following speedups:
Average ----- -2.5%
Average ----- -0.6%
Average ----- -0.5%
Average ----- -5.5%
Average ----- -10.3%
- when compiling HPC ten times, we get:
switches oldmaps newmaps
-O -fasm 117.402s 116.081s (98.87%)
-O -fasm -fregs-graph 119.993s 118.735s (98.95%)
-O -fasm -fregs-iterative 120.191s 118.607s (98.68%)
Simon PJ [Mon, 3 May 2010 15:16:30 +0000 (15:16 +0000)]
Make the demand analyser take account of lambda-bound unfoldings
This is a long-standing lurking bug. See Note [Lamba-bound unfoldings]
in DmdAnal.
I'm still not really happy with this lambda-bound-unfolding stuff.
Ian Lynagh [Mon, 3 May 2010 15:03:02 +0000 (15:03 +0000)]
Fix dynamic libs on OS X, and enable them by default
Ian Lynagh [Sun, 2 May 2010 11:34:58 +0000 (11:34 +0000)]
Switch back to using bytestring from the darcs repo; partially fixes #3855
Ian Lynagh [Wed, 28 Apr 2010 15:07:00 +0000 (15:07 +0000)]
Fix some cpp warnings when building on FreeBSD; patch from Gabor PALI
Ian Lynagh [Tue, 27 Apr 2010 16:22:12 +0000 (16:22 +0000)]
Fix "make 2"
The new Makefile logic was enabling the stage 1 rules when stage=2,
so "make 2" was rebuilding stage 1.
Ian Lynagh [Tue, 27 Apr 2010 16:00:38 +0000 (16:00 +0000)]
Inplace programs depend on their shell wrappers
Simon Marlow [Tue, 27 Apr 2010 12:28:51 +0000 (12:28 +0000)]
--make is now the default (#3515), and -fno-code works with --make (#3783)
If the command line contains any Haskell source files, then we behave
as if --make had been given.
The meaning of the -c flag has changed (back): -c now selects one-shot
compilation, but stops before linking. However, to retain backwards
compatibility, -c is still allowed with --make, and means the same as
--make -no-link. The -no-link flag has been un-deprecated.
-fno-code is now allowed with --make (#3783); the fact that it was
disabled before was largely accidental, it seems. We also had some
regressions in this area: it seems that -fno-code was causing a .hc
file to be emitted in certain cases. I've tidied up the code, there
was no need for -fno-code to be a "mode" flag, as far as I can tell.
-fno-code does not emit interface files, nor does it do recompilation
checking, as suggested in #3783. This would make Haddock emit
interface files, for example, and I'm fairly sure we don't want to do
that. Compiling with -fno-code is pretty quick anyway, perhaps we can
get away without recompilation checking.
Simon Marlow [Mon, 26 Apr 2010 14:06:42 +0000 (14:06 +0000)]
remove duplicate docs for -e in --help output (#4010)
Simon Marlow [Mon, 26 Apr 2010 10:34:28 +0000 (10:34 +0000)]
workaround for #4003, fixes HEAD build with 6.12.2
Ian Lynagh [Sat, 24 Apr 2010 18:18:23 +0000 (18:18 +0000)]
Make sure all the clean rules are always included
In particular, this fixes a problem where stage3 bits weren't being cleaned
Ian Lynagh [Sat, 24 Apr 2010 13:28:30 +0000 (13:28 +0000)]
Correct the name of the amd64/FreeBSD platform in PlatformSupportsSharedLibs
We weren't getting sharedlibs on amd64/FreeBSD because of this
Ian Lynagh [Sat, 24 Apr 2010 12:31:01 +0000 (12:31 +0000)]
Include DPH docs in bindists
Simon Marlow [Fri, 23 Apr 2010 12:48:53 +0000 (12:48 +0000)]
reinstate eta-expansion during SimplGently, to fix inlining of sequence_
Simon Marlow [Thu, 22 Apr 2010 21:36:05 +0000 (21:36 +0000)]
fix 64-bit value for W_SHIFT, which thankfully appears to be not used
Simon Marlow [Thu, 22 Apr 2010 21:34:43 +0000 (21:34 +0000)]
Add missing constant folding and optimisation for unsigned division
Noticed by Denys Rtveliashvili <rtvd@mac.com>, see #4004
Ian Lynagh [Thu, 22 Apr 2010 21:32:26 +0000 (21:32 +0000)]
Fix the GHC API link in the main doc index.html
Ian Lynagh [Wed, 21 Apr 2010 17:13:39 +0000 (17:13 +0000)]
Give the right exit code in darcs-all
Our END block was calling system, which alters $?. So now we save and
restore it.
Ian Lynagh [Wed, 21 Apr 2010 16:23:36 +0000 (16:23 +0000)]
Use StgWord64 instead of ullong
This patch also fixes ullong_format_string (renamed to showStgWord64)
so that it works with values outside the 32bit range (trac #3979), and
simplifies the without-commas case.
Ian Lynagh [Tue, 20 Apr 2010 16:59:09 +0000 (16:59 +0000)]
Implement try10Times in Makefile
Avoid using seq, as FreeBSD has jot instead.
Simon Marlow [Tue, 20 Apr 2010 12:21:25 +0000 (12:21 +0000)]
Fix crash in non-threaded RTS on Windows
The tso->block_info field is now overwritten by pushOnRunQueue(), but
stg_block_async_info was assuming that it still held a pointer to the
StgAsyncIOResult. We must therefore save this value somewhere safe
before putting the TSO on the run queue.
Simon Marlow [Tue, 20 Apr 2010 12:20:26 +0000 (12:20 +0000)]
Expand the scope of the event_buf_mutex to cover io_manager_event
I once saw a failure that I think was due to a race on
io_manager_event, this should fix it.
Milan Straka [Wed, 31 Mar 2010 19:10:50 +0000 (19:10 +0000)]
Flags -auto and -auto-all operate only on functions not marked INLINE.
Max Bolingbroke [Tue, 13 Apr 2010 19:28:25 +0000 (19:28 +0000)]
Spelling correction for LANGUAGE pragmas
Ian Lynagh [Fri, 16 Apr 2010 20:54:16 +0000 (20:54 +0000)]
Update the user guide so it talks about the newer "do rec" notation everywhere
Some of the problems highlighted in trac #3968.
Ian Lynagh [Fri, 16 Apr 2010 20:54:12 +0000 (20:54 +0000)]
Fix typo
simonpj@microsoft.com [Mon, 12 Apr 2010 15:18:45 +0000 (15:18 +0000)]
Fix Trac #3950: unifying types of different kinds
I was assuming that the unifer only unified types of the
same kind, but now we can "defer" unsolved constraints that
invariant no longer holds. Or at least is's more complicated
to ensure.
This patch takes the path of not assuming the invariant, which
is simpler and more robust. See
Note [Mismatched type lists and application decomposition]
simonpj@microsoft.com [Mon, 12 Apr 2010 15:16:30 +0000 (15:16 +0000)]
Fix Trac #3943: incorrect unused-variable warning
In fixing this I did the usual little bit of refactoring
Ian Lynagh [Thu, 15 Apr 2010 14:39:19 +0000 (14:39 +0000)]
Convert boot and boot-pkgs to perl
This stops us having to worry about sh/sed/... portability.
Ian Lynagh [Thu, 15 Apr 2010 12:14:53 +0000 (12:14 +0000)]
Use $(MAKE), not make, when recursively calling make
Ian Lynagh [Mon, 12 Apr 2010 23:56:58 +0000 (23:56 +0000)]
Remove the ghc_ge_609 makefile variables
They are now guaranteed to be YES
Ian Lynagh [Mon, 12 Apr 2010 23:53:13 +0000 (23:53 +0000)]
Increase the minimum version number required to 6.10 in configure.ac
Ian Lynagh [Fri, 9 Apr 2010 16:10:46 +0000 (16:10 +0000)]
The bootstrapping compiler is now required to be > 609
Ian Lynagh [Fri, 9 Apr 2010 10:42:07 +0000 (10:42 +0000)]
Handle IND_STATIC in isRetainer
IND_STATIC used to be an error, but at the moment it can happen
as isAlive doesn't look through IND_STATIC as it ignores static
closures. See trac #3956 for a program that hit this error.
David Waern [Tue, 30 Mar 2010 01:10:20 +0000 (01:10 +0000)]
Add Data and Typeable instances to HsSyn
The instances (and deriving declarations) have been taken from the ghc-syb
package.