summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2023-01-25 12:13:25 +0000
committerBen Gamari <ben@smart-cactus.org>2023-02-09 12:05:56 -0500
commit31a9076972690dee126d5b4049430efa78db9738 (patch)
tree2c2cf5c6cdcecdcda5c40e5fa4b88428a4eb30dc
parentbea77fc40ef11fbe2f0c2a0a3f2fdb74b445579a (diff)
downloadhaskell-31a9076972690dee126d5b4049430efa78db9738.tar.gz
driver: Use hooks from plugin_hsc_env
This fixes a bug in oneshot mode where hooks modified in a plugin wouldn't be used in oneshot mode because we neglected to use the right hsc_env. This was observed by @csabahruska. (cherry picked from commit cc72e71298ce7e8ef7a2263a531f96d777db1800)
-rw-r--r--compiler/GHC/Driver/Pipeline.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs
index 0737a2f8c1..e539c3fcbf 100644
--- a/compiler/GHC/Driver/Pipeline.hs
+++ b/compiler/GHC/Driver/Pipeline.hs
@@ -249,7 +249,7 @@ compileOne' mHscMessage
status <- hscRecompStatus mHscMessage plugin_hsc_env upd_summary
mb_old_iface mb_old_linkable (mod_index, nmods)
let pipeline = hscPipeline pipe_env (setDumpPrefix pipe_env plugin_hsc_env, upd_summary, status)
- (iface, linkable) <- runPipeline (hsc_hooks hsc_env) pipeline
+ (iface, linkable) <- runPipeline (hsc_hooks plugin_hsc_env) pipeline
-- See Note [ModDetails and --make mode]
details <- initModDetails plugin_hsc_env iface
linkable' <- traverse (initWholeCoreBindings plugin_hsc_env iface details) (homeMod_bytecode linkable)