[Git][ghc/ghc][wip/22188] 2 commits: cleanup diff

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/22188 at Glasgow Haskell Compiler / GHC


Commits:
99228f2f by Matthew Pickering at 2025-02-27T11:22:43+00:00
cleanup diff

- - - - -
44dae535 by Matthew Pickering at 2025-02-27T12:28:15+00:00
Disable self recomp in release flavour

- - - - -


5 changed files:

- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Iface/Binary.hs
- docs/users_guide/using-warnings.rst
- hadrian/src/Flavour.hs
- hadrian/src/Settings/Flavours/Release.hs


Changes:

=====================================
compiler/GHC/Driver/Flags.hs
=====================================
@@ -1337,7 +1337,6 @@ standardWarnings -- see Note [Documenting warning flags]
         Opt_WarnDataKindsTC,
         Opt_WarnTypeEqualityOutOfScope,
         Opt_WarnViewPatternSignatures,
-        Opt_WarnTypeEqualityRequiresOperators,
         Opt_WarnReifyModuleMissingInfo
       ]
 


=====================================
compiler/GHC/Iface/Binary.hs
=====================================
@@ -50,7 +50,6 @@ import GHC.Types.Name.Cache
 import GHC.Types.SrcLoc
 import GHC.Platform
 import GHC.Settings.Constants
---import GHC.Utils.Fingerprint
 import GHC.Iface.Type (IfaceType(..), getIfaceType, putIfaceType, ifaceTypeSharedByte)
 
 import Control.Monad
@@ -175,7 +174,6 @@ readBinIface profile name_cache checkHiWay traceBinIface hi_path = do
     mod_iface <- getIfaceWithExtFields name_cache bh
 
     return $ mod_iface
---      & addSourceFingerprint src_hash
 
 
 getIfaceWithExtFields :: NameCache -> ReadBinHandle -> IO ModIface


=====================================
docs/users_guide/using-warnings.rst
=====================================
@@ -2398,7 +2398,6 @@ of ``-W(no-)*``.
     triggered whenever this happens, and can be addressed by enabling the
     extension.
 
-<<<<<<< HEAD
 .. ghc-flag:: -Wloopy-superclass-solve
     :shortdesc: *(deprecated)* warn when creating potentially-loopy superclass constraint evidence
     :type: dynamic
@@ -2597,7 +2596,6 @@ of ``-W(no-)*``.
 
     To make the code forwards-compatible and silence the warning, users are
     advised to add parentheses manually.
-=======
 .. ghc-flag:: -Wreify-module-missing-info
     :shortdesc: warn when `reifyModule`
     :type: dynamic
@@ -2612,7 +2610,6 @@ of ``-W(no-)*``.
     This flag warns the user when they try to call `reifyModule` on a module where this
     situation occurs so that they know the traversal has ended prematurely.
 
->>>>>>> d73b6b36c4b (Add flag to control whether self-recompilation information is written to interface)
 
 If you're feeling really paranoid, the :ghc-flag:`-dcore-lint` option is a good choice.
 It turns on heavyweight intra-pass sanity-checking within GHC. (It checks GHC's


=====================================
hadrian/src/Flavour.hs
=====================================
@@ -16,6 +16,7 @@ module Flavour
   , disableProfiledLibs
   , enableLinting
   , enableHaddock
+  , disableSelfRecompInfo
   , enableHiCore
   , useNativeBignum
   , enableTextWithSIMDUTF
@@ -67,6 +68,7 @@ flavourTransformers = M.fromList
     , "debug_stage1_ghc" =: debugGhc Stage1
     , "lint"             =: enableLinting
     , "haddock"          =: enableHaddock
+    , "no_self_recomp"   =: disableSelfRecompInfo
     , "hi_core"          =: enableHiCore
     , "late_ccs"         =: enableLateCCS
     , "boot_nonmoving_gc" =: enableBootNonmovingGc
@@ -208,6 +210,17 @@ enableHaddock =
       [ arg "-haddock"
       ]
 
+-- | Disable self recompilation information in interface files
+disableSelfRecompInfo :: Flavour -> Flavour
+disableSelfRecompInfo =
+    addArgs $ stage1 ? mconcat
+      [ builder (Ghc CompileHs) ? selfRecomp
+      ]
+  where
+    selfRecomp = mconcat
+      [ arg "-fno-write-self-recomp-info"
+      ]
+
 -- | Build stage2 dependencies with options to emit Core into
 -- interface files which is sufficient to restart code generation.
 enableHiCore :: Flavour -> Flavour


=====================================
hadrian/src/Settings/Flavours/Release.hs
=====================================
@@ -4,4 +4,8 @@ import Settings.Flavours.Performance
 import Flavour
 
 releaseFlavour :: Flavour
-releaseFlavour = enableHaddock performanceFlavour { name = "release" }
+releaseFlavour =
+  -- 1. These interface files will be distributed and the source files never recompiled.
+  disableSelfRecompInfo
+  -- 2. Include documentation in the interface for tools such as haddock and HLS to use
+  $ enableHaddock performanceFlavour { name = "release" }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2b89c2638a3fd8a01b0d01cb8455a24b6c9436c7...44dae5353ed1adff372f4257e537e66de9ee2208

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2b89c2638a3fd8a01b0d01cb8455a24b6c9436c7...44dae5353ed1adff372f4257e537e66de9ee2208
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250227/360ccf4d/attachment-0001.html>