Conditionalize the ghc-internal dependency on the ghc version.

Author: angerman

libraries/ghci/GHCi/CreateBCO.hs

@@ -6,10 +6,10 @@
 {-# LANGUAGE UnboxedTuples #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE CPP #-}
+-- Only needed when we don't have ghc-internal (and must import deprecated names)
+#ifndef HAVE_GHC_INTERNAL
 {-# OPTIONS_GHC -Wno-warnings-deprecations #-}
--- TODO We want to import GHC.Internal.Base (BCO, mkApUpd0#, newBCO#) instead
--- of from GHC.Exts when we can require of the bootstrap compiler to have
--- ghc-internal.
+#endif
 
 --
 --  (c) The University of Glasgow 2002-2006
@@ -30,7 +30,13 @@ import Data.Array.Base
 import Foreign hiding (newArray)
 import Unsafe.Coerce (unsafeCoerce)
 import GHC.Arr          ( Array(..) )
+-- When ghc-internal is available prefer the non-deprecated exports.
+#ifdef HAVE_GHC_INTERNAL
+import GHC.Exts hiding ( BCO, mkApUpd0#, newBCO# )
+import GHC.Internal.Base ( BCO, mkApUpd0#, newBCO# )
+#else
 import GHC.Exts
+#endif
 import GHC.IO
 import Control.Exception ( ErrorCall(..) )
 

libraries/ghci/GHCi/TH.hs

@@ -1,9 +1,11 @@
 {-# LANGUAGE ScopedTypeVariables, StandaloneDeriving, DeriveGeneric,
     TupleSections, RecordWildCards, InstanceSigs, CPP #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
+-- Suppress deprecation warnings only when we must import deprecated symbols
+-- (i.e. when ghc-internal isn't available yet).
+#ifndef HAVE_GHC_INTERNAL
 {-# OPTIONS_GHC -Wno-warnings-deprecations #-}
--- TODO We want to import GHC.Internal.Desugar instead of GHC.Desugar when we
--- can require of the bootstrap compiler to have ghc-internal.
+#endif
 
 -- |
 -- Running TH splices
@@ -112,7 +114,12 @@ import Data.IORef
 import Data.Map (Map)
 import qualified Data.Map as M
 import Data.Maybe
+-- Prefer the non-deprecated internal path when available.
+#ifdef HAVE_GHC_INTERNAL
+import GHC.Internal.Desugar (AnnotationWrapper(..))
+#else
 import GHC.Desugar (AnnotationWrapper(..))
+#endif
 import qualified GHC.Boot.TH.Syntax as TH
 import Unsafe.Coerce
 

libraries/ghci/ghci.cabal.in

@@ -86,11 +86,6 @@ library
         rts,
         array            == 0.5.*,
         base             >= 4.8 && < 4.23,
-        -- ghc-internal     == @ProjectVersionForLib@.*
-        -- TODO: Use GHC.Internal.Desugar and GHC.Internal.Base from
-        -- ghc-internal instead of ignoring the deprecation warning in GHCi.TH
-        -- and GHCi.CreateBCO when we require ghc-internal of the bootstrap
-        -- compiler
         ghc-prim         >= 0.5.0 && < 0.14,
         binary           == 0.8.*,
         bytestring       >= 0.10 && < 0.13,
@@ -101,6 +96,19 @@ library
         ghc-heap         == @ProjectVersionMunged@,
         transformers     >= 0.5 && < 0.7
 
+    if impl(ghc > 9.10)
+        -- ghc-internal is only available (and required) when building
+        -- with a compiler that itself provides the ghc-internal
+        -- library.  Older bootstrap compilers (<= 9.10) don't ship it,
+        -- so we must not depend on it in that case.
+        --
+        -- When available we depend on the in-tree version (matching
+        -- @ProjectVersionForLib@) and define HAVE_GHC_INTERNAL so that
+        -- sources can import the non-deprecated modules from
+        -- GHC.Internal.* instead of the legacy (deprecated) locations.
+        Build-Depends: ghc-internal == @ProjectVersionForLib@.*
+        CPP-Options: -DHAVE_GHC_INTERNAL
+
     if flag(bootstrap)
       build-depends:
             ghc-boot-th-next  == @ProjectVersionMunged@