Remove MIN_VERSION_ghc(9,5,0)

Author: dschrempf

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

@@ -888,11 +888,7 @@ newComponentCache recorder exts _cfp hsc_env old_cis new_cis = do
             ideErrorWithSource
                 (Just "cradle") (Just DiagnosticSeverity_Warning) _cfp
                 (T.pack (Compat.printWithoutUniques (singleMessage err)))
-#if MIN_VERSION_ghc(9,5,0)
                 (Just (fmap GhcDriverMessage err))
-#else
-                Nothing
-#endif
         multi_errs = map closure_err_to_multi_err closure_errs
         bad_units = OS.fromList $ concat $ do
             x <- map errMsgDiagnostic closure_errs

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

@@ -112,6 +112,8 @@ import           System.IO.Extra                        (fixIO,
 import qualified Data.Set                               as Set
 import qualified GHC                                    as G
 import qualified GHC.Runtime.Loader                as Loader
+import           GHC.Driver.Config.CoreToStg.Prep
+import           GHC.Core.Lint.Interactive
 import           GHC.Tc.Gen.Splice
 import           GHC.Types.Error
 import           GHC.Types.ForeignStubs
@@ -120,12 +122,6 @@ import           GHC.Types.TypeEnv
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
-
-#if MIN_VERSION_ghc(9,5,0)
-import           GHC.Core.Lint.Interactive
-import           GHC.Driver.Config.CoreToStg.Prep
-#endif
-
 #if MIN_VERSION_ghc(9,7,0)
 import           Data.Foldable                          (toList)
 import           GHC.Unit.Module.Warnings
@@ -470,9 +466,7 @@ mkHiFileResultCompile se session' tcm simplified_guts = catchErrs $ do
         pure (details, guts)
 
   let !partial_iface = force $ mkPartialIface session
-#if MIN_VERSION_ghc(9,5,0)
                                               (cg_binds guts)
-#endif
                                               details
                                               ms
 #if MIN_VERSION_ghc(9,11,0)
@@ -522,17 +516,9 @@ mkHiFileResultCompile se session' tcm simplified_guts = catchErrs $ do
           mod = ms_mod ms
           data_tycons = filter isDataTyCon tycons
       CgGuts{cg_binds = unprep_binds'} <- coreFileToCgGuts session final_iface details core
-
-#if MIN_VERSION_ghc(9,5,0)
       cp_cfg <- initCorePrepConfig session
-#endif
-
       let corePrep = corePrepPgm
-#if MIN_VERSION_ghc(9,5,0)
                        (hsc_logger session) cp_cfg (initCorePrepPgmConfig (hsc_dflags session) (interactiveInScope $ hsc_IC session))
-#else
-                       session
-#endif
                        mod (ms_location ms)
 
       -- Run corePrep first as we want to test the final version of the program that will
@@ -1167,11 +1153,7 @@ parseHeader
        => DynFlags -- ^ flags to use
        -> FilePath  -- ^ the filename (for source locations)
        -> Util.StringBuffer -- ^ Haskell module source text (full Unicode is supported)
-#if MIN_VERSION_ghc(9,5,0)
        -> ExceptT [FileDiagnostic] m ([FileDiagnostic], Located (HsModule GhcPs))
-#else
-       -> ExceptT [FileDiagnostic] m ([FileDiagnostic], Located HsModule)
-#endif
 parseHeader dflags filename contents = do
    let loc  = mkRealSrcLoc (Util.mkFastString filename) 1 1
    case unP Compat.parseHeader (initParserState (initParserOpts dflags) contents loc) of
@@ -1517,16 +1499,12 @@ coreFileToCgGuts session iface details core_file = do
       -- Implicit binds aren't saved, so we need to regenerate them ourselves.
   let _implicit_binds = concatMap getImplicitBinds tyCons -- only used if GHC < 9.6
       tyCons = typeEnvTyCons (md_types details)
-#if MIN_VERSION_ghc(9,5,0)
   -- In GHC 9.6, the implicit binds are tidied and part of core_binds
   pure $ CgGuts this_mod tyCons core_binds [] NoStubs [] mempty
 #if !MIN_VERSION_ghc(9,11,0)
                 (emptyHpcInfo False)
 #endif
                 Nothing []
-#else
-  pure $ CgGuts this_mod tyCons (_implicit_binds ++ core_binds) [] NoStubs [] mempty (emptyHpcInfo False) Nothing []
-#endif
 
 coreFileToLinkable :: LinkableType -> HscEnv -> ModSummary -> ModIface -> ModDetails -> CoreFile -> UTCTime -> IO ([FileDiagnostic], Maybe HomeModInfo)
 coreFileToLinkable linkableType session ms iface details core_file t = do

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

@@ -19,16 +19,10 @@ import           Development.IDE.GHC.Compat      as Compat
 import           Development.IDE.GHC.Compat.Util
 import           GHC
 import           GHC.Settings
+import qualified GHC.SysTools.Cpp                as Pipeline
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
-#if !MIN_VERSION_ghc(9,5,0)
-import qualified GHC.Driver.Pipeline.Execute     as Pipeline
-#endif
-
-#if MIN_VERSION_ghc(9,5,0)
-import qualified GHC.SysTools.Cpp                as Pipeline
-#endif
 
 #if MIN_VERSION_ghc(9,10,2)
 import qualified GHC.SysTools.Tasks              as Pipeline
@@ -49,24 +43,21 @@ addOptP f = alterToolSettings $ \s -> s
 
 doCpp :: HscEnv -> FilePath -> FilePath -> IO ()
 doCpp env input_fn output_fn =
-        -- See GHC commit a2f53ac8d968723417baadfab5be36a020ea6850
-        -- this function/Pipeline.doCpp previously had a raw parameter
-        -- always set to True that corresponded to these settings
-
-#if MIN_VERSION_ghc(9,5,0)
+    -- See GHC commit a2f53ac8d968723417baadfab5be36a020ea6850
+    -- this function/Pipeline.doCpp previously had a raw parameter
+    -- always set to True that corresponded to these settings
     let cpp_opts = Pipeline.CppOpts
                  { cppLinePragmas = True
+
 #if MIN_VERSION_ghc(9,10,2)
                  , sourceCodePreprocessor = Pipeline.SCPHsCpp
 #elif MIN_VERSION_ghc(9,10,0)
                  , useHsCpp = True
 #else
                  , cppUseCc = False
 #endif
+
                  } in
-#else
-    let cpp_opts = True in
-#endif
 
     Pipeline.doCpp (hsc_logger env) (hsc_tmpfs env) (hsc_dflags env) (hsc_unit_env env) cpp_opts input_fn output_fn
 

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

@@ -102,9 +102,7 @@ module Development.IDE.GHC.Compat(
     Dependencies(dep_direct_mods),
     NameCacheUpdater,
 
-#if MIN_VERSION_ghc(9,5,0)
     XModulePs(..),
-#endif
 
 #if !MIN_VERSION_ghc(9,7,0)
     liftZonkM,
@@ -167,8 +165,13 @@ import           GHC.Types.Var.Env
 
 import           GHC.Builtin.Uniques
 import           GHC.ByteCode.Types
+import           GHC.Core.Lint.Interactive               (interactiveInScope)
 import           GHC.CoreToStg
 import           GHC.Data.Maybe
+import           GHC.Driver.Config.Core.Lint.Interactive (lintInteractiveExpr)
+import           GHC.Driver.Config.Core.Opt.Simplify     (initSimplifyExprOpts)
+import           GHC.Driver.Config.CoreToStg             (initCoreToStgOpts)
+import           GHC.Driver.Config.CoreToStg.Prep        (initCorePrepConfig)
 import           GHC.Driver.Config.Stg.Pipeline
 import           GHC.Driver.Env                          as Env
 import           GHC.Iface.Env
@@ -188,18 +191,6 @@ import           GHC.Unit.Module.ModIface
 
 -- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
 
-#if !MIN_VERSION_ghc(9,5,0)
-import           GHC.Core.Lint                           (lintInteractiveExpr)
-#endif
-
-#if MIN_VERSION_ghc(9,5,0)
-import           GHC.Core.Lint.Interactive               (interactiveInScope)
-import           GHC.Driver.Config.Core.Lint.Interactive (lintInteractiveExpr)
-import           GHC.Driver.Config.Core.Opt.Simplify     (initSimplifyExprOpts)
-import           GHC.Driver.Config.CoreToStg             (initCoreToStgOpts)
-import           GHC.Driver.Config.CoreToStg.Prep        (initCorePrepConfig)
-#endif
-
 #if MIN_VERSION_ghc(9,7,0)
 import           GHC.Tc.Zonk.TcType                      (tcInitTidyEnv)
 #endif
@@ -230,11 +221,7 @@ myCoreToStgExpr logger dflags ictxt
        binding for the stg2stg step) -}
     let bco_tmp_id = mkSysLocal (fsLit "BCO_toplevel")
                                 (mkPseudoUniqueE 0)
-#if MIN_VERSION_ghc(9,5,0)
                                 ManyTy
-#else
-                                Many
-#endif
                                 (exprType prepd_expr)
     (stg_binds, prov_map, collected_ccs) <-
        myCoreToStg logger
@@ -258,11 +245,7 @@ myCoreToStg logger dflags ictxt
     let (stg_binds, denv, cost_centre_info)
          = {-# SCC "Core2Stg" #-}
            coreToStg
-#if MIN_VERSION_ghc(9,5,0)
              (initCoreToStgOpts dflags)
-#else
-             dflags
-#endif
              this_mod ml prepd_binds
 
 #if MIN_VERSION_ghc(9,8,0)
@@ -272,11 +255,7 @@ myCoreToStg logger dflags ictxt
 #endif
         <- {-# SCC "Stg2Stg" #-}
            stg2stg logger
-#if MIN_VERSION_ghc(9,5,0)
                    (interactiveInScope ictxt)
-#else
-                   ictxt
-#endif
                    (initStgPipelineOpts dflags for_bytecode) this_mod stg_binds
 
     return (stg_binds2, denv, cost_centre_info)
@@ -291,42 +270,21 @@ getDependentMods :: ModIface -> [ModuleName]
 getDependentMods = map (gwib_mod . snd) . S.toList . dep_direct_mods . mi_deps
 
 simplifyExpr :: DynFlags -> HscEnv -> CoreExpr -> IO CoreExpr
-#if MIN_VERSION_ghc(9,5,0)
 simplifyExpr _ env = GHC.simplifyExpr (Development.IDE.GHC.Compat.Env.hsc_logger env) (ue_eps (Development.IDE.GHC.Compat.Env.hsc_unit_env env)) (initSimplifyExprOpts (hsc_dflags env) (hsc_IC env))
-#else
-simplifyExpr _ = GHC.simplifyExpr
-#endif
 
 corePrepExpr :: DynFlags -> HscEnv -> CoreExpr -> IO CoreExpr
-#if MIN_VERSION_ghc(9,5,0)
 corePrepExpr _ env expr = do
   cfg <- initCorePrepConfig env
   GHC.corePrepExpr (Development.IDE.GHC.Compat.Env.hsc_logger env) cfg expr
-#else
-corePrepExpr _ = GHC.corePrepExpr
-#endif
 
 renderMessages :: PsMessages -> (Bag WarnMsg, Bag ErrMsg)
 renderMessages msgs =
-#if MIN_VERSION_ghc(9,5,0)
   let renderMsgs extractor = (fmap . fmap) GhcPsMessage . getMessages $ extractor msgs
   in (renderMsgs psWarnings, renderMsgs psErrors)
-#else
-  let renderMsgs extractor = (fmap . fmap) renderDiagnosticMessageWithHints . getMessages $ extractor msgs
-  in (renderMsgs psWarnings, renderMsgs psErrors)
-#endif
 
-#if MIN_VERSION_ghc(9,5,0)
 pattern PFailedWithErrorMessages :: forall a b. (b -> Bag (MsgEnvelope GhcMessage)) -> ParseResult a
-#else
-pattern PFailedWithErrorMessages :: forall a b. (b -> Bag (MsgEnvelope DecoratedSDoc)) -> ParseResult a
-#endif
 pattern PFailedWithErrorMessages msgs
-#if MIN_VERSION_ghc(9,5,0)
      <- PFailed (const . fmap (fmap GhcPsMessage) . getMessages . getPsErrorMessages -> msgs)
-#else
-     <- PFailed (const . fmap (fmap renderDiagnosticMessageWithHints) . getMessages . getPsErrorMessages -> msgs)
-#endif
 {-# COMPLETE POk, PFailedWithErrorMessages #-}
 
 hieExportNames :: HieFile -> [(SrcSpan, Name)]
@@ -508,14 +466,8 @@ loadModulesHome mod_infos e =
 
 recDotDot :: HsRecFields (GhcPass p) arg -> Maybe Int
 recDotDot x =
-#if MIN_VERSION_ghc(9,5,0)
             unRecFieldsDotDot <$>
-#endif
             unLoc <$> rec_dotdot x
 
-#if MIN_VERSION_ghc(9,5,0)
-extract_cons (NewTypeCon x) = [x]
+extract_cons (NewTypeCon x)      = [x]
 extract_cons (DataTypeCons _ xs) = xs
-#else
-extract_cons = id
-#endif

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

@@ -382,9 +382,6 @@ module Development.IDE.GHC.Compat.Core (
     emptyHomeModInfoLinkable,
     homeModInfoByteCode,
     homeModInfoObject,
-#if !MIN_VERSION_ghc(9,5,0)
-    field_label,
-#endif
     groupOrigin,
     isVisibleFunArg,
 #if MIN_VERSION_ghc(9,8,0)
@@ -739,11 +736,7 @@ makeSimpleDetails hsc_env =
 
 mkIfaceTc :: HscEnv -> GHC.SafeHaskellMode -> ModDetails -> ModSummary -> Maybe CoreProgram -> TcGblEnv -> IO ModIface
 mkIfaceTc hscEnv shm md _ms _mcp =
-#if MIN_VERSION_ghc(9,5,0)
   GHC.mkIfaceTc hscEnv shm md _ms _mcp -- mcp::Maybe CoreProgram is only used in GHC >= 9.6
-#else
-  GHC.mkIfaceTc hscEnv shm md _ms -- ms::ModSummary is only used in GHC >= 9.4
-#endif
 
 mkBootModDetailsTc :: HscEnv -> TcGblEnv -> IO ModDetails
 mkBootModDetailsTc session = GHC.mkBootModDetailsTc
@@ -757,39 +750,10 @@ initTidyOpts =
 driverNoStop :: StopPhase
 driverNoStop = NoStop
 
-
 groupOrigin :: MatchGroup GhcRn body -> Origin
-#if MIN_VERSION_ghc(9,5,0)
 mapLoc :: (a -> b) -> SrcLoc.GenLocated l a -> SrcLoc.GenLocated l b
 mapLoc = fmap
 groupOrigin = mg_ext
-#else
-mapLoc :: (a -> b) -> SrcLoc.GenLocated l a -> SrcLoc.GenLocated l b
-mapLoc = SrcLoc.mapLoc
-groupOrigin = mg_origin
-#endif
-
-
-#if !MIN_VERSION_ghc(9,5,0)
-mkCgInteractiveGuts :: CgGuts -> CgGuts
-mkCgInteractiveGuts = id
-
-emptyHomeModInfoLinkable :: Maybe Linkable
-emptyHomeModInfoLinkable = Nothing
-
-justBytecode :: Linkable -> Maybe Linkable
-justBytecode = Just
-
-justObjects :: Linkable -> Maybe Linkable
-justObjects = Just
-
-homeModInfoByteCode, homeModInfoObject :: HomeModInfo -> Maybe Linkable
-homeModInfoByteCode = hm_linkable
-homeModInfoObject = hm_linkable
-
-field_label :: a -> a
-field_label = id
-#endif
 
 mkSimpleTarget :: DynFlags -> FilePath -> Target
 mkSimpleTarget df fp = Target (TargetFile fp Nothing) True (homeUnitId_ df) Nothing

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

@@ -79,11 +79,7 @@ hsc_typecheck keep_rn mod_summary mb_rdr_module = do
             tc_result0 <- tcRnModule' mod_summary keep_rn' hpm
             if hsc_src == HsigFile
                 then
-#if MIN_VERSION_ghc(9,5,0)
                      do (iface, _) <- liftIO $ hscSimpleIface hsc_env Nothing tc_result0 mod_summary
-#else
-                     do (iface, _) <- liftIO $ hscSimpleIface hsc_env tc_result0 mod_summary
-#endif
                         ioMsgMaybe $ hoistTcRnMessage $
                             tcRnMergeSignatures hsc_env hpm tc_result0 iface
                 else return tc_result0
@@ -135,21 +131,12 @@ extract_renamed_stuff mod_summary tc_result = do
 -- ============================================================================
 -- DO NOT EDIT - Refer to top of file
 -- ============================================================================
-#if MIN_VERSION_ghc(9,5,0)
 hscSimpleIface :: HscEnv
                -> Maybe CoreProgram
                -> TcGblEnv
                -> ModSummary
                -> IO (ModIface, ModDetails)
 hscSimpleIface hsc_env mb_core_program tc_result summary
     = runHsc hsc_env $ hscSimpleIface' mb_core_program tc_result summary
-#else
-hscSimpleIface :: HscEnv
-               -> TcGblEnv
-               -> ModSummary
-               -> IO (ModIface, ModDetails)
-hscSimpleIface hsc_env tc_result summary
-    = runHsc hsc_env $ hscSimpleIface' tc_result summary
-#endif
 
 #endif

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

@@ -105,22 +105,14 @@ hscHomeUnit =
 setBytecodeLinkerOptions :: DynFlags -> DynFlags
 setBytecodeLinkerOptions df = df {
     ghcLink   = LinkInMemory
-#if MIN_VERSION_ghc(9,5,0)
   , backend = noBackend
-#else
-  , backend = NoBackend
-#endif
   , ghcMode = CompManager
     }
 
 setInterpreterLinkerOptions :: DynFlags -> DynFlags
 setInterpreterLinkerOptions df = df {
     ghcLink   = LinkInMemory
-#if MIN_VERSION_ghc(9,5,0)
    , backend = interpreterBackend
-#else
-  , backend = Interpreter
-#endif
   , ghcMode = CompManager
     }