Simon Marlow [Wed, 13 Jan 2010 21:03:11 +0000 (21:03 +0000)]
hide modules properly with haddock
Simon Marlow [Wed, 13 Jan 2010 19:15:55 +0000 (19:15 +0000)]
fix for HSCOLOUR_SRCS=NO
Simon Marlow [Tue, 12 Jan 2010 22:58:53 +0000 (22:58 +0000)]
Do some recompilation avoidance in GHC.loadModule
GHC.loadModule compiles a module after it has been parsed and
typechecked explicity. If we are compiling to object code and there is
a valid object file already on disk, then we can skip the compilation
step. This is useful in Haddock, when processing a package that uses
Template Haskell and hence needs actual compilation, and the package
has already been compiled.
As usual, the recomp avoidance can be disabled with -fforce-recomp.
Simon Marlow [Tue, 12 Jan 2010 22:55:48 +0000 (22:55 +0000)]
Invoke Haddock directly from the build system, instead of via Cabal
Partly this is cleaner as we only have to preprocess the source files
once, but also it is necessary to avoid Haddock recompiling source
files when Template Haskell is in use, saving some time in validate
and fixing a problem whereby when HADDOCK_DOCS=YES, make always
re-haddocks the DPH packages. This also needs an additional fix to
GHC.
HsColour support still uses Cabal, and hence preprocesses the source
files again. We could move this into the build system too, but there
is a version dependency that would mean adding extra autoconf stuff.
Simon Marlow [Mon, 4 Jan 2010 11:28:33 +0000 (11:28 +0000)]
refactoring while I try to make sense of the hsc interface
Ian Lynagh [Fri, 8 Jan 2010 13:34:16 +0000 (13:34 +0000)]
Fix running in-place gen_contents_index; trac #3716
It was making incorrect URLs due to a shell script error.
simonpj@microsoft.com [Fri, 8 Jan 2010 08:45:47 +0000 (08:45 +0000)]
Respect SPECIALISE pragmas even for apparently-non-overloaded things
This is an implementation matter really (the key word is "apparently"!).
See Note [Specialising in no-dict case] in DsBinds.
It showed up when compiling GHC.Float.
simonpj@microsoft.com [Fri, 8 Jan 2010 08:44:28 +0000 (08:44 +0000)]
Comment out debug warnings; they are fine
simonpj@microsoft.com [Thu, 7 Jan 2010 15:32:34 +0000 (15:32 +0000)]
Improve error locations
More on Trac #597
simonpj@microsoft.com [Thu, 7 Jan 2010 15:11:27 +0000 (15:11 +0000)]
Spelling error in comment
simonpj@microsoft.com [Thu, 7 Jan 2010 15:11:13 +0000 (15:11 +0000)]
A little refactoring, plus improve error locations
Fixes some sub-items of Trac #597
simonpj@microsoft.com [Thu, 7 Jan 2010 15:10:02 +0000 (15:10 +0000)]
Clarify error message (Trac #3805)
simonpj@microsoft.com [Thu, 7 Jan 2010 15:09:39 +0000 (15:09 +0000)]
Comments only
simonpj@microsoft.com [Wed, 6 Jan 2010 16:52:51 +0000 (16:52 +0000)]
SpecConstr: Remove -fspec-inline-join-points, and add let-binding specialisation
The -fspec-inline-join-point thing was a gross hack intended to help
Roman play around, but he's not using it and it was a terribly blunt
instrument so I've nuked it.
Instead I've re-instated the let-binding specialiser.
See Note [Local let bindings]
simonpj@microsoft.com [Wed, 6 Jan 2010 16:10:26 +0000 (16:10 +0000)]
Make SpecConstr more informative output when there are too many specialisations
It now says something like
SpecConstr
Function `happyDoAction'
has 17 call pattterns, but the limit is 3
Use -fspec-constr-count=n to set the bound
Use -dppr-debug to see specialisations
Previously it just silently did no specialisation
simonpj@microsoft.com [Wed, 6 Jan 2010 16:06:42 +0000 (16:06 +0000)]
Make view patterns right-associate
So that you can write
f (v1 -> v2 -> pat)
simonpj@microsoft.com [Wed, 6 Jan 2010 16:06:03 +0000 (16:06 +0000)]
Improve the handling of default methods
See the long Note [INLINE and default methods].
This patch changes a couple of data types, with a knock-on effect on
the format of interface files. A lot of files get touched, but is a
relatively minor change. The main tiresome bit is the extra plumbing
to communicate default methods between the type checker and the
desugarer.
Ian Lynagh [Wed, 6 Jan 2010 18:53:21 +0000 (18:53 +0000)]
Patch for shared libraries support on FreeBSD
From Maxime Henrion <mhenrion@gmail.com>
dias@cs.tufts.edu [Tue, 5 Jan 2010 21:15:43 +0000 (21:15 +0000)]
Following Simon M's "take newCAF() out from sm_mutex" patch
simonpj@microsoft.com [Tue, 5 Jan 2010 10:18:33 +0000 (10:18 +0000)]
Very minor refactoring
simonpj@microsoft.com [Tue, 5 Jan 2010 10:16:00 +0000 (10:16 +0000)]
Undo the fix for Trac #3772 and do it a new way
The main idea is that I'm now treating a single-method dictionary very
much like a multi-method dictionary. In particular, it respond to
exprIsConApp_maybe, even though newtypes aren't *really* proper
constructors.
See long comments with Note [Single-method classes] for why
this slight hack is justified.
simonpj@microsoft.com [Tue, 5 Jan 2010 10:09:45 +0000 (10:09 +0000)]
Fix warnings
simonpj@microsoft.com [Tue, 5 Jan 2010 09:55:32 +0000 (09:55 +0000)]
Improve error message (idea in Trac #3805)
If we see
foreign export ccall foo :: ...blah...
we now use the "foreign" to suggest -XForeignFunctionInterface
simonpj@microsoft.com [Tue, 5 Jan 2010 09:53:56 +0000 (09:53 +0000)]
Comments only
simonpj@microsoft.com [Thu, 24 Dec 2009 15:46:43 +0000 (15:46 +0000)]
Continue refactoring the core-to-core pipeline
This patch mainly concerns the plumbing for running
the passes and printing intermediate output
simonpj@microsoft.com [Thu, 24 Dec 2009 15:39:49 +0000 (15:39 +0000)]
A bunch of stuff relating to substitutions on core
* I was debugging so I added some call-site info
(that touches a lot of code)
* I used substExpr a bit less in Simplify, hoping to
make the simplifier a little faster and cleaner
simonpj@microsoft.com [Thu, 24 Dec 2009 15:34:48 +0000 (15:34 +0000)]
Refactor CoreArity a bit
I was experimenting with making coercions opaque to
arity. I think this is ultimately the right thing to do
but I've left the functionality unchanged for now.
simonpj@microsoft.com [Tue, 22 Dec 2009 16:27:31 +0000 (16:27 +0000)]
Wibbles to inlining for small functions
See Note [INLINE for small functions]
simonpj@microsoft.com [Tue, 22 Dec 2009 16:26:06 +0000 (16:26 +0000)]
Print out a bit more info with the "arity decrease" waring
simonpj@microsoft.com [Tue, 22 Dec 2009 16:25:50 +0000 (16:25 +0000)]
Move isDictTy from TcType to Type
simonpj@microsoft.com [Tue, 22 Dec 2009 16:23:25 +0000 (16:23 +0000)]
Allow instance heads to use infix syntax
class C a b
instance Int `C` Bool
This was accidentally disallowed before.
simonpj@microsoft.com [Tue, 22 Dec 2009 16:21:30 +0000 (16:21 +0000)]
Fix pretty-printer
simonpj@microsoft.com [Mon, 4 Jan 2010 21:59:50 +0000 (21:59 +0000)]
Fix Trac #3792: check for qualified names in import items
simonpj@microsoft.com [Mon, 4 Jan 2010 21:46:59 +0000 (21:46 +0000)]
Fix bugs in STG Lint
The Stg Lint failure reported in Trac #3789 were bogus.
This patch fixes STG Lint, which must have been unused
for ages.
Ben.Lippmeier@anu.edu.au [Mon, 4 Jan 2010 03:15:06 +0000 (03:15 +0000)]
Refactor PackageTarget back into StaticTarget
Ben.Lippmeier@anu.edu.au [Sat, 2 Jan 2010 23:50:53 +0000 (23:50 +0000)]
Follow PackageTarget changes in pprCEntity
Ben.Lippmeier.anu.edu.au [Sat, 2 Jan 2010 10:03:34 +0000 (10:03 +0000)]
Assume CmmLabels have dynamic linkage on non-Windows
Ben.Lippmeier@anu.edu.au [Sat, 2 Jan 2010 09:30:46 +0000 (09:30 +0000)]
Follow PackageTarget change in byte code generator
Ben.Lippmeier@anu.edu.au [Sat, 2 Jan 2010 09:29:57 +0000 (09:29 +0000)]
When compiling viac, don't need to emit prototypes for symbols in the RTS
Ben.Lippmeier@anu.edu.au [Sat, 2 Jan 2010 06:23:15 +0000 (06:23 +0000)]
Follow ForeignLabel changes in PPC NCG
Ben.Lippmeier@anu.edu.au [Sat, 2 Jan 2010 05:37:54 +0000 (05:37 +0000)]
Tag ForeignCalls with the package they correspond to
Ben.Lippmeier@anu.edu.au [Tue, 29 Dec 2009 10:35:18 +0000 (10:35 +0000)]
Nicer panic message
Ben.Lippmeier@anu.edu.au [Tue, 29 Dec 2009 05:18:58 +0000 (05:18 +0000)]
Typo in comment
Ben.Lippmeier@anu.edu.au [Mon, 23 Nov 2009 05:15:10 +0000 (05:15 +0000)]
Windows DLLs: use DLL aware runSparks_closure instead of base_GHCziConc_runSparks_closure directly
Simon Marlow [Sun, 3 Jan 2010 22:36:37 +0000 (22:36 +0000)]
locateOneObj: don't look for dynamic libs in static mode
also replace picIsOn with isDynamicGhcLib, as __PIC__ is not the
correct test for whether the GHC library is dynamically linked.
simonpj@microsoft.com [Mon, 4 Jan 2010 08:21:55 +0000 (08:21 +0000)]
Substantial improvements to coercion optimisation
The main purpose of this patch is to add a bunch of new rules
to the coercion optimiser. They are documented in the (revised)
Appendix of the System FC paper.
Some code has moved about:
- OptCoercion is now a separate module, mainly because it
now uses tcMatchTy, which is defined in Unify, so OptCoercion
must live higehr up in the hierarchy
- Functions that manipulate Kinds has moved from
Type.lhs to Coercion.lhs. Reason: the function typeKind
now needs to call coercionKind. And in any case, a Kind is
a flavour of Type, so it builds on top of Type; indeed Coercions
and Kinds are both flavours of Type.
This change required fiddling with a number of imports, hence
the one-line changes to otherwise-unrelated modules
- The representation of CoTyCons in TyCon has changed. Instead of
an extensional representation (a kind checker) there is now an
intensional representation (namely TyCon.CoTyConDesc). This was
needed for one of the new coercion optimisations.
Ian Lynagh [Sat, 2 Jan 2010 22:05:56 +0000 (22:05 +0000)]
Whitespace only
Ian Lynagh [Thu, 31 Dec 2009 15:50:04 +0000 (15:50 +0000)]
Use a shell script, rather than perl script, to make flags.xsl
Simon Marlow [Thu, 31 Dec 2009 16:46:51 +0000 (16:46 +0000)]
Rolling back: Make FastString thread-safe.
This patch was the cause of the compile-time performance regression in
#3796. My guess is that it is due to the use of unsafePerformIO which
traverses the stack up to the first update frame, and perhaps we have
a deep stack when reading the dictionary from a .hi file. In any
case, since we're not relying on thread safety for FastStrings, I
think the safest thing to do is back this out until we can investigate
further.
Simon Marlow [Thu, 31 Dec 2009 16:02:23 +0000 (16:02 +0000)]
take newCAF() out from sm_mutex; use the capability-local mut list instead
Simon Marlow [Thu, 31 Dec 2009 11:34:35 +0000 (11:34 +0000)]
Use local mut lists in UPD_IND(), also clean up Updates.h
Simon Marlow [Thu, 31 Dec 2009 11:31:18 +0000 (11:31 +0000)]
use local mut lists rather than global mut lists in sequential GC
Simon Marlow [Fri, 18 Dec 2009 16:32:00 +0000 (16:32 +0000)]
Allow throwTo() to be called without a source thread
Returns false if the exception could not be thrown becuase the tartget
thread was running. Not used yet, but might come in handy later.
Simon Marlow [Sun, 13 Dec 2009 20:12:46 +0000 (20:12 +0000)]
If ACTIVITY_INACTIVE is set, wait for GC before resetting it
I don't think this fixes any real bugs, but there's a small
possibility that when the RTS is woken up for an idle-time GC, the IO
manager thread might be pre-empted which would prevent the idle GC
from happening; this change ensures that the idle GC happens anyway.
Ian Lynagh [Wed, 30 Dec 2009 18:52:39 +0000 (18:52 +0000)]
Fix rules/build-dependencies.mk on OS X
Also more comments on why we have the sed rules that we do.
dias@cs.tufts.edu [Tue, 22 Dec 2009 22:20:17 +0000 (22:20 +0000)]
Copying Simon M's fix for 650 to the new codegen
dias@cs.tufts.edu [Tue, 22 Dec 2009 22:19:46 +0000 (22:19 +0000)]
Better error checking and code cleanup
simonpj@microsoft.com [Mon, 21 Dec 2009 16:05:11 +0000 (16:05 +0000)]
Add comments to darcs-all
The comments explain how darcs-all decides what repo to use
simonpj@microsoft.com [Mon, 21 Dec 2009 16:04:31 +0000 (16:04 +0000)]
Fix Trac #3772: dict funs for single-field classes
This patch fixes a bug that meant that INLINE pragamas on
a method of a single-field class didn't work properly.
See Note [Single-method classes] in TcInstDcls, and Trac #3772
simonpj@microsoft.com [Mon, 21 Dec 2009 15:57:45 +0000 (15:57 +0000)]
Comments only (about implementing SPECIALISE pragmas)
simonpj@microsoft.com [Mon, 21 Dec 2009 15:56:32 +0000 (15:56 +0000)]
A bit of refactoring, plus a sanity check
Check that a bottoming rhs does indeed get exposed with bottoming strictness
Almost all the changed lines reflect some refactoring of tidyTopIdInfo.
simonpj@microsoft.com [Mon, 21 Dec 2009 15:55:09 +0000 (15:55 +0000)]
Fix Trac #3776
An easy fix. See Note [Usage for sub-bndrs] in RnEnv.
simonpj@microsoft.com [Fri, 18 Dec 2009 16:45:21 +0000 (16:45 +0000)]
Move all the CoreToDo stuff into CoreMonad
This patch moves a lot of code around, but has zero functionality change.
The idea is that the types
CoreToDo
SimplifierSwitch
SimplifierMode
FloatOutSwitches
and
the main core-to-core pipeline construction
belong in simplCore/, and *not* in DynFlags.
simonpj@microsoft.com [Fri, 18 Dec 2009 16:43:16 +0000 (16:43 +0000)]
Always expose the unfolding of something with an InlineRule
Previously a bottoming function with a strictness wrapper
had a hidden inlining, and that was Very Bad, because in
f x = if ... then bot_fun x else x+1
we really want to pass the *unboxed* x to bot_fun. This
happens quite a bit in error handling code, eg for array
indexing.
simonpj@microsoft.com [Fri, 18 Dec 2009 16:41:19 +0000 (16:41 +0000)]
Comments only
simonpj@microsoft.com [Fri, 18 Dec 2009 16:41:07 +0000 (16:41 +0000)]
Move loop-breaker info from original function to worker in work/wrap
When doing a w/w split, if the original function is a loop breaker
then the worker (not the wrapper) becomes one instead.
This isn't very important, because loop breaker information is
recalculated afresh by the occurrence analyser, but it seems more
kosher. And Lint was bleating piteously about things with InlineRules
that were loop breakers.
simonpj@microsoft.com [Fri, 18 Dec 2009 16:37:42 +0000 (16:37 +0000)]
Make -ddump-inlinings and -ddump-rule-firings less noisy
By default, these two now print *one line* per inlining or rule-firing.
If you want the previous (voluminous) behaviour, use -dverbose-core2core.
simonpj@microsoft.com [Fri, 18 Dec 2009 16:35:49 +0000 (16:35 +0000)]
Make warning printing a bit less noisy
Use -dppr-debug to make it noisy again
simonpj@microsoft.com [Fri, 18 Dec 2009 16:35:13 +0000 (16:35 +0000)]
Set fixity (left-assoc) for setIdOccInfo
simonpj@microsoft.com [Fri, 18 Dec 2009 10:54:34 +0000 (10:54 +0000)]
Comments only
simonpj@microsoft.com [Fri, 18 Dec 2009 10:54:03 +0000 (10:54 +0000)]
Add an extra heading in the output for count_lines
Simon Marlow [Mon, 21 Dec 2009 11:52:49 +0000 (11:52 +0000)]
Fixes to account for the new layout of MUT_ARR_PTRS (see #650)
Simon Marlow [Mon, 21 Dec 2009 11:02:50 +0000 (11:02 +0000)]
Partial support for Haiku (#3727)
Simon Marlow [Thu, 17 Dec 2009 13:26:58 +0000 (13:26 +0000)]
Fix #3751, also fix some lexical error SrcLocs
Simon Marlow [Thu, 17 Dec 2009 10:38:16 +0000 (10:38 +0000)]
kill some old GRAN/PARALLEL_HASKELL code
Simon Marlow [Thu, 17 Dec 2009 10:38:01 +0000 (10:38 +0000)]
improve panic messages for srcLocLine, srcLocCol
Ian Lynagh [Sat, 19 Dec 2009 14:58:08 +0000 (14:58 +0000)]
Tweak the build-dependencies rule, and add comments for it
Ian Lynagh [Sat, 19 Dec 2009 13:53:39 +0000 (13:53 +0000)]
When removing $(TOP) with sed, do so case insensitively
This avoids problems on Windows, where drive letters may not be the
case we expect.
Ian Lynagh [Fri, 18 Dec 2009 21:35:41 +0000 (21:35 +0000)]
Fix a braino in a comment
Ian Lynagh [Fri, 18 Dec 2009 20:11:46 +0000 (20:11 +0000)]
Avoid a failing shell command when cleaning
It wasn't fatal, but better to avoid it anyway
Ian Lynagh [Thu, 17 Dec 2009 00:04:21 +0000 (00:04 +0000)]
Fix another sed problem on Solaris
dias@cs.tufts.edu [Fri, 18 Dec 2009 19:54:30 +0000 (19:54 +0000)]
unused named variables
dias@cs.tufts.edu [Thu, 17 Dec 2009 21:04:43 +0000 (21:04 +0000)]
missed a case in a previous fix
Here's the obscure problem:
-- However, we also want to allow an assignment to be generated
-- in the case when the types are compatible, because this allows
-- some slightly-dodgy but occasionally-useful casts to be used,
-- such as in RtClosureInspect where we cast an HValue to a MutVar#
-- so we can print out the contents of the MutVar#. If we generate
-- code that enters the HValue, then we'll get a runtime panic, because
-- the HValue really is a MutVar#. The types are compatible though,
-- so we can just generate an assignment.
Simon Marlow [Thu, 17 Dec 2009 22:42:28 +0000 (22:42 +0000)]
Fix #650: use a card table to mark dirty sections of mutable arrays
The card table is an array of bytes, placed directly following the
actual array data. This means that array reading is unaffected, but
array writing needs to read the array size from the header in order to
find the card table.
We use a bytemap rather than a bitmap, because updating the card table
must be multi-thread safe. Each byte refers to 128 entries of the
array, but this is tunable by changing the constant
MUT_ARR_PTRS_CARD_BITS in includes/Constants.h.
Ian Lynagh [Wed, 16 Dec 2009 20:43:54 +0000 (20:43 +0000)]
Fix build with Solaris sed
Rather than trying to handle tabs with sed portably, we just use tr to
remove them before we start.
Ian Lynagh [Wed, 16 Dec 2009 16:56:08 +0000 (16:56 +0000)]
Build and install inplace the count_lines and compareSizes utils
simonpj@microsoft.com [Wed, 16 Dec 2009 14:52:05 +0000 (14:52 +0000)]
Adjust Activations for specialise and work/wrap, and better simplify in InlineRules
This patch does two main things:
1. Adjusts the way we set the Activation for
a) The wrappers generated by the strictness analyser
See Note [Wrapper activation] in WorkWrap
b) The RULEs generated by Specialise and SpecConstr
See Note [Auto-specialisation and RULES] in Specialise
Note [Transfer activation] in SpecConstr
2. Refines how we set the phase when simplifying the right
hand side of an InlineRule. See
Note [Simplifying inside InlineRules] in SimplUtils.
Most of the extra lines are comments!
The merit of (2) is that a bit more stuff happens inside InlineRules,
and that in turn allows better dead-code elimination.
simonpj@microsoft.com [Wed, 16 Dec 2009 14:49:08 +0000 (14:49 +0000)]
Comments only
Simon Marlow [Wed, 16 Dec 2009 11:36:52 +0000 (11:36 +0000)]
fix up libm detection and use (#3724)
Sergei Trofimovich [Fri, 4 Dec 2009 21:40:12 +0000 (21:40 +0000)]
configure.ac: fix libm checks (Trac #3730)
libbfd pulled libm as dependency and broke LIBM= detection.
Patch moves libm in library tests as early as possible.
Thanks to asuffield for suggesting such a simple fix.
Thanks to Roie Kerstein and Renato Gallo for finding
and tracking down the issue.
Simon Marlow [Wed, 16 Dec 2009 09:55:01 +0000 (09:55 +0000)]
#include <sys/select.h> if we have it (#3760)
Simon Marlow [Mon, 23 Nov 2009 10:19:18 +0000 (10:19 +0000)]
add a couple of assertions
simonpj@microsoft.com [Wed, 16 Dec 2009 09:03:44 +0000 (09:03 +0000)]
Add comments
simonpj@microsoft.com [Wed, 16 Dec 2009 08:50:33 +0000 (08:50 +0000)]
Refactor to combine two eqExpr functions
I'd forgotten that Rules.lhs already has an eqExpr function. This
patch combines Rules.eqExpr with the (recent) CoreUtils.eqExpr.
I also did a little refactoring by defining CoreSyn.expandUnfolding_maybe
(see Note [Expanding variables] in Rules.lhs), and using it in
a) CoreUnfold.exprIsConApp_maybe
b) Rule matching
simonpj@microsoft.com [Wed, 16 Dec 2009 08:47:06 +0000 (08:47 +0000)]
Two improvements to optCoercion
* Fix a bug that meant that
(right (inst (forall tv.co) ty))
wasn't getting optimised. This showed up in the
compiled code for ByteCodeItbls
* Add a substitution to optCoercion, so that it simultaneously
substitutes and optimises. Both call sites wanted this, and
optCoercion itself can use it, so it seems a win all round.
simonpj@microsoft.com [Wed, 16 Dec 2009 08:45:58 +0000 (08:45 +0000)]
Comments only
simonpj@microsoft.com [Wed, 16 Dec 2009 08:45:36 +0000 (08:45 +0000)]
Make setInlineActivation left-associative
simonpj@microsoft.com [Wed, 16 Dec 2009 08:45:13 +0000 (08:45 +0000)]
Fix a long-standing infelicity in the type pretty printer
We weren't parenthesising
List (C Int)
correctly, when (C Int) is a PredTy
simonpj@microsoft.com [Wed, 16 Dec 2009 08:40:53 +0000 (08:40 +0000)]
Deal with warnings in Coercion.lhs
simonpj@microsoft.com [Tue, 15 Dec 2009 16:02:16 +0000 (16:02 +0000)]
Fix a bug in the in-scope set that led to some lookupIdSubst errors