[commit: ghc] master: Merge branch 'refs/heads/vect-avoid' into vect-avoid-merge (fac50f9)

[Manuel Chakravarty]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fac50f929ad6e432d5dd1ffa6f298631c627a54e

>---------------------------------------------------------------

commit fac50f929ad6e432d5dd1ffa6f298631c627a54e
Merge: 1116e3c... 874bb7e...
Author: Manuel M T Chakravarty <chak at cse.unsw.edu.au>
Date:   Wed Feb 6 10:31:17 2013 +1100

    Merge branch 'refs/heads/vect-avoid' into vect-avoid-merge
    
    Conflicts:
    	compiler/rename/RnSource.lhs
    	compiler/simplCore/OccurAnal.lhs
    	compiler/vectorise/Vectorise/Exp.hs
    
    NB: Merging instead of rebasing for a change. During rebase Git got confused due to the lack of the submodules in my quite old fork.

 compiler/coreSyn/CoreFVs.lhs                       |   11 +-
 compiler/coreSyn/CoreSubst.lhs                     |   13 +-
 compiler/coreSyn/CoreSyn.lhs                       |    4 +-
 compiler/coreSyn/PprCore.lhs                       |    3 +-
 compiler/deSugar/Desugar.lhs                       |    2 +-
 compiler/hsSyn/HsDecls.lhs                         |   10 +-
 compiler/iface/LoadIface.lhs                       |   14 +-
 compiler/iface/MkIface.lhs                         |   18 +-
 compiler/iface/TcIface.lhs                         |   30 +-
 compiler/main/DynFlags.hs                          |    5 +-
 compiler/main/HscTypes.lhs                         |   54 +-
 compiler/main/TidyPgm.lhs                          |   20 +-
 compiler/parser/Parser.y.pp                        |    5 +-
 compiler/rename/RnSource.lhs                       |   10 +-
 compiler/simplCore/OccurAnal.lhs                   |   12 +-
 compiler/simplCore/SimplCore.lhs                   |   22 +-
 compiler/typecheck/TcBinds.lhs                     |    9 +-
 compiler/typecheck/TcHsSyn.lhs                     |    2 +-
 compiler/vectorise/Vectorise.hs                    |  397 +++----
 compiler/vectorise/Vectorise/Builtins/Base.hs      |    3 +-
 .../vectorise/Vectorise/Builtins/Initialise.hs     |    8 +-
 compiler/vectorise/Vectorise/Convert.hs            |   22 +-
 compiler/vectorise/Vectorise/Env.hs                |  121 +-
 compiler/vectorise/Vectorise/Exp.hs                | 1225 +++++++++++---------
 compiler/vectorise/Vectorise/Monad.hs              |   29 +-
 compiler/vectorise/Vectorise/Monad/Global.hs       |   73 +-
 compiler/vectorise/Vectorise/Monad/InstEnv.hs      |   13 +-
 compiler/vectorise/Vectorise/Monad/Local.hs        |  117 +-
 compiler/vectorise/Vectorise/Type/Classify.hs      |   51 +-
 compiler/vectorise/Vectorise/Type/Env.hs           |  220 ++--
 compiler/vectorise/Vectorise/Type/Type.hs          |   13 +-
 compiler/vectorise/Vectorise/Utils.hs              |   25 +-
 32 files changed, 1358 insertions(+), 1203 deletions(-)


Diff suppressed because of size. To see it, use:

    git show fac50f929ad6e432d5dd1ffa6f298631c627a54e