diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2016-12-20 14:32:11 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2017-01-06 15:53:36 +0000 |
| commit | 3a18baff06abc193569b1b76358da26375b3c8d6 (patch) | |
| tree | c80e30dc27fb548eca50b9697d1fdd2a248a891a /includes | |
| parent | 508811004d1806b28a91c3ff4a5c2247e2ad4655 (diff) | |
| download | haskell-3a18baff06abc193569b1b76358da26375b3c8d6.tar.gz | |
More fixes for #5654
* In stg_ap_0_fast, if we're evaluating a thunk, the thunk might
evaluate to a function in which case we may have to adjust its CCS.
* The interpreter has its own implementation of stg_ap_0_fast, so we
have to do the same shenanigans with creating empty PAPs and copying
PAPs there.
* GHCi creates Cost Centres as children of CCS_MAIN, which enterFunCCS()
wrongly assumed to imply that they were CAFs. Now we use the is_caf
flag for this, which we have to correctly initialise when we create a
Cost Centre in GHCi.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/stg/MiscClosures.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index b3f9a69472..994b369c46 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -63,6 +63,7 @@ RTS_RET(stg_maskUninterruptiblezh_ret); RTS_RET(stg_maskAsyncExceptionszh_ret); RTS_RET(stg_stack_underflow_frame); RTS_RET(stg_restore_cccs); +RTS_RET(stg_restore_cccs_eval); // RTS_FUN(stg_interp_constr1_entry); // RTS_FUN(stg_interp_constr2_entry); |