summaryrefslogtreecommitdiff
path: root/compiler/ghci/ByteCodeItbls.hs
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2019-01-20 19:25:26 -0500
committerJohn Ericson <git@JohnEricson.me>2019-07-13 23:01:04 -0400
commitf57616ff540fcc45da3eff03dadcb81e76bbdb15 (patch)
tree405a4386da344280bc4bf8929e80bc88c15ccf48 /compiler/ghci/ByteCodeItbls.hs
parentcf6c2b8023e843bf04d6c8b031e2ac1306658bf7 (diff)
downloadhaskell-wip/D5082.tar.gz
Use run-time tablesNextToCode in compiler exclusively (#15548)wip/D5082
Summary: - There is no more use of the TABLES_NEXT_TO_CODE CPP macro in `compiler/`. GHCI_TABLES_NEXT_TO_CODE is also removed entirely. The field within `PlatformMisc` within `DynFlags` is used instead. - The field is still not exposed as a CLI flag. We might consider some way to ensure the right RTS / libraries are used before doing that. Original reviewers: Original subscribers: TerrorJack, rwbarton, carter Original Differential Revision: https://phabricator.haskell.org/D5082
Diffstat (limited to 'compiler/ghci/ByteCodeItbls.hs')
-rw-r--r--compiler/ghci/ByteCodeItbls.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/ghci/ByteCodeItbls.hs b/compiler/ghci/ByteCodeItbls.hs
index 7381c8f926..c17f213365 100644
--- a/compiler/ghci/ByteCodeItbls.hs
+++ b/compiler/ghci/ByteCodeItbls.hs
@@ -71,6 +71,8 @@ make_constr_itbls hsc_env cons =
descr = dataConIdentity dcon
- r <- iservCmd hsc_env (MkConInfoTable ptrs' nptrs_really
+ tables_next_to_code = tablesNextToCode dflags
+
+ r <- iservCmd hsc_env (MkConInfoTable tables_next_to_code ptrs' nptrs_really
conNo (tagForCon dflags dcon) descr)
return (getName dcon, ItblPtr r)