Add HomeUnit type

Since Backpack the "home unit" is much more involved than what it was
before (just an identifier obtained with `-this-unit-id`). Now it is
used in conjunction with `-component-id` and `-instantiated-with` to
configure module instantiations and to detect if we are type-checking an
indefinite unit or compiling a definite one.

This patch introduces a new HomeUnit datatype which is much easier to
understand. Moreover to make GHC support several packages in the same
instances, we will need to handle several HomeUnits so having a
dedicated (documented) type is helpful.

Finally in #14335 we will also need to handle the case where we have no
HomeUnit at all because we are only loading existing interfaces for
plugins which live in a different space compared to units used to
produce target code. Several functions will have to be refactored to
accept "Maybe HomeUnit" parameters instead of implicitly querying the
HomeUnit fields in DynFlags. Having a dedicated type will make this
easier.

Bump haddock submodule

1 files changed, 17 insertions, 4 deletions

diff --git a/compiler/GHC/SysTools.hs b/compiler/GHC/SysTools.hs
index e309b839f7..f3b4f4cc87 100644
--- a/compiler/GHC/SysTools.hs
+++ b/compiler/GHC/SysTools.hs
@@ -45,6 +45,7 @@ import GHC.Settings.Utils
 import GHC.Unit
 import GHC.Utils.Error
 import GHC.Utils.Panic
+import GHC.Utils.Outputable
 import GHC.Platform
 import GHC.Driver.Session
 import GHC.Platform.Ways
@@ -246,9 +247,13 @@ linkDynLib dflags0 o_files dep_packages
         verbFlags = getVerbFlags dflags
         o_file = outputFile dflags
 
-    pkgs <- getPreloadUnitsAnd dflags dep_packages
+    pkgs <- getPreloadUnitsAnd
+               (initSDocContext dflags defaultUserStyle)
+               (unitState dflags)
+               (mkHomeUnitFromFlags dflags)
+               dep_packages
 
-    let pkg_lib_paths = collectLibraryPaths dflags pkgs
+    let pkg_lib_paths = collectLibraryPaths (ways dflags) pkgs
     let pkg_lib_path_opts = concatMap get_pkg_lib_path_opts pkg_lib_paths
         get_pkg_lib_path_opts l
          | ( osElfTarget (platformOS (targetPlatform dflags)) ||
@@ -426,11 +431,19 @@ getUnitFrameworkOpts :: DynFlags -> Platform -> [UnitId] -> IO [String]
 getUnitFrameworkOpts dflags platform dep_packages
   | platformUsesFrameworks platform = do
     pkg_framework_path_opts <- do
-        pkg_framework_paths <- getUnitFrameworkPath dflags dep_packages
+        pkg_framework_paths <- getUnitFrameworkPath
+                                 (initSDocContext dflags defaultUserStyle)
+                                 (unitState dflags)
+                                 (mkHomeUnitFromFlags dflags)
+                                 dep_packages
         return $ map ("-F" ++) pkg_framework_paths
 
     pkg_framework_opts <- do
-        pkg_frameworks <- getUnitFrameworks dflags dep_packages
+        pkg_frameworks <- getUnitFrameworks
+                              (initSDocContext dflags defaultUserStyle)
+                              (unitState dflags)
+                              (mkHomeUnitFromFlags dflags)
+                              dep_packages
         return $ concat [ ["-framework", fw] | fw <- pkg_frameworks ]
 
     return (pkg_framework_path_opts ++ pkg_framework_opts)