diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2022-02-09 17:01:38 +0530 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-02-17 10:35:43 +0000 |
| commit | 0afa19da629c6f2852e77e134902304b82a91e84 (patch) | |
| tree | 418f657b01ccac353815a94172c840d3c27fef4d /compiler/GHC/Driver/Make.hs | |
| parent | 4127e86dfdfcfce60e5029c716c98c244851779a (diff) | |
| download | haskell-wip/th-recomp.tar.gz | |
Track object file dependencies for TH accurately (#20604)wip/th-recomp
`hscCompileCoreExprHook` is changed to return a list of `Module`s required
by a splice. These modules are accumulated in the TcGblEnv (tcg_th_needed_mods).
Dependencies on the object files of these modules are recording in the
interface.
The data structures in `LoaderState` are replaced with more efficient versions
to keep track of all the information required. The
MultiLayerModulesTH_Make allocations increase slightly but runtime is
faster.
Fixes #20604
-------------------------
Metric Increase:
MultiLayerModulesTH_Make
-------------------------
Diffstat (limited to 'compiler/GHC/Driver/Make.hs')
| -rw-r--r-- | compiler/GHC/Driver/Make.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs index a46ae37279..6023d3a914 100644 --- a/compiler/GHC/Driver/Make.hs +++ b/compiler/GHC/Driver/Make.hs @@ -1166,16 +1166,15 @@ upsweep_mod hsc_env mHscMessage old_hmi summary mod_index nmods = do -- This function only does anything if the linkable produced is a BCO, which only happens with the -- bytecode backend, no need to guard against the backend type additionally. addSptEntries (hscUpdateHPT (\hpt -> addToHpt hpt (ms_mod_name summary) hmi) hsc_env) - (ms_mnwib summary) (hm_linkable hmi) return hmi -- | Add the entries from a BCO linkable to the SPT table, see -- See Note [Grand plan for static forms] in GHC.Iface.Tidy.StaticPtrTable. -addSptEntries :: HscEnv -> ModuleNameWithIsBoot -> Maybe Linkable -> IO () -addSptEntries hsc_env mnwib mlinkable = - hscAddSptEntries hsc_env (Just mnwib) +addSptEntries :: HscEnv -> Maybe Linkable -> IO () +addSptEntries hsc_env mlinkable = + hscAddSptEntries hsc_env [ spt | Just linkable <- [mlinkable] , unlinked <- linkableUnlinked linkable @@ -2523,7 +2522,7 @@ runPipelines _ _ _ [] = return () runPipelines n_job orig_hsc_env mHscMessager all_pipelines = do liftIO $ label_self "main --make thread" - plugins_hsc_env <- initializePlugins orig_hsc_env Nothing + plugins_hsc_env <- initializePlugins orig_hsc_env case n_job of 1 -> runSeqPipelines plugins_hsc_env mHscMessager all_pipelines _n -> runParPipelines n_job plugins_hsc_env mHscMessager all_pipelines |