[commit: ghc] type-holes-branch: Merge branch 'master' of https://github.com/ghc/ghc (43df571)
Simon Peyton Jones
simonpj at microsoft.com
Mon Sep 17 13:04:48 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/43df5718c34fc04cef8ad7d15299ac56ce4798ff
>---------------------------------------------------------------
commit 43df5718c34fc04cef8ad7d15299ac56ce4798ff
Merge: f377504... b660cc0...
Author: Thijs Alkemade <thijsalkemade at gmail.com>
Date: Thu Aug 30 21:12:39 2012 +0200
Merge branch 'master' of https://github.com/ghc/ghc
compiler/basicTypes/BasicTypes.lhs | 2 +-
compiler/basicTypes/RdrName.lhs | 21 +-
compiler/cmm/CmmParse.y | 1058 ++++++++++----------
compiler/cmm/MkGraph.hs | 107 ++-
compiler/codeGen/CallerSaves.hs | 51 -
compiler/codeGen/CgHeapery.lhs | 12 +-
compiler/codeGen/CgUtils.hs | 159 +---
compiler/codeGen/CodeGen/Platform.hs | 111 ++
compiler/codeGen/CodeGen/Platform/ARM.hs | 7 +
compiler/codeGen/CodeGen/Platform/NoRegs.hs | 6 +
compiler/codeGen/CodeGen/Platform/PPC.hs | 7 +
compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 8 +
compiler/codeGen/CodeGen/Platform/SPARC.hs | 7 +
compiler/codeGen/CodeGen/Platform/X86.hs | 7 +
compiler/codeGen/CodeGen/Platform/X86_64.hs | 7 +
compiler/codeGen/StgCmm.hs | 97 +-
compiler/codeGen/StgCmmBind.hs | 241 +++---
compiler/codeGen/StgCmmExpr.hs | 179 ++--
compiler/codeGen/StgCmmUtils.hs | 387 ++++----
compiler/coreSyn/CorePrep.lhs | 46 +-
compiler/coreSyn/CoreSyn.lhs | 21 +
compiler/coreSyn/CoreUtils.lhs | 10 +-
compiler/coreSyn/MkCore.lhs | 6 +-
compiler/coreSyn/TrieMap.lhs | 111 ++-
compiler/deSugar/Coverage.lhs | 89 ++-
compiler/deSugar/DsBinds.lhs | 11 +-
compiler/deSugar/DsMeta.hs | 253 +++--
compiler/ghc.cabal.in | 10 +-
compiler/ghci/Linker.lhs | 67 +-
compiler/hsSyn/Convert.lhs | 92 ++-
compiler/hsSyn/HsDecls.lhs | 5 +-
compiler/iface/MkIface.lhs | 7 +-
compiler/llvmGen/LlvmCodeGen.hs | 2 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 19 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 26 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 59 +-
compiler/main/DriverPhases.hs | 41 +-
compiler/main/DriverPipeline.hs | 20 +-
compiler/main/GHC.hs | 6 +
compiler/main/HscMain.hs | 38 +-
compiler/main/HscTypes.lhs | 3 +-
compiler/main/TidyPgm.lhs | 23 +-
compiler/nativeGen/AsmCodeGen.lhs | 16 +-
compiler/nativeGen/Instruction.hs | 3 +-
compiler/nativeGen/PPC/CodeGen.hs | 48 +-
compiler/nativeGen/PPC/Instr.hs | 25 +-
compiler/nativeGen/PPC/Regs.hs | 513 ++--------
compiler/nativeGen/RegAlloc/Graph/Main.hs | 6 +-
compiler/nativeGen/RegAlloc/Graph/Spill.hs | 31 +-
compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 2 +-
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 8 +-
compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 20 +-
.../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 58 +-
compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 5 +-
.../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 25 +-
compiler/nativeGen/RegAlloc/Linear/X86/FreeRegs.hs | 40 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 83 +-
compiler/nativeGen/SPARC/CodeGen.hs | 10 +-
compiler/nativeGen/SPARC/CodeGen/Base.hs | 11 +-
compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 7 +-
compiler/nativeGen/SPARC/Imm.hs | 4 +-
compiler/nativeGen/SPARC/Instr.hs | 17 +-
compiler/nativeGen/SPARC/RegPlate.hs | 318 ------
compiler/nativeGen/SPARC/Regs.hs | 130 +---
compiler/nativeGen/TargetReg.hs | 10 +-
compiler/nativeGen/X86/CodeGen.hs | 173 ++--
compiler/nativeGen/X86/Instr.hs | 32 +-
compiler/nativeGen/X86/Regs.hs | 375 ++------
compiler/parser/Parser.y.pp | 6 +-
compiler/prelude/primops.txt.pp | 2 +-
compiler/rename/RnEnv.lhs | 31 +-
compiler/rename/RnNames.lhs | 210 +++--
compiler/rename/RnTypes.lhs | 26 +-
compiler/specialise/Rules.lhs | 7 +-
compiler/specialise/SpecConstr.lhs | 6 +-
compiler/specialise/Specialise.lhs | 12 +-
compiler/typecheck/TcBinds.lhs | 57 +-
compiler/typecheck/TcCanonical.lhs | 12 +-
compiler/typecheck/TcEvidence.lhs | 44 +-
compiler/typecheck/TcHsSyn.lhs | 2 +-
compiler/typecheck/TcHsType.lhs | 12 +-
compiler/typecheck/TcInstDcls.lhs | 2 +-
compiler/typecheck/TcMType.lhs | 44 +-
compiler/typecheck/TcPat.lhs | 10 +-
compiler/typecheck/TcRnTypes.lhs | 2 +-
compiler/typecheck/TcSimplify.lhs | 84 +--
compiler/typecheck/TcTyClsDecls.lhs | 26 +-
compiler/utils/Util.lhs | 17 +-
docs/users_guide/ghci.xml | 14 +-
docs/users_guide/glasgow_exts.xml | 96 ++-
docs/users_guide/using.xml | 19 +-
ghc/InteractiveUI.hs | 54 +-
ghc/ghc.mk | 4 +-
ghc/hschooks.c | 8 +
includes/CallerSaves.part.hs | 81 --
includes/CodeGen.Platform.hs | 735 ++++++++++++++
includes/rts/prof/CCS.h | 9 +
includes/rts/storage/ClosureMacros.h | 60 +-
mk/config.mk.in | 10 -
rts/Interpreter.c | 2 +-
rts/Linker.c | 35 +-
rts/Printer.c | 2 +-
rts/Profiling.c | 3 +-
rts/Proftimer.h | 3 -
rts/RaiseAsync.c | 2 +-
rts/Schedule.c | 17 +-
rts/posix/OSThreads.c | 6 +-
rts/sm/BlockAlloc.c | 37 +-
rts/sm/BlockAlloc.h | 2 +
rts/sm/Compact.c | 6 +-
rts/sm/Evac.c | 6 +-
rts/sm/GC.c | 62 +-
rts/sm/MarkWeak.c | 23 +-
rts/sm/Sanity.c | 8 +-
rts/sm/Storage.c | 47 +-
rts/sm/Storage.h | 4 +-
utils/ghc-cabal/Main.hs | 3 +-
utils/ghc-cabal/ghc-cabal.cabal | 1 +
utils/ghc-pkg/ghc.mk | 4 +-
120 files changed, 3850 insertions(+), 3536 deletions(-)
diff --cc compiler/typecheck/TcCanonical.lhs
index 38c7c49,d383458..3ceb31a
--- a/compiler/typecheck/TcCanonical.lhs
+++ b/compiler/typecheck/TcCanonical.lhs
@@@ -235,9 -233,10 +234,9 @@@ canTuple d fl ty
; mapM_ add_to_work ctevs
; return Stop }
where
- add_to_work fl = addToWork $ canEvVar d fl (classifyPredType (ctEvPred fl))
+ add_to_work fl = addToWork $ canEvVar d fl
\end{code}
-
%************************************************************************
%* *
%* Class Canonicalization
diff --cc compiler/typecheck/TcSimplify.lhs
index 41139a0,c36ee43..34bb74a
--- a/compiler/typecheck/TcSimplify.lhs
+++ b/compiler/typecheck/TcSimplify.lhs
@@@ -387,8 -390,8 +389,8 @@@ simplifyInfer _top_lvl apply_mr name_ta
, wc_insol = emptyBag }
-- Step 6) Final candidates for quantification
- ; let final_quant_candidates :: Bag PredType
- final_quant_candidates = mapBag ctPred $ filterBag (not.isCHoleCan) $
+ ; let final_quant_candidates :: [PredType]
- final_quant_candidates = map ctPred $ bagToList $
++ final_quant_candidates = map ctPred $ filter (not.isCHoleCan) $ bagToList
keepWanted (wc_flat quant_candidates_transformed)
-- NB: Already the fixpoint of any unifications that may have happened
More information about the Cvs-ghc
mailing list