summaryrefslogtreecommitdiff
path: root/rts/StgMiscClosures.cmm
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2017-09-21 18:04:03 -0400
committerBen Gamari <ben@smart-cactus.org>2017-09-21 20:12:51 -0400
commit760b9a363cd4e9287a05b23c74357db0e815bdf3 (patch)
treead9a0848e00b36470a5b7b9f29b36a7fa289ceaa /rts/StgMiscClosures.cmm
parentfeac0a3bc69fd376231aa3c83d031c131156ddb9 (diff)
downloadhaskell-760b9a363cd4e9287a05b23c74357db0e815bdf3.tar.gz
rts: Set unwind information for remaining stack frames
Reviewers: austin, erikd, simonmar Reviewed By: simonmar Subscribers: rwbarton, thomie Differential Revision: https://phabricator.haskell.org/D3985
Diffstat (limited to 'rts/StgMiscClosures.cmm')
-rw-r--r--rts/StgMiscClosures.cmm3
1 files changed, 2 insertions, 1 deletions
diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm
index 88371f2109..361989d0d2 100644
--- a/rts/StgMiscClosures.cmm
+++ b/rts/StgMiscClosures.cmm
@@ -26,7 +26,7 @@ INFO_TABLE_RET (stg_stack_underflow_frame, UNDERFLOW_FRAME,
W_ info_ptr, P_ unused)
/* no args => explicit stack */
{
- unwind UnwindReturnReg = return;
+ unwind Sp = W_[Sp + WDS(2)];
W_ new_tso;
W_ ret_off;
@@ -61,6 +61,7 @@ INFO_TABLE_RET (stg_restore_cccs, RET_SMALL, W_ info_ptr, W_ cccs)
INFO_TABLE_RET (stg_restore_cccs_eval, RET_SMALL, W_ info_ptr, W_ cccs)
return (P_ ret)
{
+ unwind Sp = Sp + WDS(2);
#if defined(PROFILING)
CCCS = cccs;
#endif