Commit 8dc71f55 authored by Sylvain Henry's avatar Sylvain Henry Committed by Marge Bot

Rename unsafeGetUnitInfo into unsafeLookupUnit

parent 72d08610
......@@ -131,7 +131,7 @@ outputC dflags filenm cmm_stream packages
-- * -#include options from the cmdline and OPTIONS pragmas
-- * the _stub.h file, if there is one.
--
let rts = unsafeGetUnitInfo dflags rtsUnitId
let rts = unsafeLookupUnit dflags rtsUnitId
let cc_injects = unlines (map mk_include (unitIncludes rts))
mk_include h_file =
......@@ -223,7 +223,7 @@ outputForeignStubs dflags mod location stubs
-- we need the #includes from the rts package for the stub files
let rts_includes =
let rts_pkg = unsafeGetUnitInfo dflags rtsUnitId in
let rts_pkg = unsafeLookupUnit dflags rtsUnitId in
concatMap mk_include (unitIncludes rts_pkg)
mk_include i = "#include \"" ++ i ++ "\"\n"
......
......@@ -1192,7 +1192,7 @@ hscCheckSafe' m l = do
packageTrusted _ Sf_SafeInferred False _ = True
packageTrusted dflags _ _ m
| isHomeModule dflags m = True
| otherwise = unitIsTrusted $ unsafeGetUnitInfo dflags (moduleUnit m)
| otherwise = unitIsTrusted $ unsafeLookupUnit dflags (moduleUnit m)
lookup' :: Module -> Hsc (Maybe ModIface)
lookup' m = do
......
......@@ -310,7 +310,7 @@ warnUnusedPackages = do
pit = eps_PIT eps
let loadedPackages
= map (unsafeGetUnitInfo dflags)
= map (unsafeLookupUnit dflags)
. nub . sort
. map moduleUnit
. moduleEnvKeys
......
......@@ -55,7 +55,7 @@ mkExtraObj dflags extn xs
-- set of include directories and PIC flags.
cOpts = map Option (picCCOpts dflags)
++ map (FileOption "-I")
(unitIncludeDirs $ unsafeGetUnitInfo dflags rtsUnitId)
(unitIncludeDirs $ unsafeLookupUnit dflags rtsUnitId)
-- When compiling assembler code, we drop the usual C options, and if the
-- compiler is Clang, we add an extra argument to tell Clang to ignore
......
......@@ -25,7 +25,7 @@ module GHC.Unit.State (
lookupPackageName,
improveUnit,
searchPackageId,
unsafeGetUnitInfo,
unsafeLookupUnit,
getInstalledPackageDetails,
displayUnitId,
listVisibleModuleNames,
......@@ -424,11 +424,11 @@ extendUnitInfoMap (UnitInfoMap pkg_map closure) new_pkgs
-- | Looks up the package with the given id in the package state, panicing if it is
-- not found
unsafeGetUnitInfo :: HasDebugCallStack => DynFlags -> Unit -> UnitInfo
unsafeGetUnitInfo dflags pid =
unsafeLookupUnit :: HasDebugCallStack => DynFlags -> Unit -> UnitInfo
unsafeLookupUnit dflags pid =
case lookupUnit dflags pid of
Just config -> config
Nothing -> pprPanic "unsafeGetUnitInfo" (ppr pid)
Nothing -> pprPanic "unsafeLookupUnit" (ppr pid)
lookupInstalledPackage :: PackageState -> UnitId -> Maybe UnitInfo
lookupInstalledPackage pkgstate uid = lookupInstalledPackage' (unitInfoMap pkgstate) uid
......
......@@ -57,7 +57,7 @@ import GHC.Driver.Types ( tyThingParent_maybe, handleFlagWarnings, getSafeMode,
hsc_dynLinker, hsc_interp )
import GHC.Unit.Module
import GHC.Types.Name
import GHC.Unit.State ( unitIsTrusted, unsafeGetUnitInfo, getInstalledPackageDetails,
import GHC.Unit.State ( unitIsTrusted, unsafeLookupUnit, getInstalledPackageDetails,
listVisibleModuleNames, pprFlag )
import GHC.Iface.Syntax ( showToHeader )
import GHC.Core.Ppr.TyThing
......@@ -2360,7 +2360,7 @@ isSafeModule m = do
packageTrusted dflags md
| isHomeModule dflags md = True
| otherwise = unitIsTrusted $ unsafeGetUnitInfo dflags (moduleUnit md)
| otherwise = unitIsTrusted $ unsafeLookupUnit dflags (moduleUnit md)
tallyPkgs dflags deps | not (packageTrustOn dflags) = (S.empty, S.empty)
| otherwise = S.partition part deps
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment