[Git][ghc/ghc][wip/T17949] Revert "T17949 double check traceEvent and traceMarker"

[Daneel S. Yaitskov]

Daneel S. Yaitskov pushed to branch wip/T17949 at Glasgow Haskell Compiler / GHC


Commits:
1e75dc7d by Daneel Yaitskov at 2020-06-05T19:01:11-07:00
Revert "T17949 double check traceEvent and traceMarker"

This reverts commit 562f75c0ac60145574e31dc141de555b6ee6f100.

- - - - -


1 changed file:

- libraries/base/Debug/Trace.hs


Changes:

=====================================
libraries/base/Debug/Trace.hs
=====================================
@@ -266,14 +266,9 @@ traceStack str expr = unsafePerformIO $ do
 --
 -- @since 4.5.0.0
 traceEvent :: String -> a -> a
-traceEvent msg expr =
-    if userTracingEnabled
-    then
-        unsafeDupablePerformIO $ do
-            traceEventIO msg
-            return expr
-    else
-        expr
+traceEvent msg expr = unsafeDupablePerformIO $ do
+    traceEventIO msg
+    return expr
 
 -- | The 'traceEventIO' function emits a message to the eventlog, if eventlog
 -- profiling is available and enabled at runtime.
@@ -323,14 +318,9 @@ traceEventIO msg =
 --
 -- @since 4.7.0.0
 traceMarker :: String -> a -> a
-traceMarker msg expr =
-    if userTracingEnabled
-    then
-        unsafeDupablePerformIO $ do
-          traceMarkerIO msg
-          return expr
-    else
-        expr
+traceMarker msg expr = unsafeDupablePerformIO $ do
+    traceMarkerIO msg
+    return expr
 
 -- | The 'traceMarkerIO' function emits a marker to the eventlog, if eventlog
 -- profiling is available and enabled at runtime.



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1e75dc7dea47932b40bc106fc79605cf0dbaa8e6
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/20200605/2f15447e/attachment-0001.html>