diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2021-08-06 18:35:06 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-11-20 05:35:42 -0500 |
| commit | bdeea37efc76bc22a0d2e17f66dbf2ae8ad556fc (patch) | |
| tree | ed1e62d7f2d34e4c77ff650828de872fb8daeb7a /compiler/GHC.hs | |
| parent | 3d6b78dbd19f9061387c60e553638f9c26839d50 (diff) | |
| download | haskell-bdeea37efc76bc22a0d2e17f66dbf2ae8ad556fc.tar.gz | |
More support for optional home-unit
This is a preliminary refactoring for #14335 (supporting plugins in
cross-compilers). In many places the home-unit must be optional because
there won't be one available in the plugin environment (we won't be
compiling anything in this environment). Hence we replace "HomeUnit"
with "Maybe HomeUnit" in a few places and we avoid the use of
"hsc_home_unit" (which is partial) in some few others.
Diffstat (limited to 'compiler/GHC.hs')
| -rw-r--r-- | compiler/GHC.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs index 5458f264e4..a8e02e60c0 100644 --- a/compiler/GHC.hs +++ b/compiler/GHC.hs @@ -1643,25 +1643,25 @@ findModule mod_name maybe_pkg = do findQualifiedModule :: GhcMonad m => PkgQual -> ModuleName -> m Module findQualifiedModule pkgqual mod_name = withSession $ \hsc_env -> do - let fc = hsc_FC hsc_env - let home_unit = hsc_home_unit hsc_env - let units = hsc_units hsc_env - let dflags = hsc_dflags hsc_env - let fopts = initFinderOpts dflags + let fc = hsc_FC hsc_env + let mhome_unit = ue_home_unit (hsc_unit_env hsc_env) + let units = hsc_units hsc_env + let dflags = hsc_dflags hsc_env + let fopts = initFinderOpts dflags case pkgqual of ThisPkg _ -> do home <- lookupLoadedHomeModule mod_name case home of Just m -> return m Nothing -> liftIO $ do - res <- findImportedModule fc fopts units home_unit mod_name pkgqual + res <- findImportedModule fc fopts units mhome_unit mod_name pkgqual case res of - Found loc m | not (isHomeModule home_unit m) -> return m + Found loc m | notHomeModuleMaybe mhome_unit m -> return m | otherwise -> modNotLoadedError dflags m loc err -> throwOneError $ noModError hsc_env noSrcSpan mod_name err _ -> liftIO $ do - res <- findImportedModule fc fopts units home_unit mod_name pkgqual + res <- findImportedModule fc fopts units mhome_unit mod_name pkgqual case res of Found _ m -> return m err -> throwOneError $ noModError hsc_env noSrcSpan mod_name err |