Merge branch 'refs/heads/vect-avoid' into vect-avoid-merge
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>
Tue, 5 Feb 2013 23:31:17 +0000 (10:31 +1100)
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>
Tue, 5 Feb 2013 23:31:17 +0000 (10:31 +1100)
commitfac50f929ad6e432d5dd1ffa6f298631c627a54e
treebe283780a8b7aa824e47f381aaf122f44c376880
parent1116e3c05f9c397aa2fae35c69d8d792f42da2cf
parent874bb7e34b114669a1b3b45f06e70a3a7a1100bb
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.
22 files changed:
compiler/coreSyn/CoreSubst.lhs
compiler/coreSyn/CoreSyn.lhs
compiler/coreSyn/PprCore.lhs
compiler/deSugar/Desugar.lhs
compiler/hsSyn/HsDecls.lhs
compiler/iface/LoadIface.lhs
compiler/iface/MkIface.lhs
compiler/iface/TcIface.lhs
compiler/main/DynFlags.hs
compiler/main/HscTypes.lhs
compiler/main/TidyPgm.lhs
compiler/parser/Parser.y.pp
compiler/rename/RnSource.lhs
compiler/simplCore/OccurAnal.lhs
compiler/simplCore/SimplCore.lhs
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/vectorise/Vectorise.hs
compiler/vectorise/Vectorise/Env.hs
compiler/vectorise/Vectorise/Exp.hs
compiler/vectorise/Vectorise/Monad/InstEnv.hs
compiler/vectorise/Vectorise/Type/Env.hs