ghc.git
7 years agoCalculate the total memory allocated on a per-capability basis
Duncan Coutts [Fri, 3 Feb 2012 12:57:19 +0000 (12:57 +0000)] 
Calculate the total memory allocated on a per-capability basis

In addition to the existing global method. For now we just do
it both ways and assert they give the same grand total. At some
stage we can simplify the global method to just take the sum of
the per-cap counters.

7 years agoAdd eventlog/trace stuff for capabilities: create/delete/enable/disable
Duncan Coutts [Fri, 3 Feb 2012 12:20:36 +0000 (12:20 +0000)] 
Add eventlog/trace stuff for capabilities: create/delete/enable/disable

Now that we can adjust the number of capabilities on the fly, we need
this reflected in the eventlog. Previously the eventlog had a single
startup event that declared a static number of capabilities. Obviously
that's no good anymore.

For compatability we're keeping the EVENT_STARTUP but adding new
EVENT_CAP_CREATE/DELETE. The EVENT_CAP_DELETE is actually just the old
EVENT_SHUTDOWN but renamed and extended (using the existing mechanism
to extend eventlog events in a compatible way). So we now emit both
EVENT_STARTUP and EVENT_CAP_CREATE. One day we will drop EVENT_STARTUP.

Since reducing the number of capabilities at runtime does not really
delete them, it just disables them, then we also have new events for
disable/enable.

The old EVENT_SHUTDOWN was in the scheduler class of events. The new
EVENT_CAP_* events are in the unconditional class, along with the
EVENT_CAPSET_* ones. Knowing when capabilities are created and deleted
is crucial to making sense of eventlogs, you always want those events.
In any case, they're extremely low volume.

7 years agoDocument optimisation passes, to some extent at least
Simon Peyton Jones [Wed, 4 Apr 2012 14:58:37 +0000 (15:58 +0100)] 
Document optimisation passes, to some extent at least

