summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authormniip <mniip@mniip.com>2016-08-30 16:57:47 -0400
committerBen Gamari <ben@smart-cactus.org>2016-08-30 17:50:51 -0400
commita25bf2673d0f6db5f454619ddf91f974cace4e8b (patch)
tree7b56d2ecef4a88999c8743d1ddc97a3b02c6933a /includes
parent83b326cda759cfd4c538595cf38ee23eb81a4c76 (diff)
downloadhaskell-a25bf2673d0f6db5f454619ddf91f974cace4e8b.tar.gz
Tag pointers in interpreted constructors
Instead of stg_interp_constr_entry there are now 7 functions (one for each value of the tag bits) that tag the constructor pointer before returning. This is consistent with compiled constructors' entry code, and expectations that compiled code places on compiled constructors. The iserv protocol is extended with an extra field that explains what pointer tag the constructor should use. Test Plan: Added tests for #12523 Reviewers: erikd, bgamari, hvr, austin, simonmar Reviewed By: simonmar Subscribers: osa1, thomie, rwbarton Differential Revision: https://phabricator.haskell.org/D2473 GHC Trac Issues: #12523
Diffstat (limited to 'includes')
-rw-r--r--includes/stg/MiscClosures.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h
index 3f5e403d49..07a7752ed2 100644
--- a/includes/stg/MiscClosures.h
+++ b/includes/stg/MiscClosures.h
@@ -64,7 +64,13 @@ RTS_RET(stg_maskAsyncExceptionszh_ret);
RTS_RET(stg_stack_underflow_frame);
RTS_RET(stg_restore_cccs);
-// RTS_FUN(stg_interp_constr_entry);
+// RTS_FUN(stg_interp_constr1_entry);
+// RTS_FUN(stg_interp_constr2_entry);
+// RTS_FUN(stg_interp_constr3_entry);
+// RTS_FUN(stg_interp_constr4_entry);
+// RTS_FUN(stg_interp_constr5_entry);
+// RTS_FUN(stg_interp_constr6_entry);
+// RTS_FUN(stg_interp_constr7_entry);
//
// This is referenced using the FFI in the compiler (ByteCodeItbls),
// so we can't give it the correct type here because the prototypes