some more update

Author: soulomoon

ghcide/src/Development/IDE/Core/Compile.hs

@@ -294,6 +294,7 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
                  mods_transitive_list =
                                          mapMaybe nodeKeyToInstalledModule $ Set.toList mods_transitive
 
+            -- todo: 9.12
            ; moduleLocs <- readIORef (fcModuleCache $ hsc_FC hsc_env)
            ; lbs <- getLinkables [toNormalizedFilePath' file
                                  | installedMod <- mods_transitive_list
@@ -430,7 +431,14 @@ mkHiFileResultNoCompile session tcm = do
   details <- makeSimpleDetails hsc_env_tmp tcGblEnv
   sf <- finalSafeMode (ms_hspp_opts ms) tcGblEnv
   iface' <- mkIfaceTc hsc_env_tmp sf details ms Nothing tcGblEnv
-  let iface = iface' { mi_globals = Nothing, mi_usages = filterUsages (mi_usages iface') } -- See Note [Clearing mi_globals after generating an iface]
+#if MIN_VERSION_ghc(9,11,0)
+  let iface = set_mi_top_env Nothing iface'
+  -- todo: 9.12, since usages are not expose anymore, we can't update mi_usages.
+#else
+  let iface = iface' {
+        mi_globals = Nothing
+        , mi_usages = filterUsages (mi_usages iface') } -- See Note [Clearing mi_globals after generating an iface]
+#endif
   pure $! mkHiFileResult ms iface details (tmrRuntimeModules tcm) Nothing
 
 mkHiFileResultCompile
@@ -462,7 +470,13 @@ mkHiFileResultCompile se session' tcm simplified_guts = catchErrs $ do
 #if MIN_VERSION_ghc(9,4,2)
                     Nothing
 #endif
-  let final_iface = final_iface' {mi_globals = Nothing, mi_usages = filterUsages (mi_usages final_iface')} -- See Note [Clearing mi_globals after generating an iface]
+  let final_iface = final_iface' {
+#if MIN_VERSION_ghc(9,11,0)
+    mi_top_env = Nothing
+#else
+    mi_globals = Nothing
+#endif
+    , mi_usages = filterUsages (mi_usages final_iface')} -- See Note [Clearing mi_globals after generating an iface]
 
   -- Write the core file now
   core_file <- do

ghcide/src/Development/IDE/GHC/Compat/Core.hs

@@ -68,6 +68,7 @@ module Development.IDE.GHC.Compat.Core (
     IfaceExport,
     IfaceTyCon(..),
     ModIface,
+    pattern GHC.ModIface,
     ModIface_(..),
     HscSource(..),
     WhereFrom(..),
@@ -365,6 +366,10 @@ module Development.IDE.GHC.Compat.Core (
     getKey,
     module GHC.Driver.Env.KnotVars,
     module GHC.Linker.Types,
+#if MIN_VERSION_ghc(9,11,0)
+    pattern LM,
+#endif
+
     module GHC.Types.Unique.Map,
     module GHC.Utils.TmpFs,
     module GHC.Unit.Finder.Types,
@@ -544,6 +549,7 @@ import           GHC.Utils.TmpFs
 import           Language.Haskell.Syntax     hiding (FunDep)
 #if MIN_VERSION_ghc(9,11,0)
 import           System.OsPath.Types (OsPath)
+import           System.OsPath (unsafeEncodeUtf)
 #endif
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
@@ -557,12 +563,13 @@ import           GHC.Types.Avail             (greNamePrintableName)
 import           GHC.Hs                      (SrcSpanAnn')
 #endif
 
-#if !MIN_VERSION_ghc(9,11,0)
 mkHomeModLocation :: DynFlags -> ModuleName -> FilePath -> IO Module.ModLocation
-#else
-mkHomeModLocation :: DynFlags -> ModuleName -> OsPath -> IO Module.ModLocation
+mkHomeModLocation df mn f = do
+#if MIN_VERSION_ghc(9,11,0)
+    f <- return $ unsafeEncodeUtf f
 #endif
-mkHomeModLocation df mn f = pure $ GHC.mkHomeModLocation (GHC.initFinderOpts df) mn f
+    pure $ GHC.mkHomeModLocation (GHC.initFinderOpts df) mn f
+
 
 pattern RealSrcSpan :: SrcLoc.RealSrcSpan -> Maybe BufSpan -> SrcLoc.SrcSpan
 
@@ -806,4 +813,7 @@ lookupGlobalRdrEnv gre_env occ = lookupGRE gre_env (LookupOccName occ AllRelevan
 
 #if MIN_VERSION_ghc(9,11,0)
 type Unlinked = LinkablePart
+pattern LM a b c = Linkable a b c
 #endif
+-- pattern LM :: Linkable -> [Linkable] -> [Linkable] -> Linkable
+

ghcide/src/Development/IDE/GHC/CoreFile.hs

@@ -25,7 +25,7 @@ import           GHC.Core
 import           GHC.CoreToIface
 import           GHC.Fingerprint
 #if MIN_VERSION_ghc(9,11,0)
-import qualified GHC.Iface.Load                        as Iface
+import qualified GHC.Iface.Load                  as Iface
 #endif
 import           GHC.Iface.Binary
 import           GHC.Iface.Env
@@ -91,7 +91,7 @@ readBinCoreFile name_cache fat_hi_path = do
 
 -- | Write a core file
 writeBinCoreFile :: DynFlags -> FilePath -> CoreFile -> IO Fingerprint
-writeBinCoreFile dflag core_path fat_iface = do
+writeBinCoreFile _dflag core_path fat_iface = do
     bh <- openBinMem initBinMemSize
 
     let quietTrace =
@@ -100,7 +100,7 @@ writeBinCoreFile dflag core_path fat_iface = do
 #if !MIN_VERSION_ghc(9,11,0)
     putWithUserData quietTrace bh fat_iface
 #else
-    putWithUserData quietTrace (Iface.flagsToIfCompression dflag) bh fat_iface
+    putWithUserData quietTrace (Iface.flagsToIfCompression _dflag) bh fat_iface
 #endif
 
     -- And send the result to the file

ghcide/src/Development/IDE/GHC/Orphans.hs

@@ -51,22 +51,35 @@ instance Show ModDetails where show = const "<moddetails>"
 instance NFData ModDetails where rnf = rwhnf
 instance NFData SafeHaskellMode where rnf = rwhnf
 instance Show Linkable where show = unpack . printOutputable
+#if MIN_VERSION_ghc(9,11,0)
+instance NFData LinkableObjectSort where rnf = rwhnf
+#else
 instance NFData Linkable where rnf (LM a b c) = rnf a `seq` rnf b `seq` rnf c
+#endif
 instance NFData Unlinked where
+#if MIN_VERSION_ghc(9,11,0)
+  rnf (DotO f l)         = rnf f `seq` rnf l
+  rnf (LazyBCOs a b)     = seqCompiledByteCode a `seq` liftRnf rwhnf b
+  rnf (BCOs a)           = seqCompiledByteCode a
+#else
   rnf (DotO f)           = rnf f
+  rnf (BCOs a b)         = seqCompiledByteCode a `seq` liftRnf rwhnf b
+  rnf (LoadedBCOs us)    = rnf us
+#endif
   rnf (DotA f)           = rnf f
   rnf (DotDLL f)         = rnf f
-  rnf (BCOs a b)         = seqCompiledByteCode a `seq` liftRnf rwhnf b
 #if MIN_VERSION_ghc(9,5,0)
   rnf (CoreBindings wcb) = rnf wcb
-  rnf (LoadedBCOs us)    = rnf us
-
-instance NFData WholeCoreBindings where
-  rnf (WholeCoreBindings bs m ml) = rnf bs `seq` rnf m `seq` rnf ml
-
 instance NFData ModLocation where
     rnf (ModLocation mf f1 f2 f3 f4 f5) = rnf mf `seq` rnf f1 `seq` rnf f2 `seq` rnf f3 `seq` rnf f4 `seq` rnf f5
+#endif
 
+#if MIN_VERSION_ghc(9,5,0) && !MIN_VERSION_ghc(9,11,0)
+instance NFData WholeCoreBindings where
+  rnf (WholeCoreBindings bs m ml) = rnf bs `seq` rnf m `seq` rnf ml
+#else
+instance NFData WholeCoreBindings where
+  rnf (WholeCoreBindings bs m ml wf) = rnf bs `seq` rnf m `seq` rnf ml `seq` rnf wf
 #endif
 
 instance Show PackageFlag where show = unpack . printOutputable

ghcide/src/Development/IDE/Import/FindImports.hs

@@ -26,6 +26,9 @@ import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
 import           GHC.Types.PkgQual
 import           GHC.Unit.State
+#if MIN_VERSION_ghc(9,11,0)
+import           GHC.Driver.DynFlags
+#endif
 import           System.FilePath
 
 
@@ -91,13 +94,19 @@ locateModuleFile import_dirss exts targetFor isSource modName = do
       | isSource = ext ++ "-boot"
       | otherwise = ext
 
+reexportedModulesFrom :: DynFlags -> S.Set ModuleName
+reexportedModulesFrom flag =
+#if MIN_VERSION_ghc(9,11,0)
+    S.fromList $ reexportFrom <$>
+#endif
+        reexportedModules flag
+
 -- | This function is used to map a package name to a set of import paths.
 -- It only returns Just for unit-ids which are possible to import into the
 -- current module. In particular, it will return Nothing for 'main' components
 -- as they can never be imported into another package.
 mkImportDirs :: HscEnv -> (UnitId, DynFlags) -> Maybe (UnitId, ([FilePath], S.Set ModuleName))
-mkImportDirs _env (i, flags) = Just (i, (importPaths flags, reexportedModules flags))
-
+mkImportDirs _env (i, flags) = Just (i, (importPaths flags, reexportedModulesFrom flags))
 -- | locate a module in either the file system or the package database. Where we go from *daml to
 -- Haskell
 locateModule
@@ -146,7 +155,7 @@ locateModule env comp_info exts targetFor modName mbPkgName isSource = do
       -- about which module unit a imports.
       -- Without multi-component support it is hard to recontruct the dependency environment so
       -- unit a will have both unit b and unit c in scope.
-      map (\uid -> let this_df = homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue) in (uid, importPaths this_df, reexportedModules this_df)) hpt_deps
+      map (\uid -> let this_df = homeUnitEnv_dflags (ue_findHomeUnitEnv uid ue) in (uid, importPaths this_df, reexportedModulesFrom this_df)) hpt_deps
     ue = hsc_unit_env env
     units = homeUnitEnv_units $ ue_findHomeUnitEnv (homeUnitId_ dflags) ue
     hpt_deps :: [UnitId]