[commit: ghc] master: rts: Set unwind information for catch_frame (a9d417d)

git at git.haskell.org git at git.haskell.org
Fri Sep 22 00:13:22 UTC 2017


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

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

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

commit a9d417dab21e0b677f13c2ba99244162a8fffe3e
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Sep 21 18:04:24 2017 -0400

    rts: Set unwind information for catch_frame
    
    Reviewers: austin, erikd, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3937


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

a9d417dab21e0b677f13c2ba99244162a8fffe3e
 rts/Exception.cmm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rts/Exception.cmm b/rts/Exception.cmm
index 4970aa2..9661c23 100644
--- a/rts/Exception.cmm
+++ b/rts/Exception.cmm
@@ -370,6 +370,7 @@ INFO_TABLE_RET(stg_catch_frame, CATCH_FRAME,
                                   exceptions_blocked,handler))
     return (P_ ret)
 {
+    unwind Sp = Sp + SIZEOF_StgCatchFrame;
     return (ret);
 }
 



More information about the ghc-commits mailing list