Simon Peyton Jones [Wed, 11 May 2011 16:28:26 +0000 (17:28 +0100)]
Merge remote branch 'origin/master'
Simon Marlow [Wed, 11 May 2011 10:00:10 +0000 (11:00 +0100)]
scheduleDoGC: if we're doing heapCensus(), do it *before* releasing
the other mutator threads (#5127)
Simon Marlow [Wed, 4 May 2011 15:43:35 +0000 (16:43 +0100)]
fix the names of the floating-point operations in the Cmm parser
David M Peixotto [Tue, 10 May 2011 17:40:23 +0000 (12:40 -0500)]
Fix bug in one-line stats printing
The code that prints the "one-line" stats (i.e. the RTS -t flag) was
incorreclty printing zeros for some time values. These time values
were computed inside a conditional that was only true when printing
detailed stats (i.e. the RTS -s or -S flags).
This commit simply moves the computation out of the conditional so
they are available for the one-line stats output.
Jose Pedro Magalhaes [Tue, 10 May 2011 06:12:21 +0000 (08:12 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
Adam Megacz [Tue, 10 May 2011 05:00:45 +0000 (22:00 -0700)]
update flattener to use type-family-based GArrow classes
Adam Megacz [Mon, 9 May 2011 21:12:14 +0000 (14:12 -0700)]
add support for hetmet_unflatten
Simon Peyton Jones [Mon, 9 May 2011 17:10:57 +0000 (18:10 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 9 May 2011 15:45:12 +0000 (16:45 +0100)]
Fix renaming of guards
This was making mc17 fail.
Simon Peyton Jones [Mon, 9 May 2011 15:44:30 +0000 (16:44 +0100)]
Fix the desugaring of guards in arrow syntax
This was making T3822 fail, which it has apparently been doing
for some time (ie in GHC 7, 6.12, 6.10)!
Simon Marlow [Mon, 9 May 2011 12:33:00 +0000 (13:33 +0100)]
fix pretty-printing of the cvttsd2si SSE2 instruction (fixes 5149 test
on x86_64).
Jose Pedro Magalhaes [Mon, 9 May 2011 12:04:37 +0000 (14:04 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Mon, 9 May 2011 12:00:32 +0000 (14:00 +0200)]
Make the errors for DeriveGeneric consistent with other deriving errors.
Simon Peyton Jones [Mon, 9 May 2011 11:01:38 +0000 (12:01 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 9 May 2011 10:53:47 +0000 (11:53 +0100)]
Merge ghc-new-co into master branch
Simon Peyton Jones [Mon, 9 May 2011 10:46:03 +0000 (11:46 +0100)]
Don't discard usage info from coercion bindings!
Simon Marlow [Mon, 9 May 2011 10:34:14 +0000 (11:34 +0100)]
heapCensus: we need to traverse the heap fragments stored in the
gen_workspace structures. Fixes heapprof001(prof_hc_hb).
Jose Pedro Magalhaes [Mon, 9 May 2011 10:07:02 +0000 (12:07 +0200)]
"Representable0" -> "Generic" in the user's guide.
Jose Pedro Magalhaes [Mon, 9 May 2011 09:52:47 +0000 (11:52 +0200)]
Improve the error message when we cannot derive Generic.
Simon Marlow [Fri, 6 May 2011 11:00:53 +0000 (12:00 +0100)]
Add $$($1_$2_$3_ALL_HC_OPTS) when linking dynamic libraries. Not
having this meant we weren't getting -no-user-package-conf, which
caused a build failure for me due to locally-installed packages being
used instead of ones in the tree.
Simon Peyton Jones [Mon, 9 May 2011 09:03:28 +0000 (10:03 +0100)]
Comments only
Jose Pedro Magalhaes [Mon, 9 May 2011 09:02:42 +0000 (11:02 +0200)]
Deprecate -XGenerics.
Adam Megacz [Mon, 9 May 2011 08:19:23 +0000 (01:19 -0700)]
add support for hetmet_flatten casting variable
Jose Pedro Magalhaes [Mon, 9 May 2011 07:46:38 +0000 (09:46 +0200)]
Rename `Representable0` to `Generic`.
Remove a few other `0`s from names.
Adam Megacz [Mon, 9 May 2011 06:31:17 +0000 (23:31 -0700)]
update compiler using *->*->* as the kind of environment classifiers
Adam Megacz [Mon, 9 May 2011 04:24:04 +0000 (21:24 -0700)]
thread wired-in names of GHC.HetMet.Private.* through to Coq code
Ian Lynagh [Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)]
Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core
Ian Lynagh [Sun, 8 May 2011 12:41:12 +0000 (13:41 +0100)]
Change remaining uses of cTargetOS to platformOS
And remove cTargetOS/cTargetPlatform.
Ian Lynagh [Sun, 8 May 2011 10:41:34 +0000 (11:41 +0100)]
Remove a use of cTargetOS, in favour of platformOS
Ian Lynagh [Sat, 7 May 2011 23:50:04 +0000 (00:50 +0100)]
Whitespace only in ghci/ByteCodeGen.lhs
Ian Lynagh [Sat, 7 May 2011 23:39:42 +0000 (00:39 +0100)]
Remove an explicit import list
Ian Lynagh [Sat, 7 May 2011 23:39:05 +0000 (00:39 +0100)]
Remove commented out imports
Ian Lynagh [Sat, 7 May 2011 23:30:38 +0000 (00:30 +0100)]
Change more Config tests to Platform tests
Ian Lynagh [Sat, 7 May 2011 23:25:19 +0000 (00:25 +0100)]
Remove unused pprUserReg functions
Ian Lynagh [Sat, 7 May 2011 23:22:38 +0000 (00:22 +0100)]
Change some conditional tests from Config.cTargetArch to platformArch
Ian Lynagh [Sat, 7 May 2011 22:37:59 +0000 (23:37 +0100)]
Move Platform from compiler/nativeGen to compiler/utils
We want to use it across the whole compiler now
Ian Lynagh [Sat, 7 May 2011 22:35:39 +0000 (23:35 +0100)]
Improve the warning about -fllvm and -fPIC/-dynamic conflicting
We now do it while parsing the flags, rather than at the end.
It also now uses the Platform's arch/os variables, rather than Config's.
Ian Lynagh [Sat, 7 May 2011 16:55:08 +0000 (17:55 +0100)]
Remove some dead code
Not needed now that we don't support registerised via-C compilation.
Ian Lynagh [Fri, 6 May 2011 14:28:53 +0000 (15:28 +0100)]
Make retainer profiling use the label length (-L) flag)
Ian Lynagh [Sun, 1 May 2011 17:04:21 +0000 (18:04 +0100)]
Remove commented out imports
Simon Peyton Jones [Fri, 6 May 2011 17:07:36 +0000 (18:07 +0100)]
Fix build
Simon Peyton Jones [Fri, 6 May 2011 14:56:06 +0000 (15:56 +0100)]
Merge master into the ghc-new-co branch
Simon Peyton Jones [Fri, 6 May 2011 14:43:49 +0000 (15:43 +0100)]
Substantial improvements in RtClosureInspect
The code for constructors in cvReconstrutType and cvObtainTerm
was grotesque. It's now slightly better. And it works with
the new coercion representation.
Apart from being simpler I have also made some small behavioural
improvements
* Improved printing for string values
* Preserve the print-name when instanting type variables
(so now they are not always called "t")
* Suppressed printing of predicate arguments to
data constructors, unless -dppr-debug is on
Simon Peyton Jones [Fri, 6 May 2011 14:35:07 +0000 (15:35 +0100)]
Missing coercion case in byte code generation
Simon Peyton Jones [Fri, 6 May 2011 14:34:32 +0000 (15:34 +0100)]
Remove special case for EqPred in CoreView
Simon Peyton Jones [Fri, 6 May 2011 14:34:09 +0000 (15:34 +0100)]
Use eqSpecPreds
Edward Z. Yang [Thu, 5 May 2011 18:37:23 +0000 (19:37 +0100)]
Improve dead block calculation, per Simon Marlow's advice.
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
Jose Pedro Magalhaes [Thu, 5 May 2011 11:31:09 +0000 (13:31 +0200)]
Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Thu, 5 May 2011 11:26:24 +0000 (13:26 +0200)]
Do not enable -XGenerics when building the optimized libs.
Jose Pedro Magalhaes [Thu, 5 May 2011 11:26:04 +0000 (13:26 +0200)]
Remove comment mentioning the old generic classes.
Jose Pedro Magalhaes [Thu, 5 May 2011 10:13:36 +0000 (12:13 +0200)]
Update the User Guide with generics stuff.
Simon Peyton Jones [Thu, 5 May 2011 08:00:27 +0000 (09:00 +0100)]
Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Thu, 5 May 2011 07:44:43 +0000 (09:44 +0200)]
Fix a previous incorrect merge.
Jose Pedro Magalhaes [Thu, 5 May 2011 06:11:52 +0000 (08:11 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
Fixed conflicts:
compiler/iface/IfaceSyn.lhs
compiler/typecheck/TcSMonad.lhs
David Terei [Thu, 5 May 2011 00:08:47 +0000 (17:08 -0700)]
Remove unused hasktags configure check
David Terei [Thu, 5 May 2011 00:07:53 +0000 (17:07 -0700)]
Remove depreciated install-docs command
Simon Peyton Jones [Wed, 4 May 2011 22:10:42 +0000 (23:10 +0100)]
Merge remote branch 'origin/master'
Simon Peyton Jones [Wed, 4 May 2011 22:09:53 +0000 (23:09 +0100)]
Do-notation in an arrow context is not rebindable
Fixes Trac #4851
David Terei [Wed, 4 May 2011 22:09:13 +0000 (15:09 -0700)]
Format wibble
David Terei [Tue, 3 May 2011 22:02:25 +0000 (15:02 -0700)]
Fix some warnings in IfaceSyn
David Terei [Tue, 3 May 2011 21:52:58 +0000 (14:52 -0700)]
Formatting fixes to GhcMonad
David Terei [Tue, 3 May 2011 21:52:35 +0000 (14:52 -0700)]
Formatting fixes to IfaceSyn
David Terei [Mon, 2 May 2011 08:03:13 +0000 (01:03 -0700)]
LLVM: Support LLVM 2.9 (#5103)
Instead of using the GNU As subsection feature on Linux/Windows
for TNTC we now use the LLVM Mangler on all platforms.
David Terei [Sun, 1 May 2011 19:58:56 +0000 (05:58 +1000)]
LLVM: Add support for 64bit OSX. (partial #4210)
Simon Peyton Jones [Wed, 4 May 2011 21:35:27 +0000 (22:35 +0100)]
Make import conditional on DEBUG to avoid unused-import warnings
Simon Peyton Jones [Wed, 4 May 2011 21:34:14 +0000 (22:34 +0100)]
Remove accidental trace
Jose Pedro Magalhaes [Wed, 4 May 2011 19:43:41 +0000 (21:43 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
Fixed conflicts:
compiler/prelude/PrelNames.lhs
Simon Peyton Jones [Wed, 4 May 2011 15:49:07 +0000 (16:49 +0100)]
Invert sense of "why" error messages, so that "or" means "or"
Simon Peyton Jones [Wed, 4 May 2011 15:37:08 +0000 (16:37 +0100)]
Merge branch monad-comp onto master
This patch implements monad comprehensions, Trac #4370.
Thanks to Nils Schweinsberg for doing most of the heavy lifting.
I did quite a lot of related refactoring as well. Notably:
* Combined TransformStmt and GroupStmt into a single
constructor TransStmt; they share a lot of code.
I also made TransStmt into a record; it has a lot of fields.
* Remove the "result expression" field of HsDo, and instead
implement LastStmt, which is expected to be at the end
of a list of Stmts
* Generalise and tidy up the typechecking of monad comprehensions
* Do-notation in arrows is marked with HsStmtContext = ArrowExpr
* tcMDoStmt (which was only used for arrows) is moved
to TcArrows, and renamed tcArrDoStmt
* Improved documentation in the user manual
* Lots of other minor changes
Jose Pedro Magalhaes [Wed, 4 May 2011 15:27:49 +0000 (17:27 +0200)]
Remove HsNumTy and TypePati.
They belonged to the old generic deriving mechanism, so they can go. Adapted a lot of code as a consequence.
Simon Peyton Jones [Wed, 4 May 2011 15:14:04 +0000 (16:14 +0100)]
Change (back) to Unix line endings
Simon Peyton Jones [Wed, 4 May 2011 14:46:09 +0000 (15:46 +0100)]
Print contraint step counts only with -dppr-debug
Simon Peyton Jones [Wed, 4 May 2011 14:45:43 +0000 (15:45 +0100)]
Improve error message when a function is applied
to too many or too few args, in a higher order context
The change is to tcExpr.funResCtxt
Simon Peyton Jones [Wed, 4 May 2011 14:44:42 +0000 (15:44 +0100)]
Final batch of monad-comprehension stuff
* Do-notation in arrows is marked with HsStmtContext = ArrowExpr
* tcMDoStmt (which was only used for arrows) is moved
to TcArrows, and renamed tcArrDoStmt
* Improved documentation in the user manual
* Lots of other minor changes
Simon Peyton Jones [Wed, 4 May 2011 12:27:12 +0000 (13:27 +0100)]
Be cleverer in dataConCannotMatch, fixes Trac #5168
Simon Peyton Jones [Wed, 4 May 2011 12:26:30 +0000 (13:26 +0100)]
Merge commit
Simon Peyton Jones [Wed, 4 May 2011 11:14:27 +0000 (12:14 +0100)]
Merge remote-tracking branch 'origin/master'
Jose Pedro Magalhaes [Wed, 4 May 2011 11:11:16 +0000 (13:11 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
Simon Peyton Jones [Wed, 4 May 2011 11:05:42 +0000 (12:05 +0100)]
Fix Trac #5117: desugar literal patterns consistencly
Simon Peyton Jones [Wed, 4 May 2011 10:37:02 +0000 (11:37 +0100)]
Merge remote branch 'origin/master' into monad-comp
Simon Marlow [Mon, 18 Apr 2011 11:14:19 +0000 (12:14 +0100)]
expand/fix comment about x86-64 registers
Simon Marlow [Wed, 4 May 2011 09:58:38 +0000 (10:58 +0100)]
The fix for #4914 was wrong and broke other things (see #5149). We
can't emit the ffrees before a conditional jump, because we don't want
to ffree the stack registers if the jump isn't taken (d'oh).
This commit fixes it properly, by moving the pass that inserts the
ffrees to *before* we do the jump-shortcutting which introduces the
conditional non-local jumps.
Simon Marlow [Tue, 3 May 2011 14:17:29 +0000 (15:17 +0100)]
remove some old commented-out settings that no longer work
Jose Pedro Magalhaes [Wed, 4 May 2011 06:54:50 +0000 (08:54 +0200)]
Add a new flag XDefaultSignatures to enable just the signatures on the default methods. Redefine the behavior of XGenerics to mean enable XDefaultSignatures and XDeriveRepresentable.
Jose Pedro Magalhaes [Tue, 3 May 2011 09:46:36 +0000 (11:46 +0200)]
Update location of the CString stuff (from GHC.Base to GHC.CString).
Jose Pedro Magalhaes [Tue, 3 May 2011 09:44:24 +0000 (11:44 +0200)]
Use NoSelector when a constructor does not have fields.
Simon Peyton Jones [Tue, 3 May 2011 07:57:30 +0000 (08:57 +0100)]
More hacking on monad-comp
Lots of refactoring. In particular I have now combined
TansformStmt and GroupStmt into a single constructor TransStmt.
This gives lots of useful code sharing.
Jose Pedro Magalhaes [Mon, 2 May 2011 18:48:10 +0000 (20:48 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Mon, 2 May 2011 14:00:43 +0000 (16:00 +0200)]
Remove the hasGenerics field of TyCon, improve the way the Generics flags is handled, allow for standalone deriving of Representable0.
Simon Peyton Jones [Mon, 2 May 2011 12:56:37 +0000 (13:56 +0100)]
More on monad-comp; an intermediate state, so don't pull
Simon Peyton Jones [Mon, 2 May 2011 09:25:36 +0000 (10:25 +0100)]
Merge in changes from HEAD
Simon Peyton Jones [Mon, 2 May 2011 08:02:18 +0000 (09:02 +0100)]
More hacking on monad-comp; now works
Simon Peyton Jones [Mon, 2 May 2011 07:49:32 +0000 (08:49 +0100)]
A few more wibbles on ghc-new-co
Ian Lynagh [Sun, 1 May 2011 16:00:26 +0000 (17:00 +0100)]
Remove some ifdefs in favour of Haskell tests
Ian Lynagh [Sun, 1 May 2011 15:34:51 +0000 (16:34 +0100)]
Remove an ifdef from ghci/ByteCodeAsm.lhs
Ian Lynagh [Sun, 1 May 2011 15:19:06 +0000 (16:19 +0100)]
Ignore requests to use backends that aren't available; fixes #5145
Now if you try to use "-fasm" with an unreg compiler, for example,
you just get a warning saying it's being ignored.
Ian Lynagh [Sun, 1 May 2011 14:38:18 +0000 (15:38 +0100)]
Remove the OMIT_NATIVE_CODEGEN ifdef
We now test
cGhcWithNativeCodeGen == "YES"
instead.
Ian Lynagh [Sun, 1 May 2011 13:37:07 +0000 (14:37 +0100)]
Remove a commented out import
Ian Lynagh [Sun, 1 May 2011 13:20:25 +0000 (14:20 +0100)]
Small DynFlags improvements
Ian Lynagh [Sat, 30 Apr 2011 22:59:15 +0000 (23:59 +0100)]
Reinstate the "-O conflicts with --interactive" warning