[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 3 commits: Unbreak Haddock comments in `GHC.Core.Opt.WorkWrap.Utils`.

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
30c0010e by M Farkas-Dyck at 2022-08-23T20:46:41-04:00
Unbreak Haddock comments in `GHC.Core.Opt.WorkWrap.Utils`.

Closes #22092.

- - - - -
197c0318 by Cheng Shao at 2022-08-23T20:46:43-04:00
driver: don't actually merge objects when ar -L works

- - - - -
41ff6a6f by Ben Gamari at 2022-08-23T20:46:43-04:00
rts: Consistently use MiB in stats output

Previously we would say `MB` even where we
meant `MiB`.
- - - - -


3 changed files:

- compiler/GHC/Core/Opt/WorkWrap/Utils.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- rts/Stats.c


Changes:

=====================================
compiler/GHC/Core/Opt/WorkWrap/Utils.hs
=====================================
@@ -136,19 +136,18 @@ the unusable strictness-info into the interfaces.
 
 data WwOpts
   = MkWwOpts
-  -- | Environment of type/data family instances
-  { wo_fam_envs          :: !FamInstEnvs
-  -- | Options for the "Simple optimiser"
-  , wo_simple_opts       :: !SimpleOpts
-  -- | Whether to enable "Constructed Product Result" analysis.
-  -- (Originally from DOI: 10.1017/S0956796803004751)
-  , wo_cpr_anal          :: !Bool
-  -- | Used for absent argument error message
-  , wo_module            :: !Module
-  -- | Generate workers even if the only effect is some args get passed
-  -- unlifted. See Note [WW for calling convention]
-  , wo_unlift_strict     :: !Bool
-  }
+  { -- | Environment of type/data family instances
+    wo_fam_envs          :: !FamInstEnvs
+  , -- | Options for the "Simple optimiser"
+    wo_simple_opts       :: !SimpleOpts
+  , -- | Whether to enable "Constructed Product Result" analysis.
+    -- (Originally from DOI: 10.1017/S0956796803004751)
+    wo_cpr_anal          :: !Bool
+  , -- | Used for absent argument error message
+    wo_module            :: !Module
+  , -- | Generate workers even if the only effect is some args get passed
+    -- unlifted. See Note [WW for calling convention]
+    wo_unlift_strict     :: !Bool }
 
 type WwResult
   = ([Demand],              -- Demands for worker (value) args


=====================================
compiler/GHC/Driver/Pipeline/Execute.hs
=====================================
@@ -1180,7 +1180,7 @@ via gcc.
 -- | See Note [Object merging].
 joinObjectFiles :: HscEnv -> [FilePath] -> FilePath -> IO ()
 joinObjectFiles hsc_env o_files output_fn
-  | can_merge_objs = do
+  | can_merge_objs && not dashLSupported = do
   let toolSettings' = toolSettings dflags
       ldIsGnuLd = toolSettings_ldIsGnuLd toolSettings'
       ld_r args = GHC.SysTools.runMergeObjects (hsc_logger hsc_env) (hsc_tmpfs hsc_env) (hsc_dflags hsc_env) (


=====================================
rts/Stats.c
=====================================
@@ -839,7 +839,7 @@ static void report_summary(const RTSSummaryStats* sum)
     statsPrintf("%16s bytes maximum slop\n", temp);
 
     statsPrintf("%16" FMT_Word64 " MiB total memory in use (%"
-                FMT_Word64 " MB lost due to fragmentation)\n\n",
+                FMT_Word64 " MiB lost due to fragmentation)\n\n",
                 stats.max_mem_in_use_bytes  / (1024 * 1024),
                 sum->fragmentation_bytes / (1024 * 1024));
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3172c7b0807a8a27b54ac4ff139e1b69d68609cf...41ff6a6f1c9d8b8d23b81a1d3e3a8c195505fb53

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3172c7b0807a8a27b54ac4ff139e1b69d68609cf...41ff6a6f1c9d8b8d23b81a1d3e3a8c195505fb53
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/20220823/6ddd7bbf/attachment-0001.html>