[commit: ghc] master: Fix dll-split problem with patch 'Make Core Lint check for locally-bound GlobalId' (3f87866)
git at git.haskell.org
git at git.haskell.org
Mon Dec 15 17:08:02 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/3f87866ad536d1c20fa477aa124fe1267fb36a43/ghc
>---------------------------------------------------------------
commit 3f87866ad536d1c20fa477aa124fe1267fb36a43
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Mon Dec 15 17:03:47 2014 +0000
Fix dll-split problem with patch 'Make Core Lint check for locally-bound GlobalId'
The trouble was that my changes made a lot more files transitively link with
DynFlags, which is the root module for the revolting Windows dll-split stuff.
Anyway this patch fixes it, in a good way:
- Make GHC/Hooks *not* import DsMonad, because DsMonad imports too
much other stuff (notably tcLookup variants). Really, Hooks depends
only on *types* not *code*.
- To do this I need the DsM type, and the types it depends on,
not to be part of DsMonad. So I moved it to TcRnTypes, which is
where the similar pieces for the TcM and IfM monads live.
- We can then delete DsMonad.hs-boot
- There are a bunch of knock-on change, of no great significance
>---------------------------------------------------------------
3f87866ad536d1c20fa477aa124fe1267fb36a43
compiler/deSugar/DsMeta.hs | 18 ++--
compiler/deSugar/DsMonad.hs | 82 ++------------
compiler/deSugar/DsMonad.hs-boot | 32 ------
compiler/ghc.mk | 11 --
compiler/main/Hooks.hs | 6 +-
compiler/typecheck/TcEnv.hs | 2 +-
compiler/typecheck/TcExpr.hs | 2 +-
compiler/typecheck/TcRnTypes.hs | 227 +++++++++++++++++++++++++--------------
compiler/typecheck/TcSplice.hs | 2 +-
9 files changed, 172 insertions(+), 210 deletions(-)
Diff suppressed because of size. To see it, use:
git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3f87866ad536d1c20fa477aa124fe1267fb36a43
More information about the ghc-commits
mailing list