summaryrefslogtreecommitdiff
path: root/compiler/GHC/HsToCore.hs
diff options
context:
space:
mode:
authorZubin Duggal <zubin.duggal@gmail.com>2022-02-09 17:01:38 +0530
committerMatthew Pickering <matthewtpickering@gmail.com>2022-02-17 10:35:43 +0000
commit0afa19da629c6f2852e77e134902304b82a91e84 (patch)
tree418f657b01ccac353815a94172c840d3c27fef4d /compiler/GHC/HsToCore.hs
parent4127e86dfdfcfce60e5029c716c98c244851779a (diff)
downloadhaskell-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/HsToCore.hs')
-rw-r--r--compiler/GHC/HsToCore.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/GHC/HsToCore.hs b/compiler/GHC/HsToCore.hs
index 0a210e0871..78d43b164f 100644
--- a/compiler/GHC/HsToCore.hs
+++ b/compiler/GHC/HsToCore.hs
@@ -213,9 +213,10 @@ deSugar hsc_env
; used_th <- readIORef tc_splice_used
; dep_files <- readIORef dependent_files
; safe_mode <- finalSafeMode dflags tcg_env
+ ; (needed_mods, needed_pkgs) <- readIORef (tcg_th_needed_deps tcg_env)
- ; usages <- mkUsageInfo hsc_env mod hsc_src (imp_mods imports) used_names
- dep_files merged
+ ; usages <- mkUsageInfo hsc_env mod (imp_mods imports) used_names
+ dep_files merged needed_mods needed_pkgs
-- id_mod /= mod when we are processing an hsig, but hsigs
-- never desugared and compiled (there's no code!)
-- Consequently, this should hold for any ModGuts that make