Automatically remove macros for 9.2

Author: michaelpj

ghcide/session-loader/Development/IDE/Session.hs

@@ -40,8 +40,8 @@ import           Data.Function
 import           Data.Hashable                        hiding (hash)
 import qualified Data.HashMap.Strict                  as HM
 import           Data.List
+import           Data.List.NonEmpty                   (NonEmpty (..))
 import qualified Data.List.NonEmpty                   as NE
-import           Data.List.NonEmpty                   (NonEmpty(..))
 import qualified Data.Map.Strict                      as Map
 import           Data.Maybe
 import           Data.Proxy
@@ -826,7 +826,7 @@ newComponentCache recorder exts cradlePath cfp hsc_env uids ci = do
 #if MIN_VERSION_ghc(9,3,0)
       -- Set up a multi component session with the other units on GHC 9.4
         Compat.initUnits (map snd uids) (hscSetFlags df hsc_env)
-#elif MIN_VERSION_ghc(9,2,0)
+#else
       -- This initializes the units for GHC 9.2
       -- Add the options for the current component to the HscEnv
       -- We want to call `setSessionDynFlags` instead of `hscSetFlags`
@@ -837,9 +837,6 @@ newComponentCache recorder exts cradlePath cfp hsc_env uids ci = do
       evalGhcEnv hsc_env $ do
         _ <- setSessionDynFlags $ df
         getSession
-#else
-      -- getOptions is enough to initialize units on GHC <9.2
-      pure $ hscSetFlags df hsc_env { hsc_IC = (hsc_IC hsc_env) { ic_dflags = df } }
 #endif
 
     let newFunc = maybe newHscEnvEqPreserveImportPaths newHscEnvEq cradlePath

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

@@ -110,27 +110,17 @@ import           System.IO.Extra                   (fixIO, newTempFileWithin)
 
 import           GHC.Tc.Gen.Splice
 
-#if !MIN_VERSION_ghc(9,2,1)
-import           GHC.Driver.Types
-#endif
 
-#if !MIN_VERSION_ghc(9,2,0)
-import qualified Data.IntMap.Strict                as IntMap
-#endif
 
-#if MIN_VERSION_ghc(9,2,0)
 import qualified GHC                               as G
-#endif
 
-#if MIN_VERSION_ghc(9,2,0) && !MIN_VERSION_ghc(9,3,0)
+#if !MIN_VERSION_ghc(9,3,0)
 import           GHC                               (ModuleGraph)
 #endif
 
-#if MIN_VERSION_ghc(9,2,1)
 import           GHC.Types.ForeignStubs
 import           GHC.Types.HpcInfo
 import           GHC.Types.TypeEnv
-#endif
 
 #if !MIN_VERSION_ghc(9,3,0)
 import           Data.Map                          (Map)
@@ -265,7 +255,6 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
            ; lintInteractiveExpr "hscCompileExpr" hsc_env prepd_expr
 
 
