diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-08-20 16:55:59 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-08-26 04:50:58 -0400 |
| commit | 0b17fa185aec793861364afd9a05aa4219fbc019 (patch) | |
| tree | bb668be1d2b290fccfeb2beb982994b553789bb3 /compiler/GHC/Iface/Load.hs | |
| parent | b7d98cb2606997e05ad6406929dae3aba746fbb9 (diff) | |
| download | haskell-0b17fa185aec793861364afd9a05aa4219fbc019.tar.gz | |
Refactor UnitId pretty-printing
When we pretty-print a UnitId for the user, we try to map it back to its
origin package name, version and component to print
"package-version:component" instead of some hash.
The UnitId type doesn't carry these information, so we have to look into
a UnitState to find them. This is why the Outputable instance of
UnitId used `sdocWithDynFlags` in order to access the `unitState` field
of DynFlags.
This is wrong for several reasons:
1. The DynFlags are accessed when the message is printed, not when it is
generated. So we could imagine that the unitState may have changed
in-between. Especially if we want to allow unit unloading.
2. We want GHC to support several independent sessions at once, hence
several UnitState. The current approach supposes there is a unique
UnitState as a UnitId doesn't indicate which UnitState to use.
See the Note [Pretty-printing UnitId] in GHC.Unit for the new approach
implemented by this patch.
One step closer to remove `sdocDynFlags` field from `SDocContext`
(#10143).
Fix #18124.
Also fix some Backpack code to use SDoc instead of String.
Diffstat (limited to 'compiler/GHC/Iface/Load.hs')
| -rw-r--r-- | compiler/GHC/Iface/Load.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/GHC/Iface/Load.hs b/compiler/GHC/Iface/Load.hs index 508a6b8281..39e08c7eee 100644 --- a/compiler/GHC/Iface/Load.hs +++ b/compiler/GHC/Iface/Load.hs @@ -1121,6 +1121,7 @@ For some background on this choice see trac #15269. showIface :: HscEnv -> FilePath -> IO () showIface hsc_env filename = do let dflags = hsc_dflags hsc_env + unit_state = unitState dflags printer = putLogMsg dflags NoReason SevOutput noSrcSpan . withPprStyle defaultDumpStyle -- skip the hi way check; we don't want to worry about profiled vs. @@ -1136,7 +1137,9 @@ showIface hsc_env filename = do neverQualifyModules neverQualifyPackages putLogMsg dflags NoReason SevDump noSrcSpan - $ withPprStyle (mkDumpStyle print_unqual) (pprModIface iface) + $ withPprStyle (mkDumpStyle print_unqual) + $ pprWithUnitState unit_state + $ pprModIface iface -- Show a ModIface but don't display details; suitable for ModIfaces stored in -- the EPT. |