From e7272d53e67e72580caceae40e766c4bfeb1c398 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Tue, 12 May 2020 11:40:03 +0200 Subject: Enhance UnitId use * use UnitId instead of String to identify wired-in units * use UnitId instead of Unit in the backend (Unit are only use by Backpack to produce type-checked interfaces, not real code) * rename lookup functions for consistency * documentation --- compiler/GHC/Runtime/Linker.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/GHC/Runtime') diff --git a/compiler/GHC/Runtime/Linker.hs b/compiler/GHC/Runtime/Linker.hs index 22cd871fad..e45fce9bcc 100644 --- a/compiler/GHC/Runtime/Linker.hs +++ b/compiler/GHC/Runtime/Linker.hs @@ -143,7 +143,7 @@ emptyPLS = PersistentLinkerState -- -- The linker's symbol table is populated with RTS symbols using an -- explicit list. See rts/Linker.c for details. - where init_pkgs = map toUnitId [rtsUnitId] + where init_pkgs = [rtsUnitId] extendLoadedPkgs :: DynLinker -> [UnitId] -> IO () extendLoadedPkgs dl pkgs = @@ -1261,7 +1261,7 @@ linkPackages' hsc_env new_pks pls = do | new_pkg `elem` pkgs -- Already linked = return pkgs - | Just pkg_cfg <- lookupInstalledPackage pkgstate new_pkg + | Just pkg_cfg <- lookupUnitId pkgstate new_pkg = do { -- Link dependents first pkgs' <- link pkgs (unitDepends pkg_cfg) -- Now link the package itself -- cgit v1.2.1