-#if MIN_VERSION_ghc(9,2,0)
            ; let iNTERACTIVELoc = G.ModLocation{ ml_hs_file   = Nothing,
                                         ml_hi_file   = panic "hscCompileCoreExpr':ml_hi_file",
                                         ml_obj_file  = panic "hscCompileCoreExpr':ml_obj_file",
@@ -293,11 +282,6 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
                        (icInteractiveModule ictxt)
                        stg_expr
                        [] Nothing
-#else
-             {- Convert to BCOs -}
-           ; bcos <- coreExprToBCOs hsc_env
-                       (icInteractiveModule (hsc_IC hsc_env)) prepd_expr
-#endif
 
             -- Exclude wired-in names because we may not have read
             -- their interface files, so getLinkDeps will fail
@@ -312,11 +296,7 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
                                            moduleName mod -- On <= 9.2, just the name is enough because all unit ids will be the same
 #endif
 
-#if MIN_VERSION_ghc(9,2,0)
                                          | n <- concatMap (uniqDSetToList . bcoFreeNames) $ bc_bcos bcos
-#else
-                                         | n <- uniqDSetToList (bcoFreeNames bcos)
-#endif
                                          , Just mod <- [nameModule_maybe n] -- Names from other modules
                                          , not (isWiredInName n) -- Exclude wired-in names
                                          , moduleUnitId mod `elem` home_unit_ids -- Only care about stuff from the home package set
@@ -357,13 +337,10 @@ captureSplicesAndDeps TypecheckHelpers{..} env k = do
              {- load it -}
            ; (fv_hvs, lbss, pkgs) <- loadDecls (hscInterp hsc_env') hsc_env' srcspan bcos
            ; let hval = ((expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs), lbss, pkgs)
-#elif MIN_VERSION_ghc(9,2,0)
+#else
              {- load it -}
            ; fv_hvs <- loadDecls (hscInterp hsc_env') hsc_env' srcspan bcos
            ; let hval = (expectJust "hscCompileCoreExpr'" $ lookup (idName binding_id) fv_hvs)
-#else
-             {- link it -}
-           ; hval <- linkExpr hsc_env' srcspan bcos
 #endif
 
            ; modifyIORef' var (flip extendModuleEnvList [(mi_module $ hm_iface hm, linkableHash lb) | lb <- lbs, let hm = linkableHomeMod lb])
@@ -881,7 +858,7 @@ generateHieAsts hscEnv tcm =
   where
     dflags = hsc_dflags hscEnv
     run _ts = -- ts is only used in GHC 9.2
-#if MIN_VERSION_ghc(9,2,0) && !MIN_VERSION_ghc(9,3,0)
+#if !MIN_VERSION_ghc(9,3,0)
         fmap (join . snd) . liftIO . initDs hscEnv _ts
 #else
         id
@@ -1714,9 +1691,6 @@ getDocsBatch hsc_env _names = do
 #else
                                   Map.lookup name dmap ,
 #endif
-#if !MIN_VERSION_ghc(9,2,0)
-                                  IntMap.fromAscList $ Map.toAscList $
-#endif
 #if MIN_VERSION_ghc(9,3,0)
                                   lookupWithDefaultUniqMap amap mempty name))
 #else
@@ -1739,12 +1713,7 @@ lookupName :: HscEnv
 lookupName _ name
   | Nothing <- nameModule_maybe name = pure Nothing
 lookupName hsc_env name = exceptionHandle $ do
-#if MIN_VERSION_ghc(9,2,0)
   mb_thing <- liftIO $ lookupType hsc_env name
-#else
-  eps <- liftIO $ readIORef (hsc_EPS hsc_env)
-  let mb_thing = lookupType (hsc_dflags hsc_env) (hsc_HPT hsc_env) (eps_PTE eps) name
-#endif
   case mb_thing of
     x@(Just _) -> return x
     Nothing

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

@@ -697,12 +697,10 @@ dependencyInfoForFiles fs = do
       mg = mkModuleGraph mns
 #else
   let mg = mkModuleGraph $
-#if MIN_VERSION_ghc(9,2,0)
         -- We don't do any instantiation for backpack at this point of time, so it is OK to use
         -- 'extendModSummaryNoDeps'.
         -- This may have to change in the future.
           map extendModSummaryNoDeps $
-#endif
           (catMaybes mss)
 #endif
   pure (fingerprintToBS $ Util.fingerprintFingerprints $ map (maybe fingerprint0 msrFingerprint) msrs, processDependencyInformation rawDepInfo bm mg)
@@ -822,12 +820,10 @@ ghcSessionDepsDefinition fullModSummary GhcSessionDepsConfig{..} env file = do
                       nubOrdOn mkNodeKey (ModuleNode final_deps ms : concatMap mgModSummaries' mgs)
 #else
                 let module_graph_nodes =
-#if MIN_VERSION_ghc(9,2,0)
                       -- We don't do any instantiation for backpack at this point of time, so it is OK to use
                       -- 'extendModSummaryNoDeps'.
                       -- This may have to change in the future.
                       map extendModSummaryNoDeps $
-#endif
                       nubOrdOn ms_mod (ms : concatMap mgModSummaries mgs)
 #endif
                 liftIO $ evaluate $ liftRnf rwhnf module_graph_nodes
@@ -1219,12 +1215,7 @@ uses_th_qq (ms_hspp_opts -> dflags) =
 -- Depends on whether it uses unboxed tuples or sums
 computeLinkableTypeForDynFlags :: DynFlags -> LinkableType
 computeLinkableTypeForDynFlags d
-#if defined(GHC_PATCHED_UNBOXED_BYTECODE) || MIN_VERSION_ghc(9,2,0)
           = BCOLinkable
-#else
-          | _unboxed_tuples_or_sums = ObjectLinkable
-          | otherwise              = BCOLinkable
-#endif
   where -- unboxed_tuples_or_sums is only used in GHC < 9.2
         _unboxed_tuples_or_sums =
             xopt LangExt.UnboxedTuples d || xopt LangExt.UnboxedSums d

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

@@ -63,9 +63,5 @@ doCpp env input_fn output_fn =
     let cpp_opts = True in
 #endif
 
-#if MIN_VERSION_ghc(9,2,0)
     Pipeline.doCpp (hsc_logger env) (hsc_tmpfs env) (hsc_dflags env) (hsc_unit_env env) cpp_opts input_fn output_fn
-#else
-    Pipeline.doCpp (hsc_dflags env) cpp_opts input_fn output_fn
-#endif
 

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

@@ -31,13 +31,11 @@ module Development.IDE.GHC.Compat(
     pattern PFailedWithErrorMessages,
     isObjectLinkable,
 
-#if MIN_VERSION_ghc(9,2,0)
 #if !MIN_VERSION_ghc(9,3,0)
     extendModSummaryNoDeps,
     emsModSummary,
 #endif
     myCoreToStgExpr,
-#endif
 
     Usage(..),
 
@@ -123,17 +121,12 @@ module Development.IDE.GHC.Compat(
     emptyInScopeSet,
     Unfolding(..),
     noUnfolding,
-#if MIN_VERSION_ghc(9,2,0)
     loadExpr,
     byteCodeGen,
     bc_bcos,
     loadDecls,
     hscInterp,
     expectJust,
-#else
-    coreExprToBCOs,
-    linkExpr,
-#endif
     extract_cons,
     recDotDot,
 #if MIN_VERSION_ghc(9,5,0)
@@ -194,22 +187,12 @@ import           GHC.Iface.Make                        (mkIfaceExports)
 import qualified GHC.SysTools.Tasks                    as SysTools
 import qualified GHC.Types.Avail                       as Avail
 
-#if !MIN_VERSION_ghc(9,2,0)
-import           GHC.Utils.Error
-import           GHC.CoreToByteCode                    (coreExprToBCOs)
-import           GHC.Runtime.Linker                    (linkExpr)
-import           GHC.Driver.Types
-#endif
 
 #if !MIN_VERSION_ghc(9,5,0)
 import           GHC.Core.Lint                         (lintInteractiveExpr)
 #endif
 
-#if !MIN_VERSION_ghc(9,2,0)
-import           Data.Bifunctor
-#endif
 
-#if MIN_VERSION_ghc(9,2,0)
 import           GHC.Iface.Env
 import qualified GHC.Types.SrcLoc                      as SrcLoc
 import           GHC.Linker.Loader                     (loadExpr)
@@ -228,9 +211,8 @@ import           GHC.Stg.Syntax
 import           GHC.StgToByteCode
 import           GHC.Types.CostCentre
 import           GHC.Types.IPE
-#endif            
 
-#if MIN_VERSION_ghc(9,2,0) && !MIN_VERSION_ghc(9,3,0)
+#if !MIN_VERSION_ghc(9,3,0)
 import           GHC.Unit.Module.Deps (Dependencies(dep_mods), Usage(..))
 import           GHC.Linker.Types                      (isObjectLinkable)
 import           GHC.Unit.Module.ModSummary
@@ -276,7 +258,6 @@ nameEnvElts :: NameEnv a -> [a]
 nameEnvElts = nonDetNameEnvElts
 #endif
 
-#if MIN_VERSION_ghc(9,2,0)
 myCoreToStgExpr :: Logger -> DynFlags -> InteractiveContext
 #if MIN_VERSION_ghc(9,3,0)
             -> Bool
@@ -365,16 +346,8 @@ myCoreToStg logger dflags ictxt
 #endif
 
     return (stg_binds2, denv, cost_centre_info)
-#endif
 
 
-#if !MIN_VERSION_ghc(9,2,0)
-reLoc :: Located a -> Located a
-reLoc = id
-
-reLocA :: Located a -> Located a
-reLocA = id
-#endif
 
 getDependentMods :: ModIface -> [ModuleName]
 #if MIN_VERSION_ghc(9,3,0)
@@ -408,19 +381,13 @@ renderMessages msgs =
   msgs
 #endif
 
-#if MIN_VERSION_ghc(9,2,0)
 pattern PFailedWithErrorMessages :: forall a b. (b -> Bag (MsgEnvelope DecoratedSDoc)) -> ParseResult a
 pattern PFailedWithErrorMessages msgs
 #if MIN_VERSION_ghc(9,3,0)
      <- PFailed (const . fmap (fmap renderDiagnosticMessageWithHints) . getMessages . getPsErrorMessages -> msgs)
 #else
      <- PFailed (const . fmap pprError . getErrorMessages -> msgs)
 #endif
-#else
-pattern PFailedWithErrorMessages :: (DynFlags -> ErrorMessages) -> ParseResult a
-pattern PFailedWithErrorMessages msgs
-     <- PFailed (getErrorMessages -> msgs)
-#endif
 {-# COMPLETE POk, PFailedWithErrorMessages #-}
 
 hieExportNames :: HieFile -> [(SrcSpan, Name)]
@@ -578,19 +545,11 @@ ghcVersion = GHC810
 
 runUnlit :: Logger -> DynFlags -> [Option] -> IO ()
 runUnlit =
-#if MIN_VERSION_ghc(9,2,0)
     SysTools.runUnlit
-#else
-    const SysTools.runUnlit
-#endif
 
 runPp :: Logger -> DynFlags -> [Option] -> IO ()
 runPp =
-#if MIN_VERSION_ghc(9,2,0)
     SysTools.runPp
-#else
-    const SysTools.runPp
-#endif
 
 simpleNodeInfoCompat :: FastStringCompat -> FastStringCompat -> NodeInfo a
 simpleNodeInfoCompat ctor typ = simpleNodeInfo (coerce ctor) (coerce typ)
@@ -599,42 +558,19 @@ isAnnotationInNodeInfo :: (FastStringCompat, FastStringCompat) -> NodeInfo a ->
 isAnnotationInNodeInfo p = S.member p . nodeAnnotations
 
 nodeAnnotations :: NodeInfo a -> S.Set (FastStringCompat, FastStringCompat)
-#if MIN_VERSION_ghc(9,2,0)
 nodeAnnotations = S.map (\(NodeAnnotation ctor typ) -> (coerce ctor, coerce typ)) . GHC.nodeAnnotations
-#else
-nodeAnnotations = S.map (bimap coerce coerce) . GHC.nodeAnnotations
-#endif
 
-#if MIN_VERSION_ghc(9,2,0)
 newtype FastStringCompat = FastStringCompat LexicalFastString
-#else
-newtype FastStringCompat = FastStringCompat FastString
-#endif
     deriving (Show, Eq, Ord)
 
 instance IsString FastStringCompat where
-#if MIN_VERSION_ghc(9,2,0)
     fromString = FastStringCompat . LexicalFastString . fromString
-#else
-    fromString = FastStringCompat . fromString
-#endif
 
 mkAstNode :: NodeInfo a -> Span -> [HieAST a] -> HieAST a
 mkAstNode n = Node (SourcedNodeInfo $ Map.singleton GeneratedInfo n)
 
 combineRealSrcSpans :: RealSrcSpan -> RealSrcSpan -> RealSrcSpan
-#if MIN_VERSION_ghc(9,2,0)
 combineRealSrcSpans = SrcLoc.combineRealSrcSpans
-#else
-combineRealSrcSpans span1 span2
-  = mkRealSrcSpan (mkRealSrcLoc file line_start col_start) (mkRealSrcLoc file line_end col_end)
-  where
-    (line_start, col_start) = min (srcSpanStartLine span1, srcSpanStartCol span1)
-                                  (srcSpanStartLine span2, srcSpanStartCol span2)
-    (line_end, col_end)     = max (srcSpanEndLine span1, srcSpanEndCol span1)
-                                  (srcSpanEndLine span2, srcSpanEndCol span2)
-    file = srcSpanFile span1
-#endif
 
 -- | Load modules, quickly. Input doesn't need to be desugared.
 -- A module must be loaded before dependent modules can be typechecked.