diff options
Diffstat (limited to 'compiler/GHC/Driver')
| -rw-r--r-- | compiler/GHC/Driver/CodeOutput.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Main.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Driver/Make.hs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/GHC/Driver/CodeOutput.hs b/compiler/GHC/Driver/CodeOutput.hs index 0c77ffc477..c614606186 100644 --- a/compiler/GHC/Driver/CodeOutput.hs +++ b/compiler/GHC/Driver/CodeOutput.hs @@ -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" diff --git a/compiler/GHC/Driver/Main.hs b/compiler/GHC/Driver/Main.hs index ebc822aac5..95bad1e615 100644 --- a/compiler/GHC/Driver/Main.hs +++ b/compiler/GHC/Driver/Main.hs @@ -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 diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs index c34df2c589..7aceafdd0b 100644 --- a/compiler/GHC/Driver/Make.hs +++ b/compiler/GHC/Driver/Make.hs @@ -310,7 +310,7 @@ warnUnusedPackages = do pit = eps_PIT eps let loadedPackages - = map (unsafeGetUnitInfo dflags) + = map (unsafeLookupUnit dflags) . nub . sort . map moduleUnit . moduleEnvKeys |