diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2016-11-09 09:20:02 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2016-11-14 14:43:35 +0000 |
| commit | 55d535da10dd63bbaf03fb176ced7179087cd0d4 (patch) | |
| tree | 57bdbf04381fe08d90c384f5b10e77c3384227d9 /rts/sm/Compact.c | |
| parent | 6c0f10fac767c49b65ed71e8eb8e78ca4f9062d5 (diff) | |
| download | haskell-55d535da10dd63bbaf03fb176ced7179087cd0d4.tar.gz | |
Remove CONSTR_STATIC
Summary:
We currently have two info tables for a constructor
* XXX_con_info: the info table for a heap-resident instance of the
constructor, It has type CONSTR, or one of the specialised types like
CONSTR_1_0
* XXX_static_info: the info table for a static instance of this
constructor, which has type CONSTR_STATIC or CONSTR_STATIC_NOCAF.
I'm getting rid of the latter, and using the `con_info` info table for
both static and dynamic constructors. For rationale and more details
see Note [static constructors] in SMRep.hs.
I also removed these macros: `isSTATIC()`, `ip_STATIC()`,
`closure_STATIC()`, since they relied on the CONSTR/CONSTR_STATIC
distinction, and anyway HEAP_ALLOCED() does the same job.
Test Plan: validate
Reviewers: bgamari, simonpj, austin, gcampax, hvr, niteria, erikd
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2690
GHC Trac Issues: #12455
Diffstat (limited to 'rts/sm/Compact.c')
| -rw-r--r-- | rts/sm/Compact.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/rts/sm/Compact.c b/rts/sm/Compact.c index 3528fabb7b..1f7f08748a 100644 --- a/rts/sm/Compact.c +++ b/rts/sm/Compact.c @@ -214,7 +214,13 @@ thread_static( StgClosure* p ) case FUN_STATIC: p = *FUN_STATIC_LINK(p); continue; - case CONSTR_STATIC: + case CONSTR: + case CONSTR_NOCAF: + case CONSTR_1_0: + case CONSTR_0_1: + case CONSTR_2_0: + case CONSTR_1_1: + case CONSTR_0_2: p = *STATIC_LINK(info,p); continue; @@ -609,6 +615,7 @@ thread_obj (const StgInfoTable *info, StgPtr p) case FUN: case CONSTR: + case CONSTR_NOCAF: case PRIM: case MUT_PRIM: case MUT_VAR_CLEAN: |