diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-06-15 21:44:08 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-07-27 04:55:12 +0000 |
| commit | 3767fc823bf2827bab5a972b3d05017bc65e25b3 (patch) | |
| tree | a6342bbb6982fc0133557bb6c633a4ade2e15e19 /compiler/GHC/Driver/Make.hs | |
| parent | b154ec781a8f7cf84aa2e415a09e222c60bcd285 (diff) | |
| download | haskell-wip/rip-out-interactive-context.tar.gz | |
WIP: remove `InteractiveContext` from `HscEnv`wip/rip-out-interactive-context
GHC the library typechecks!
Diffstat (limited to 'compiler/GHC/Driver/Make.hs')
| -rw-r--r-- | compiler/GHC/Driver/Make.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs index 1968bfa954..6069e2c59a 100644 --- a/compiler/GHC/Driver/Make.hs +++ b/compiler/GHC/Driver/Make.hs @@ -58,6 +58,7 @@ import GHC.Tc.Utils.Backpack import GHC.Tc.Utils.Monad ( initIfaceCheck ) import GHC.Runtime.Interpreter +import GHC.Runtime.Context ( emptyInteractiveContext ) import qualified GHC.Linker.Loader as Linker import GHC.Linker.Types @@ -721,7 +722,7 @@ load' mhmi_cache how_much mHscMessage mod_graph = do -- write an empty HPT to allow the old HPT to be GC'd. let pruneHomeUnitEnv hme = hme { homeUnitEnv_hpt = emptyHomePackageTable } - setSession $ discardIC $ hscUpdateHUG (unitEnv_map pruneHomeUnitEnv) hsc_env + setSession $ {- discardIC $ -} hscUpdateHUG (unitEnv_map pruneHomeUnitEnv) hsc_env -- Unload everything liftIO $ unload interp hsc_env @@ -753,7 +754,7 @@ loadFinish :: GhcMonad m => SuccessFlag -> m SuccessFlag -- Empty the interactive context and set the module context to the topmost -- newly loaded module, or the Prelude if none were loaded. loadFinish all_ok - = do modifySession discardIC + = do -- modifyInteractiveContext discardIC return all_ok @@ -2610,7 +2611,8 @@ 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 + -- TODO plugins should not need an interactive context + plugins_hsc_env <- initializePlugins orig_hsc_env $ emptyInteractiveContext $ hsc_dflags 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 |