[Git][ghc/ghc][wip/ghc-8.8-merges] 4 commits: base: Fix TBA in changelog

[Ben Gamari]

Ben Gamari pushed to branch wip/ghc-8.8-merges at Glasgow Haskell Compiler / GHC


Commits:
f78d6549 by Ben Gamari at 2019-06-16T13:13:05Z
base: Fix TBA in changelog

- - - - -
0911f653 by Ben Gamari at 2019-06-16T13:19:18Z
Bump array submodule

- - - - -
abf568dd by Ben Gamari at 2019-06-16T15:32:08Z
ErrUtils: Emit progress messages to eventlog

(cherry picked from commit 1bef62c38d3737b5f5d7ebbb479f3c1a12b1aa09)

- - - - -
048d4d22 by Ben Gamari at 2019-06-16T15:32:08Z
Emit GHC timing events to eventlog

(cherry picked from commit ebfa35284741fca47719f531f0996261441f75b0)

- - - - -


3 changed files:

- compiler/main/ErrUtils.hs
- libraries/array
- libraries/base/changelog.md


Changes:

=====================================
compiler/main/ErrUtils.hs
=====================================
@@ -80,6 +80,7 @@ import Data.IORef
 import Data.Maybe       ( fromMaybe )
 import Data.Ord
 import Data.Time
+import Debug.Trace
 import Control.Monad
 import Control.Monad.IO.Class
 import System.IO
@@ -598,9 +599,10 @@ fatalErrorMsg'' :: FatalMessager -> String -> IO ()
 fatalErrorMsg'' fm msg = fm msg
 
 compilationProgressMsg :: DynFlags -> String -> IO ()
-compilationProgressMsg dflags msg
-  = ifVerbose dflags 1 $
-    logOutput dflags (defaultUserStyle dflags) (text msg)
+compilationProgressMsg dflags msg = do
+    traceEventIO $ "GHC progress: " ++ msg
+    ifVerbose dflags 1 $
+        logOutput dflags (defaultUserStyle dflags) (text msg)
 
 showPass :: DynFlags -> String -> IO ()
 showPass dflags what
@@ -641,10 +643,12 @@ withTiming getDFlags what force_result action
        if verbosity dflags >= 2 || dopt Opt_D_dump_timings dflags
           then do liftIO $ logInfo dflags (defaultUserStyle dflags)
                          $ text "***" <+> what <> colon
+                  liftIO $ traceEventIO $ showSDocOneLine dflags $ text "GHC:started:" <+> what
                   alloc0 <- liftIO getAllocationCounter
                   start <- liftIO getCPUTime
                   !r <- action
                   () <- pure $ force_result r
+                  liftIO $ traceEventIO $ showSDocOneLine dflags $ text "GHC:finished:" <+> what
                   end <- liftIO getCPUTime
                   alloc1 <- liftIO getAllocationCounter
                   -- recall that allocation counter counts down


=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit 58a7ea0336363b29513164487190f6570b8ea834
+Subproject commit 2736c4f732bfb2ad1167f1820c92e12cea3c99d0


=====================================
libraries/base/changelog.md
=====================================
@@ -1,7 +1,7 @@
 # Changelog for [`base` package](http://hackage.haskell.org/package/base)
 
-## 4.13.0.0 *TBA*
-  * Bundled with GHC *TBA*
+## 4.13.0.0 *July 2019*
+  * Bundled with GHC 8.8.1
 
   * The final phase of the `MonadFail` proposal has been implemented:
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4c5899e65f1fe7053011a88af73b560a4b233e88...048d4d227dcf1af7019ae658dd71980b9f1406c1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/4c5899e65f1fe7053011a88af73b560a4b233e88...048d4d227dcf1af7019ae658dd71980b9f1406c1
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/20190616/325c00ea/attachment-0001.html>