7 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Wed, 4 Apr 2012 13:17:54 +0000 (14:17 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

7 years agoTighten up on type validity checking
Simon Peyton Jones [Wed, 4 Apr 2012 13:14:35 +0000 (14:14 +0100)] 
Tighten up on type validity checking

Fixes Trac #5957, which pointed out that
  Int -> Ord a => a -> a
is not Haskell 98

7 years agoUpdate comments about Addr in foreign declarations.
Paolo Capriotti [Wed, 4 Apr 2012 12:38:07 +0000 (13:38 +0100)] 
Update comments about Addr in foreign declarations.

7 years agoImproved checks for "dynamic" and "wrapper" foreign declarations (#5664)
Paolo Capriotti [Tue, 3 Apr 2012 09:41:52 +0000 (10:41 +0100)] 
Improved checks for "dynamic" and "wrapper" foreign declarations (#5664)

7 years agoPrevent nested TH exceptions from bubbling up to the top level (#5976)
Paolo Capriotti [Fri, 30 Mar 2012 11:30:28 +0000 (12:30 +0100)] 
Prevent nested TH exceptions from bubbling up to the top level (#5976)

7 years agoSupport qualified identifiers in quasi-quotes (#5555).
Paolo Capriotti [Mon, 2 Apr 2012 12:09:10 +0000 (13:09 +0100)] 
Support qualified identifiers in quasi-quotes (#5555).

7 years agoFixed typo in b857c8ad which caused NewtypeD to be interpreted as DataD.
Mikhail Vorozhtsov [Mon, 2 Apr 2012 11:03:48 +0000 (18:03 +0700)] 
Fixed typo in b857c8ad which caused NewtypeD to be interpreted as DataD.

Signed-off-by: Paolo Capriotti <p.capriotti@gmail.com>
7 years agoWhitespace only in main/Packages.lhs
Ian Lynagh [Sun, 1 Apr 2012 10:55:56 +0000 (11:55 +0100)] 
Whitespace only in main/Packages.lhs

7 years agoTidy up compiler/ghc.cabal.in
Ian Lynagh [Sun, 1 Apr 2012 00:35:46 +0000 (01:35 +0100)] 
Tidy up compiler/ghc.cabal.in

We now always have base4, and don't need a workaround for GHC 6.4.2.

7 years agoAdd a section about promoted literals to the manual.
Iavor S. Diatchki [Sat, 31 Mar 2012 19:47:25 +0000 (12:47 -0700)] 
Add a section about promoted literals to the manual.

7 years agoAdd an entry for -XExplicitNamespaces to the manual.
Iavor S. Diatchki [Sat, 31 Mar 2012 19:15:23 +0000 (12:15 -0700)] 
Add an entry for -XExplicitNamespaces to the manual.

7 years agoAdd some missing equations for type-literals.
Iavor S. Diatchki [Sat, 31 Mar 2012 19:14:49 +0000 (12:14 -0700)] 
Add some missing equations for type-literals.

7 years agoRespect package qualifier when validating imports in GHCi (#5979)
Patrick Palka [Sat, 31 Mar 2012 03:03:23 +0000 (23:03 -0400)] 
Respect package qualifier when validating imports in GHCi (#5979)

Signed-off-by: Paolo Capriotti <p.capriotti@gmail.com>
7 years agoAttempt to detect loops through imported function RULEs
Max Bolingbroke [Fri, 30 Mar 2012 16:21:45 +0000 (17:21 +0100)] 
Attempt to detect loops through imported function RULEs

This is motivated by the fact that before this change marking e.g.
GHC.List.filter as INLINABLE caused the compiler to diverge when
you tried to make use of the function.

The response is to say that a RULE on an imported function introduces
a dependency edge between the FVs of its LHS and RHS for the purposes
of computing loop breakers. This will not perfectly prevent all those
potential inlinings that could cause the compiler to non-terminate,
but it works well enough for the particular case we are interested in.

7 years agoUpdate documentation of DatatypeContexts (#5964)
Paolo Capriotti [Fri, 30 Mar 2012 14:46:30 +0000 (15:46 +0100)] 
Update documentation of DatatypeContexts (#5964)

7 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Fri, 30 Mar 2012 12:33:51 +0000 (13:33 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

7 years agoDon't do validity checking on types in Template Haskell type brackets
Simon Peyton Jones [Fri, 30 Mar 2012 11:48:34 +0000 (12:48 +0100)] 
Don't do validity checking on types in Template Haskell type brackets
We might be in the "knot" of a type declaration: see Trac #5968.

7 years agoA related group of changes that make lexically scoped type
Simon Peyton Jones [Fri, 30 Mar 2012 11:47:55 +0000 (12:47 +0100)] 
A related group of changes that make lexically scoped type
variables work in Template Haskell

Triggered by fixing Trac #5968.

7 years agoDon't crash if there's a malformed instance!
Simon Peyton Jones [Fri, 30 Mar 2012 11:43:45 +0000 (12:43 +0100)] 
Don't crash if there's a malformed instance!

Fixes Trac #5951

7 years agoWhite space only
Simon Peyton Jones [Fri, 30 Mar 2012 11:36:06 +0000 (12:36 +0100)] 
White space only

7 years agoComments only
Simon Peyton Jones [Fri, 30 Mar 2012 11:35:50 +0000 (12:35 +0100)] 
Comments only

7 years agoAdd linker support for ELF on ARM
Ben Gamari [Wed, 12 Oct 2011 04:49:12 +0000 (00:49 -0400)] 
Add linker support for ELF on ARM

Add support for ELF objects on ARM to the runtime linker. While the list of
relocation types in the "ELF for the ARM Architecture" specification spans four
pages, we thankfully only see a handful of these in the wild. Thus, at the
moment we only support the following .rel relocation types,

 * R_ARM_ABS32
 * R_ARM_TARGET1
 * R_ARM_REL32
 * R_ARM_CALL
 * R_ARM_JUMP24
 * R_ARM_MOVT_ABS
 * R_ARM_MOVW_ABS_NC
 * R_ARM_THM_CALL
 * R_ARM_THM_JUMP24
 * R_ARM_THM_MOVT_ABS
 * R_ARM_THM_MOVW_ABS_NC
 * R_ARM_THM_JUMP8
 * R_ARM_THM_JUMP11

Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
7 years agothreadStackOverflow: Tweak to stack chunk sizing
Simon Marlow [Wed, 28 Mar 2012 10:54:08 +0000 (11:54 +0100)] 
threadStackOverflow: Tweak to stack chunk sizing

If the old stack is only half full, then the next chunk we allocate
will be twice as large, to accommodate large requests for stack.  In
that case, make sure that the chunk we allocate is at least as large
as the usual chunk size - there's no point allocating a 2k chunk
(double the default initial chunk size of 1k) if in the normal case we
would allocate a 32k chunk.

7 years agoFix a bug in threadStackOverflow() (maybe #5214)
Simon Marlow [Wed, 28 Mar 2012 10:45:39 +0000 (11:45 +0100)] 
Fix a bug in threadStackOverflow() (maybe #5214)

If we overflow the current stack chunk and copy its entire contents
into the next stack chunk, we could end up with two UNDERFLOW_FRAMEs.
We had a special case to catch this in the case when the old stack
chunk was the last one (ending in STOP_FRAME), but it went wrong for
other chunks.

I found this bug while poking around in the core dump attached to
options and running the nofib suite: imaginary/wheel_sieve2 crashed
with +RTS -kc600 -kb300.

I don't know if this is the cause of all the symptoms reported in

7 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Wed, 28 Mar 2012 12:24:24 +0000 (13:24 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

7 years agoMake the LocalRdrEnv keep track of all the Names that are in scope
Simon Peyton Jones [Wed, 28 Mar 2012 08:57:57 +0000 (09:57 +0100)] 
Make the LocalRdrEnv keep track of all the Names that are in scope

This allows us to give a sensible error message when a Template Haskell
splice generates an occurrence without a binding site.

Fixes Trac #5959 and #5971

7 years agoAdd a crucial forkM on the superclass context of IfaceClass in tcIfaceDecl
Simon Peyton Jones [Wed, 28 Mar 2012 08:56:14 +0000 (09:56 +0100)] 
Add a crucial forkM on the superclass context of IfaceClass in tcIfaceDecl

The absence of this was causing a loop when typechecking an interface
where the superclass context mentioned an associated type
   class C (T a) => D a where
     data T a

Fixes Trac #5970

7 years agoDon't document '-fregs-liveness' or '-fllvm-tbaa', both hidden flags
David Terei [Wed, 28 Mar 2012 07:50:21 +0000 (00:50 -0700)] 
Don't document '-fregs-liveness' or '-fllvm-tbaa', both hidden flags

No reason user should turn them off, just want for ghc developer
debugging uses.

7 years agoRemove Show instance for Forest
Simon Peyton Jones [Wed, 28 Mar 2012 06:02:23 +0000 (07:02 +0100)] 
Remove Show instance for Forest

A Forest is just a list, and we have a Show instance for
lists already.  We don't need a special Show instance for
Forests.  If we change our minds we can add a newtype,
but I don't think it's worth it.

Fixes Trac #5960

7 years agoMerge with HEAD
Simon Peyton Jones [Tue, 27 Mar 2012 12:43:18 +0000 (13:43 +0100)] 
Merge with HEAD

7 years agoRemove dead code
Jose Pedro Magalhaes [Tue, 27 Mar 2012 12:03:42 +0000 (14:03 +0200)] 
Remove dead code

RdrHsSyn.extractGenericPatTyVars was a leftover from the
old generic classes.

7 years agoMerge branch 'master' of http://darcs.haskell.org//ghc
Simon Peyton Jones [Mon, 26 Mar 2012 08:12:57 +0000 (09:12 +0100)] 
Merge branch 'master' of darcs.haskell.org//ghc

Conflicts:
compiler/hsSyn/Convert.lhs
compiler/hsSyn/HsDecls.lhs

7 years agoMake the 'extract' functions to find free type variables
Simon Peyton Jones [Mon, 26 Mar 2012 08:00:58 +0000 (09:00 +0100)] 
Make the 'extract' functions to find free type variables
of an HsType return RdrNames rather than (Located RdrNames).

This means less clutter, and the individual locations are
a bit arbitrary if a name occurs more than once.

7 years agoComplete refactoring of HsDecls/HsTyDefn
Simon Peyton Jones [Mon, 26 Mar 2012 07:23:34 +0000 (08:23 +0100)] 
Complete refactoring of HsDecls/HsTyDefn

7 years agoMerge remote-tracking branch 'origin/master' into type-nats
Iavor S. Diatchki [Sat, 24 Mar 2012 23:23:48 +0000 (16:23 -0700)] 
Merge remote-tracking branch 'origin/master' into type-nats

7 years agoAdd -XExplicitNamespaces to enable using 'type' in import/exports.
Iavor S. Diatchki [Sat, 24 Mar 2012 23:01:00 +0000 (16:01 -0700)] 
Add -XExplicitNamespaces to enable using 'type' in import/exports.

This extension is implied by:

  * TypeOperators: so that we can import/export things like (+)
  * TypeFamilies: because associated type synonyms use "type T"
                  to name the associated type in a subordinate list.

7 years agoMerge branch 'master' of http://darcs.haskell.org//ghc
Simon Peyton Jones [Sat, 24 Mar 2012 22:25:56 +0000 (22:25 +0000)] 
Merge branch 'master' of darcs.haskell.org//ghc

Conflicts:
compiler/main/HscStats.lhs

7 years agoFix printing of type operators in declarations.
Iavor S. Diatchki [Sat, 24 Mar 2012 22:14:50 +0000 (15:14 -0700)] 
Fix printing of type operators in declarations.

7 years agoFix pretty-printing of type operators in imports/exports.
Iavor S. Diatchki [Sat, 24 Mar 2012 20:27:43 +0000 (13:27 -0700)] 
Fix pretty-printing of type operators in imports/exports.

When we see a type operator in an import or an export, we tag it
with the keyword 'type' so that it is not confused with value level
operators with the same name.

7 years agoMerge branch 'master' of win:c:/m64/reg4/.
Ian Lynagh [Sat, 24 Mar 2012 02:13:37 +0000 (02:13 +0000)] 
Merge branch 'master' of win:c:/m64/reg4/.

7 years agoFix rsp alignment on Win64
Ian Lynagh [Sat, 24 Mar 2012 01:53:39 +0000 (01:53 +0000)] 
Fix rsp alignment on Win64

7 years agoMerge branch 'master' of win:c:/m64/reg4/.
Ian Lynagh [Fri, 23 Mar 2012 23:19:01 +0000 (23:19 +0000)] 
Merge branch 'master' of win:c:/m64/reg4/.

7 years agoFix ASSIGN_DBL on Win64
Ian Lynagh [Fri, 23 Mar 2012 23:06:52 +0000 (23:06 +0000)] 
Fix ASSIGN_DBL on Win64

We were comparing ALIGNMENT_DOUBLE to ALIGNMENT_LONG, but really
we cared about W_ values, and sizeof(long) /= sizeof(void *) on Win64

7 years agoFix caller/callee register saving on Win64
Ian Lynagh [Fri, 23 Mar 2012 21:08:53 +0000 (21:08 +0000)] 
Fix caller/callee register saving on Win64

7 years agoRemove old darcs files
David Terei [Fri, 23 Mar 2012 19:32:45 +0000 (12:32 -0700)] 
Remove old darcs files

7 years agoclean to some docs
David Terei [Fri, 23 Mar 2012 19:32:24 +0000 (12:32 -0700)] 
clean to some docs

7 years agoDocument some optimisations, rearrange order to be more logical (#5801)
David Terei [Fri, 23 Mar 2012 18:30:05 +0000 (11:30 -0700)] 
Document some optimisations, rearrange order to be more logical (#5801)

7 years agoRename optimisation flag for uniformity with existing flags.
David Terei [Fri, 23 Mar 2012 18:12:21 +0000 (11:12 -0700)] 
Rename optimisation flag for uniformity with existing flags.

7 years agoAdd TODO entries for missing and unexplained optimisation flags. (#5801)
David Terei [Fri, 23 Mar 2012 18:10:50 +0000 (11:10 -0700)] 
Add TODO entries for missing and unexplained optimisation flags. (#5801)

7 years agoImprove documentation on optimisations.
David Terei [Fri, 23 Mar 2012 17:53:36 +0000 (10:53 -0700)] 
Improve documentation on optimisations.

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 17:32:07 +0000 (10:32 -0700)] 
Tabs -> Spaces

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 17:14:11 +0000 (10:14 -0700)] 
Tabs -> Spaces

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 17:13:51 +0000 (10:13 -0700)] 
Tabs -> Spaces

7 years agoCode clean
David Terei [Fri, 23 Mar 2012 17:12:10 +0000 (10:12 -0700)] 
Code clean

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 17:08:45 +0000 (10:08 -0700)] 
Tabs -> Spaces

7 years agoClean of PackageConfig
David Terei [Fri, 23 Mar 2012 17:06:24 +0000 (10:06 -0700)] 
Clean of PackageConfig

7 years agoCleaning of HscStats
David Terei [Fri, 23 Mar 2012 17:02:22 +0000 (10:02 -0700)] 
Cleaning of HscStats

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 16:57:33 +0000 (09:57 -0700)] 
Tabs -> Spaces

7 years agoClean up GhcMake a little
David Terei [Fri, 23 Mar 2012 16:56:54 +0000 (09:56 -0700)] 
Clean up GhcMake a little

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 16:45:48 +0000 (09:45 -0700)] 
Tabs -> Spaces

7 years agoClean and comment Annotations
David Terei [Fri, 23 Mar 2012 16:44:46 +0000 (09:44 -0700)] 
Clean and comment Annotations

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 16:39:55 +0000 (09:39 -0700)] 
Tabs -> Spaces

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 16:35:34 +0000 (09:35 -0700)] 
Tabs -> Spaces

7 years agoTabs -> Spaces
David Terei [Fri, 23 Mar 2012 16:34:28 +0000 (09:34 -0700)] 
Tabs -> Spaces

7 years agowhen tracing to stderr, make the capset events conditional on TRACE_sched
Simon Marlow [Thu, 22 Mar 2012 13:59:23 +0000 (13:59 +0000)] 
when tracing to stderr, make the capset events conditional on TRACE_sched

7 years agoAdd -favoid-vect
Manuel M T Chakravarty [Fri, 23 Mar 2012 10:44:14 +0000 (21:44 +1100)] 
Add -favoid-vect

* Enables vectorisation avoidance

(This commit only adds the flag, not the actual vectorisation avoidance transformation.)

7 years agoPPC: Handle right shift of > 31 bits. Fix #5900.
Erik de Castro Lopo [Wed, 29 Feb 2012 21:41:31 +0000 (08:41 +1100)] 
PPC: Handle right shift of > 31 bits. Fix #5900.

7 years agoPPC ppr: tabs -> spaces.
Erik de Castro Lopo [Wed, 29 Feb 2012 20:15:56 +0000 (07:15 +1100)] 
PPC ppr: tabs -> spaces.

7 years agoUpdate the user guide with details on new flag +RTS -lu
Duncan Coutts [Thu, 22 Mar 2012 23:24:57 +0000 (23:24 +0000)] 
Update the user guide with details on new flag +RTS -lu

It's for user events emitted from Haskell code, like traceEvent.
Fixes #5790

7 years agoRefactor HsDecls.TyClDecl to extract the type HsTyDefn, which is the
Simon Peyton Jones [Thu, 22 Mar 2012 21:10:34 +0000 (21:10 +0000)] 
Refactor HsDecls.TyClDecl to extract the type HsTyDefn, which is the
RHS of a data type or type synonym declaration.  This can be shared
between type declarations and type *instance* declarations.

7 years agoMerge branch 'master' of http://darcs.haskell.org//ghc
Simon Peyton Jones [Thu, 22 Mar 2012 21:01:39 +0000 (21:01 +0000)] 
Merge branch 'master' of darcs.haskell.org//ghc

7 years agohp2ps: escape backslashes when generating output file (#5800).
Paolo Capriotti [Thu, 22 Mar 2012 20:16:27 +0000 (20:16 +0000)] 
hp2ps: escape backslashes when generating output file (#5800).

7 years agoMerge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Ian Lynagh [Thu, 22 Mar 2012 10:58:59 +0000 (10:58 +0000)] 
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

7 years agoFix compile for CPUs other than x86/x86_64.
Erik de Castro Lopo [Thu, 22 Mar 2012 07:47:28 +0000 (18:47 +1100)] 
Fix compile for CPUs other than x86/x86_64.

7 years agoMerge branch 'master' of win:c:/m64/reg3/.
Ian Lynagh [Thu, 22 Mar 2012 10:58:24 +0000 (10:58 +0000)] 
Merge branch 'master' of win:c:/m64/reg3/.

7 years agoDisable some debug prints that a plain +RTS -DS was enabling
Ian Lynagh [Thu, 22 Mar 2012 10:55:29 +0000 (10:55 +0000)] 
Disable some debug prints that a plain +RTS -DS was enabling

7 years agoMerge branch 'master' of win:c:/m64/reg3/.
Ian Lynagh [Wed, 21 Mar 2012 23:50:04 +0000 (23:50 +0000)] 
Merge branch 'master' of win:c:/m64/reg3/.

7 years agoImplement the Adjustor for Win64
Ian Lynagh [Wed, 21 Mar 2012 23:47:59 +0000 (23:47 +0000)] 
Implement the Adjustor for Win64

7 years agoMake impossible-alternative-finding code more reusable
Max Bolingbroke [Fri, 6 Jan 2012 09:36:05 +0000 (09:36 +0000)] 
Make impossible-alternative-finding code more reusable

Makes the following changes:
 1. Generalises the type signatures of some functions relating to alternatives
    so that the type of "variables" and "expression" is not specified
 2. Puts the bulk of the alternative-filtering code into a new function filterAlts
    (in CoreUtils) that can be used outside of the SimplM monad
 3. Allows prepareAlts to return a null alternatives list if none are applicable -
    it turns out that this case was already handled by the caller (in the simplifier).
    This should result in a modest optimisation improvement in some cases.

Conflicts:

compiler/coreSyn/CoreUtils.lhs
compiler/simplCore/SimplUtils.lhs

7 years agoPrint more information when out-of-scope detected by linter
Max Bolingbroke [Tue, 20 Mar 2012 15:26:43 +0000 (15:26 +0000)] 
Print more information when out-of-scope detected by linter

7 years agoCheck for external names/exported ids in non-top-level binders during Lint
Max Bolingbroke [Tue, 20 Mar 2012 17:58:57 +0000 (17:58 +0000)] 
Check for external names/exported ids in non-top-level binders during Lint

7 years agoOnly support stdcall in Adjustor.c on i386
Ian Lynagh [Wed, 21 Mar 2012 16:07:14 +0000 (16:07 +0000)] 
Only support stdcall in Adjustor.c on i386

7 years agoDetab Adjustor.c
Ian Lynagh [Wed, 21 Mar 2012 16:06:39 +0000 (16:06 +0000)] 
Detab Adjustor.c

7 years agoMerge branch 'master' of win:c:/m64/reg2/.
Ian Lynagh [Wed, 21 Mar 2012 15:02:02 +0000 (15:02 +0000)] 
Merge branch 'master' of win:c:/m64/reg2/.

7 years agoFixes for the calling convention on Win64
Ian Lynagh [Wed, 21 Mar 2012 14:38:53 +0000 (14:38 +0000)] 
Fixes for the calling convention on Win64

In particular, fixes for FP arguments

7 years agoRename allArgRegs to allIntArgRegs
Ian Lynagh [Wed, 21 Mar 2012 12:30:12 +0000 (12:30 +0000)] 
Rename allArgRegs to allIntArgRegs

7 years agoMerge remote-tracking branch 'origin/master' into type-nats
Iavor S. Diatchki [Wed, 21 Mar 2012 00:22:42 +0000 (17:22 -0700)] 
Merge remote-tracking branch 'origin/master' into type-nats

7 years agoWhitespace fixes in ghci/Linker.lhs
Ian Lynagh [Tue, 20 Mar 2012 21:29:16 +0000 (21:29 +0000)] 
Whitespace fixes in ghci/Linker.lhs

7 years agoFix whitespace in ghci/ObjLink.lhs
Ian Lynagh [Tue, 20 Mar 2012 18:34:42 +0000 (18:34 +0000)] 
Fix whitespace in ghci/ObjLink.lhs

7 years agoFix for Win64 codegen
Ian Lynagh [Tue, 20 Mar 2012 16:11:04 +0000 (16:11 +0000)] 
Fix for Win64 codegen

We need to leave stack space for arguments that we are passing in
registers.

7 years agoMerge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Ian Lynagh [Tue, 20 Mar 2012 15:02:29 +0000 (15:02 +0000)] 
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

7 years agoCode tidy-up: Use RET_NN in stg_block_async
Ian Lynagh [Tue, 20 Mar 2012 15:00:08 +0000 (15:00 +0000)] 
Code tidy-up: Use RET_NN in stg_block_async

7 years agoFix the Win32 build: A CPP symbol name was wrong
Ian Lynagh [Tue, 20 Mar 2012 14:52:53 +0000 (14:52 +0000)] 
Fix the Win32 build: A CPP symbol name was wrong

7 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Tue, 20 Mar 2012 09:37:41 +0000 (09:37 +0000)] 
Merge branch 'master' of darcs.haskell.org/ghc

7 years agoComments only
Simon Peyton Jones [Tue, 20 Mar 2012 09:37:21 +0000 (09:37 +0000)] 
Comments only

7 years agoFix scoping of type variables in DsMeta
Simon Peyton Jones [Tue, 20 Mar 2012 09:37:09 +0000 (09:37 +0000)] 
Fix scoping of type variables in DsMeta

This fixes Trac #4135.  It's been wrong for a long time!

7 years agoMerge remote-tracking branch 'origin/master' into type-nats
Iavor S. Diatchki [Tue, 20 Mar 2012 03:11:50 +0000 (20:11 -0700)] 
Merge remote-tracking branch 'origin/master' into type-nats