Sync aggregated branch with rebased branch changes

Author: GHC GitLab CI

Makefile

@@ -105,6 +105,28 @@ package *
   executable-dynamic: False
   executable-static: False
 
+if os(wasi)
+  package *
+    shared: True
+  package rts
+    ghc-options: "-optc-DProjectVersion=\"913\""
+    ghc-options: "-optc-DRtsWay=\"v\""
+    ghc-options: "-optc-DHostPlatform=\"wasm32-wasi\""
+    ghc-options: "-optc-DHostArch=\"wasm32\""
+    ghc-options: "-optc-DHostOS=\"unknown\""
+    ghc-options: "-optc-DHostVendor=\"unknown\""
+    ghc-options: "-optc-DBuildPlatform=\"FIXME\""
+    ghc-options: "-optc-DBuildArch=\"FIXME\""
+    ghc-options: "-optc-DBuildOS=\"FIXME\""
+    ghc-options: "-optc-DBuildVendor=\"FIXME\""
+    ghc-options: "-optc-DGhcUnregisterised=\"FIXME\""
+    ghc-options: "-optc-DTablesNextToCode=\"FIXME\""
+    ghc-options: "-optc-DFS_NAMESPACE=rts"
+    ghc-options: "-optl-Wl,--export-dynamic"
+    ghc-options: "-optc-fvisibility=default"
+    ghc-options: "-optc-fvisibility-inlines-hidden"
+    flags: -tables-next-to-code
+
 -- Maybe we should fix this with some import
 if os(linux)
   package rts

cabal.project.stage3.javascript-unknown-ghcjs renamed to cabal.project.stage3

@@ -506,7 +506,7 @@ loopFixedModule key loc done = do
         -- part of the compiler.
         lookupIfaceByModuleHsc hsc_env (mnkToModule key) >>= \case
           Just iface -> return (M.Succeeded iface)
-          Nothing -> readIface (hsc_logger hsc_env) (hsc_dflags hsc_env) (hsc_NC hsc_env) (mnkToModule key) (ml_hi_file loc)
+          Nothing -> readIface (hsc_hooks hsc_env) (hsc_logger hsc_env) (hsc_dflags hsc_env) (hsc_NC hsc_env) (mnkToModule key) (ml_hi_file loc)
       case read_result of
         M.Succeeded iface -> do
           -- Computer information about this node

cabal.project.stage3.x86_64-unknown-linux-musl

@@ -1299,7 +1299,7 @@ hscDesugarAndSimplify summary (FrontendTypecheck tc_result) tc_warnings mb_old_h
           -- when compiling gHC_PRIM without generating code (e.g. with
           -- Haddock), we still want the virtual interface in the cache
           if ms_mod summary == gHC_PRIM
-            then return $ HscUpdate (getGhcPrimIface hsc_env)
+            then return $ HscUpdate (getGhcPrimIface (hsc_hooks hsc_env))
             else return $ HscUpdate iface
 
 
@@ -1314,7 +1314,7 @@ hscDesugarAndSimplify summary (FrontendTypecheck tc_result) tc_warnings mb_old_h
         -- when compiling gHC_PRIM without generating code (e.g. with
         -- Haddock), we still want the virtual interface in the cache
         if ms_mod summary == gHC_PRIM
-          then return $ HscUpdate (getGhcPrimIface hsc_env)
+          then return $ HscUpdate (getGhcPrimIface (hsc_hooks hsc_env))
           else return $ HscUpdate iface
 
 {-

compiler/GHC/Driver/Downsweep.hs

@@ -1603,7 +1603,7 @@ executeCompileNode k n !old_hmi hug mrehydrate_mods mni = do
     executeCompileNodeFixed hsc_env MakeEnv{diag_wrapper, env_messager} mod loc =
       wrapAction diag_wrapper hsc_env $ do
         forM_ env_messager $ \hscMessage -> hscMessage hsc_env (k, n) UpToDate (ModuleNode [] (ModuleNodeFixed mod loc))
-        read_result <- readIface (hsc_logger hsc_env) (hsc_dflags hsc_env) (hsc_NC hsc_env) (mnkToModule mod) (ml_hi_file loc)
+        read_result <- readIface (hsc_hooks hsc_env) (hsc_logger hsc_env) (hsc_dflags hsc_env) (hsc_NC hsc_env) (mnkToModule mod) (ml_hi_file loc)
         case read_result of
           M.Failed interface_err ->
             let mn = mnkModuleName mod

compiler/GHC/Driver/Main.hs

@@ -44,6 +44,7 @@ module GHC.Driver.Pipeline (
 
 
 import GHC.Prelude
+import GHC.Builtin.Names
 
 import GHC.Platform
 
@@ -823,10 +824,10 @@ hscGenBackendPipeline pipe_env hsc_env mod_sum result = do
         -- Add the object linkable to the potential bytecode linkable which was generated in HscBackend.
         return (mlinkable { homeMod_object = Just linkable })
 
-  -- when building ghc-internal with cabal-install, we still want the virtual
-  -- interface for gHC_PRIM in the cache
+  -- when building ghc-internal with --make (e.g. with cabal-install), we want
+  -- the virtual interface for gHC_PRIM in the cache, not the empty one.
   let miface_final
-        | ms_mod mod_sum == gHC_PRIM = getGhcPrimIface hsc_env
+        | ms_mod mod_sum == gHC_PRIM = getGhcPrimIface (hsc_hooks hsc_env)
         | otherwise                  = miface
   return (miface_final, final_linkable)