[Git][ghc/ghc][wip/ghc-fat-interface] more cleanup

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ghc-fat-interface at Glasgow Haskell Compiler / GHC


Commits:
ec98d6df by Matthew Pickering at 2022-08-11T17:11:44+01:00
more cleanup

- - - - -


5 changed files:

- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Linker/Types.hs
- compiler/GHC/Unit/Module/Location.hs
- compiler/GHC/Unit/Module/ModIface.hs
- docs/users_guide/phases.rst


Changes:

=====================================
compiler/GHC/Iface/Syntax.hs
=====================================
@@ -2703,6 +2703,14 @@ instance (NFData b, NFData a) => NFData (IfaceBindingX a b) where
     IfaceNonRec bndr e -> rnf bndr `seq` rnf e
     IfaceRec binds -> rnf binds
 
+instance NFData IfaceTopBndrInfo where
+  rnf (IfGblTopBndr n) = n `seq` ()
+  rnf (IfLclTopBndr fs ty info dets) = rnf fs `seq` rnf ty `seq` rnf info `seq` rnf dets `seq` ()
+
+instance NFData IfaceMaybeRhs where
+  rnf IfUseUnfoldingRhs = ()
+  rnf (IfRhs ce) = rnf ce `seq` ()
+
 instance NFData IfaceLetBndr where
   rnf (IfLetBndr nm ty id_info join_info) =
     rnf nm `seq` rnf ty `seq` rnf id_info `seq` rnf join_info


=====================================
compiler/GHC/Linker/Types.hs
=====================================
@@ -212,7 +212,7 @@ nameOfObject_maybe (DotO fn)   = Just fn
 nameOfObject_maybe (DotA fn)   = Just fn
 nameOfObject_maybe (DotDLL fn) = Just fn
 nameOfObject_maybe (FI {})     = Nothing
-nameOfObject_maybe (LoadedBCOs{})     = Nothing
+nameOfObject_maybe (LoadedBCOs{}) = Nothing
 nameOfObject_maybe (BCOs {})   = Nothing
 
 -- | Retrieve the filename of the linkable if possible. Panic if it is a byte-code object


=====================================
compiler/GHC/Unit/Module/Location.hs
=====================================
@@ -65,7 +65,6 @@ data ModLocation
         ml_hie_file  :: FilePath
                 -- ^ Where the .hie file is, whether or not it exists
                 -- yet.
-
   } deriving Show
 
 instance Outputable ModLocation where


=====================================
compiler/GHC/Unit/Module/ModIface.hs
=====================================
@@ -552,9 +552,10 @@ instance (NFData (IfaceBackendExts (phase :: ModIfacePhase)), NFData (IfaceDeclE
   rnf (ModIface f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
                 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f23 f24) =
     rnf f1 `seq` rnf f2 `seq` f3 `seq` f4 `seq` f5 `seq` f6 `seq` rnf f7 `seq` f8 `seq`
-    f9 `seq` rnf f10 `seq` rnf f11 `seq` f12 `seq`  f13 `seq` rnf f14 `seq` rnf f15 `seq`
-    rnf f16 `seq` rnf f17 `seq` f18 `seq` rnf f19 `seq` f20 `seq` f21 `seq` f22 `seq` rnf f23
-    `seq` rnf f24 `seq` ()
+    f9 `seq` rnf f10 `seq` rnf f11 `seq` rnf f12 `seq` f13 `seq` rnf f14 `seq` rnf f15 `seq` rnf f16 `seq`
+    rnf f17 `seq` f18 `seq` rnf f19 `seq` rnf f20 `seq` f21 `seq` f22 `seq` f23 `seq` rnf f24
+    `seq` ()
+
 
 instance NFData (ModIfaceBackend) where
   rnf (ModIfaceBackend f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 f13)


=====================================
docs/users_guide/phases.rst
=====================================
@@ -1,4 +1,4 @@
-.etetched. _options-phases:
+.. _options-phases:
 
 Options related to a particular phase
 =====================================



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ec98d6df1737afa18f523a2ab7d693855ef858a4

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ec98d6df1737afa18f523a2ab7d693855ef858a4
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/20220811/22e521dc/attachment-0001.html>