[commit: ghc] master: Remove an incorrect assertion in threadPaused: (16bc7ae)

git at git.haskell.org git at git.haskell.org
Thu Sep 6 08:40:19 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/16bc7ae8b191153071b5fd1dde2b02e51171860e/ghc

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

commit 16bc7ae8b191153071b5fd1dde2b02e51171860e
Author: Ömer Sinan Ağacan <omeragacan at gmail.com>
Date:   Thu Sep 6 11:39:46 2018 +0300

    Remove an incorrect assertion in threadPaused:
    
    The assertion is triggered when we have a loop in the program (in which case we
    see the same update frame multiple times in the stack). See #14915 for more
    details.
    
    Reviewers: simonmar, bgamari, erikd
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, carter
    
    GHC Trac Issues: #14915
    
    Differential Revision: https://phabricator.haskell.org/D5133


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

16bc7ae8b191153071b5fd1dde2b02e51171860e
 rts/ThreadPaused.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/rts/ThreadPaused.c b/rts/ThreadPaused.c
index 3f7bdde..a916891 100644
--- a/rts/ThreadPaused.c
+++ b/rts/ThreadPaused.c
@@ -306,13 +306,6 @@ threadPaused(Capability *cap, StgTSO *tso)
                 continue;
             }
 
-            // We should never have made it here in the event of blackholes that
-            // we already own; they should have been marked when we blackholed
-            // them and consequently we should have stopped our stack walk
-            // above.
-            ASSERT(!((bh_info == &stg_BLACKHOLE_info)
-                     && (((StgInd*)bh)->indirectee == (StgClosure*)tso)));
-
             // zero out the slop so that the sanity checker can tell
             // where the next closure is.
             OVERWRITING_CLOSURE(bh);



More information about the ghc-commits mailing list