[Git][ghc/ghc][wip/osa1/lfinfo] Tweaks

[Ömer Sinan Ağacan]

Ömer Sinan Ağacan pushed to branch wip/osa1/lfinfo at Glasgow Haskell Compiler / GHC


Commits:
2146ec46 by Ömer Sinan Ağacan at 2020-03-25T11:34:17+03:00
Tweaks

- - - - -


2 changed files:

- compiler/GHC/Driver/Main.hs
- compiler/GHC/StgToCmm.hs


Changes:

=====================================
compiler/GHC/Driver/Main.hs
=====================================
@@ -1586,7 +1586,7 @@ doCodeGen hsc_env this_mod data_tycons
         pipeline_stream =
           {-# SCC "cmmPipeline" #-}
           Stream.mapAccumL_ (cmmPipeline hsc_env) (emptySRT this_mod) ppr_stream1
-            <&> (first (srtMapNonCAFs . moduleSRTMap))
+            <&> first (srtMapNonCAFs . moduleSRTMap)
 
         dump2 a = do
           unless (null a) $


=====================================
compiler/GHC/StgToCmm.hs
=====================================
@@ -110,17 +110,15 @@ codeGen dflags this_mod data_tycons
 
         ; cg_id_infos <- cgs_binds <$> liftIO (readIORef cgref)
 
-        -- Only external names are actually visible to codeGen. So they are the
-        -- only ones we care about.
-        ; let extractInfo info = lf `seq` Just (name,lf)
+        ; let extractInfo info = (name, lf)
                 where
-                  id = cg_id info
+                  !id = cg_id info
                   !name = idName id
-                  lf = cg_lf info
+                  !lf = cg_lf info
 
-        ; let !generatedInfo = mkNameEnv (mapMaybe extractInfo (eltsUFM cg_id_infos))
+        ; let !generatedInfo = mkNameEnv (map extractInfo (eltsUFM cg_id_infos))
 
-        ; return $! generatedInfo
+        ; return generatedInfo
         }
 
 ---------------------------------------------------------------



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2146ec466bba818f4c339bc564442e3f53219c9c
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/20200325/31460854/attachment-0001.html>