diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2015-07-27 15:51:16 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2015-07-27 15:51:16 +0100 |
| commit | a1e8620fa2840f1f18297d784a2d2b174b27f566 (patch) | |
| tree | 3ec13231ba0da90ea0abb8fcc9196eba7a4c012b /rts/sm/Storage.c | |
| parent | 09925c364c3fb7d3e8610f8c3ae26238d2941fc0 (diff) | |
| download | haskell-a1e8620fa2840f1f18297d784a2d2b174b27f566.tar.gz | |
Revert "Eliminate zero_static_objects_list()"
This reverts commit b949c96b4960168a3b399fe14485b24a2167b982.
Diffstat (limited to 'rts/sm/Storage.c')
| -rw-r--r-- | rts/sm/Storage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c index 65f5b70c21..6e9b0634b7 100644 --- a/rts/sm/Storage.c +++ b/rts/sm/Storage.c @@ -175,9 +175,9 @@ initStorage (void) generations[0].max_blocks = 0; - dyn_caf_list = (StgIndStatic*)END_OF_CAF_LIST; - debug_caf_list = (StgIndStatic*)END_OF_CAF_LIST; - revertible_caf_list = (StgIndStatic*)END_OF_CAF_LIST; + dyn_caf_list = (StgIndStatic*)END_OF_STATIC_LIST; + debug_caf_list = (StgIndStatic*)END_OF_STATIC_LIST; + revertible_caf_list = (StgIndStatic*)END_OF_STATIC_LIST; /* initialise the allocate() interface */ large_alloc_lim = RtsFlags.GcFlags.minAllocAreaSize * BLOCK_SIZE_W; @@ -427,7 +427,7 @@ newCAF(StgRegTable *reg, StgIndStatic *caf) ACQUIRE_SM_LOCK; // dyn_caf_list is global, locked by sm_mutex caf->static_link = (StgClosure*)dyn_caf_list; - dyn_caf_list = (StgIndStatic*)((StgWord)caf | STATIC_FLAG_LIST); + dyn_caf_list = caf; RELEASE_SM_LOCK; } else @@ -484,7 +484,7 @@ StgInd* newRetainedCAF (StgRegTable *reg, StgIndStatic *caf) ACQUIRE_SM_LOCK; caf->static_link = (StgClosure*)revertible_caf_list; - revertible_caf_list = (StgIndStatic*)((StgWord)caf | STATIC_FLAG_LIST); + revertible_caf_list = caf; RELEASE_SM_LOCK; |