diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-05-15 14:54:37 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-06-13 02:13:03 -0400 |
| commit | ae900605c4860684c51584dac271956635eb60cc (patch) | |
| tree | f620514fddeade2acf32ed9ff1c8e4ada9343319 | |
| parent | 653d17bdd57ec8ca9b11b19e45860982bd1e7c9e (diff) | |
| download | haskell-ae900605c4860684c51584dac271956635eb60cc.tar.gz | |
Move dump_mod_map into initUnits
| -rw-r--r-- | compiler/GHC/Unit/State.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/GHC/Unit/State.hs b/compiler/GHC/Unit/State.hs index 6862d32157..b13d5e00b3 100644 --- a/compiler/GHC/Unit/State.hs +++ b/compiler/GHC/Unit/State.hs @@ -512,10 +512,14 @@ initUnits dflags = withTiming dflags | gopt Opt_DistrustAllPackages dflags = map distrust_all read_pkg_dbs | otherwise = read_pkg_dbs - (pkg_state, preload, insts) - <- mkUnitState dflags pkg_dbs [] - return (dflags{ unitDatabases = Just read_pkg_dbs, - unitState = pkg_state, + (state, preload, insts) <- mkUnitState dflags pkg_dbs [] + + dumpIfSet_dyn (dflags { pprCols = 200 }) Opt_D_dump_mod_map "Mod Map" + FormatText + (pprModuleMap (moduleNameProvidersMap state)) + + return (dflags{ unitDatabases = Just read_pkg_dbs, + unitState = state, homeUnitInstantiations = insts }, preload) where @@ -1580,10 +1584,6 @@ mkUnitState dflags dbs preload0 = do mod_map2 = mkUnusableModuleNameProvidersMap unusable mod_map = Map.union mod_map1 mod_map2 - dumpIfSet_dyn (dflags { pprCols = 200 }) Opt_D_dump_mod_map "Mod Map" - FormatText - (pprModuleMap mod_map) - -- Force pstate to avoid leaking the dflags passed to mkUnitState let !pstate = UnitState { preloadUnits = dep_preload |