[commit: ghc] ghc-7.10: Do not copy stack after stack overflow, refix #8435 (9c9bc6b)

git at git.haskell.org git at git.haskell.org
Fri Jun 12 18:56:37 UTC 2015


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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/9c9bc6bf74f53300b8aa01fbccc279a18197459a/ghc

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

commit 9c9bc6bf74f53300b8aa01fbccc279a18197459a
Author: Flaviu Andrei Csernik (archblob) <fcsernik at gmail.com>
Date:   Fri Jun 12 11:45:55 2015 -0500

    Do not copy stack after stack overflow, refix #8435
    
    Summary:
    This was reverted in d70b19bfb5ed79b22c2ac31e22f46782fc47a117
    and is a part of the reason for #10445.
    
    Test Plan: validate
    
    Reviewers: ezyang, simonmar, austin
    
    Reviewed By: simonmar, austin
    
    Subscribers: bgamari, thomie
    
    Differential Revision: https://phabricator.haskell.org/D938
    
    GHC Trac Issues: #8435
    
    (cherry picked from commit 892c3e98bcef50aa56ec818f4d001aee36e05bbc)


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

9c9bc6bf74f53300b8aa01fbccc279a18197459a
 rts/Threads.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rts/Threads.c b/rts/Threads.c
index 99f2be7..38ddfb8 100644
--- a/rts/Threads.c
+++ b/rts/Threads.c
@@ -553,6 +553,7 @@ threadStackOverflow (Capability *cap, StgTSO *tso)
 
         // Note [Throw to self when masked], also #767 and #8303.
         throwToSelf(cap, tso, (StgClosure *)stackOverflow_closure);
+        return;
     }
 
 



More information about the ghc-commits mailing list