From 06ad87ef0cc77af05693916decbed72a54906e3f Mon Sep 17 00:00:00 2001 From: Bartosz Nitka Date: Mon, 15 May 2017 04:21:52 -0700 Subject: Revert "Stress test for nested module hierarchies" This reverts commit e527fc2e90958280a36645b6bd0223861cc50a55. I merged more than I intended in e527fc2e, I will merge D3575 and D3577 separately. --- compiler/iface/MkIface.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'compiler/iface') diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs index 4968c2921c..14749c7617 100644 --- a/compiler/iface/MkIface.hs +++ b/compiler/iface/MkIface.hs @@ -105,6 +105,7 @@ import Binary import Fingerprint import Exception import UniqSet +import UniqDFM import Packages import Control.Monad @@ -1219,14 +1220,14 @@ checkVersions hsc_env mod_summary iface -- We do this regardless of compilation mode, although in --make mode -- all the dependent modules should be in the HPT already, so it's -- quite redundant - ; updateEps_ $ \eps -> eps { eps_is_boot = mod_deps } + ; updateEps_ $ \eps -> eps { eps_is_boot = udfmToUfm mod_deps } ; recomp <- checkList [checkModUsage this_pkg u | u <- mi_usages iface] ; return (recomp, Just iface) }}}}}} where this_pkg = thisPackage (hsc_dflags hsc_env) -- This is a bit of a hack really - mod_deps :: ModuleNameEnv (ModuleName, IsBootInterface) + mod_deps :: DModuleNameEnv (ModuleName, IsBootInterface) mod_deps = mkModDeps (dep_mods (mi_deps iface)) -- | Check if an hsig file needs recompilation because its -- cgit v1.2.1