[commit: packages/base] master: Revert "GHC.Conc.Sync: Pass TSO to stackOverflow" (476d042)

git at git.haskell.org git at git.haskell.org
Sun Sep 8 23:19:27 CEST 2013


Repository : ssh://git@git.haskell.org/base

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/476d0424e27247d4bf1c84dfeeb058b9d6db109e/base

>---------------------------------------------------------------

commit 476d0424e27247d4bf1c84dfeeb058b9d6db109e
Author: Austin Seipp <aseipp at pobox.com>
Date:   Sun Sep 8 16:19:16 2013 -0500

    Revert "GHC.Conc.Sync: Pass TSO to stackOverflow"
    
    This reverts commit 0cfba06e09cae209c6fc1f94edd815ccf5a7e9d7.


>---------------------------------------------------------------

476d0424e27247d4bf1c84dfeeb058b9d6db109e
 GHC/Conc/Sync.lhs |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/GHC/Conc/Sync.lhs b/GHC/Conc/Sync.lhs
index 4832740..135c1fe 100644
--- a/GHC/Conc/Sync.lhs
+++ b/GHC/Conc/Sync.lhs
@@ -764,9 +764,7 @@ sharedCAF a get_or_set =
                 deRefStablePtr (castPtrToStablePtr (castPtr ref2))
 
 reportStackOverflow :: IO ()
-reportStackOverflow = do
-     ThreadId tid <- myThreadId
-     callStackOverflowHook tid
+reportStackOverflow = callStackOverflowHook
 
 reportError :: SomeException -> IO ()
 reportError ex = do
@@ -776,7 +774,7 @@ reportError ex = do
 -- SUP: Are the hooks allowed to re-enter Haskell land?  If so, remove
 -- the unsafe below.
 foreign import ccall unsafe "stackOverflow"
-        callStackOverflowHook :: ThreadId# -> IO ()
+        callStackOverflowHook :: IO ()
 
 {-# NOINLINE uncaughtExceptionHandler #-}
 uncaughtExceptionHandler :: IORef (SomeException -> IO ())





More information about the ghc-commits mailing list