[Git][ghc/ghc][wip/romes/graph-compact-easy] 2 commits: Revert "Landmine after pruning"

Rodrigo Mesquita (@alt-romes) gitlab at gitlab.haskell.org
Tue Jan 7 10:28:21 UTC 2025



Rodrigo Mesquita pushed to branch wip/romes/graph-compact-easy at Glasgow Haskell Compiler / GHC


Commits:
432e4bc2 by Rodrigo Mesquita at 2025-01-07T10:25:01+00:00
Revert "Landmine after pruning"

This reverts commit 5f6dcccd5f29de1838ee0046648a5ff6b4936f49.

- - - - -
e54108f2 by Rodrigo Mesquita at 2025-01-07T10:26:43+00:00
small comment

- - - - -


1 changed file:

- compiler/GHC/Driver/Make.hs


Changes:

=====================================
compiler/GHC/Driver/Make.hs
=====================================
@@ -774,7 +774,9 @@ load' mhmi_cache how_much diag_wrapper mHscMessage mod_graph = do
     -- write an empty HPT to allow the old HPT to be GC'd.
 
     let pruneHomeUnitEnv hme = do
-          pure $! hme{ homeUnitEnv_hpt = panic "after pruning home unit env, the hpt should never ever again be referenced." }
+          -- set to empty rather than panic because it will be again inserted to during upsweep (below).
+          emptyHPT <- liftIO emptyHomePackageTable
+          pure $! hme{ homeUnitEnv_hpt = emptyHPT }
     hug' <- traverse pruneHomeUnitEnv (ue_home_unit_graph $ hsc_unit_env hsc_env)
     let ue' = (hsc_unit_env hsc_env){ ue_home_unit_graph = hug' }
     setSession $ discardIC hsc_env{hsc_unit_env = ue' }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2c6b73ea0ba01c209c82cb517e4f0f22ca6984fb...e54108f24510e90f9a054c0e92a1ab2fceae538d

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2c6b73ea0ba01c209c82cb517e4f0f22ca6984fb...e54108f24510e90f9a054c0e92a1ab2fceae538d
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250107/e914ddb6/attachment.html>


More information about the ghc-commits mailing list