diff options
author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2019-04-22 09:58:56 +0300 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-25 14:35:09 -0400 |
commit | 4e22826716dc0d3b4ab8bdd538c569a280cd8083 (patch) | |
tree | 6f78d8e113909c03f5802d4f2cee680a3737038c | |
parent | f85efdec3e0580591eed0d132404a20df9a76316 (diff) | |
download | haskell-4e22826716dc0d3b4ab8bdd538c569a280cd8083.tar.gz |
Minor RTS refactoring:
- Remove redundant casting in evacuate_static_object
- Remove redundant parens in STATIC_LINK
- Fix a typo in GC.c
-rw-r--r-- | includes/rts/storage/ClosureMacros.h | 4 | ||||
-rw-r--r-- | rts/sm/Evac.c | 2 | ||||
-rw-r--r-- | rts/sm/GC.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/includes/rts/storage/ClosureMacros.h b/includes/rts/storage/ClosureMacros.h index e52059e790..7a2c5dab80 100644 --- a/includes/rts/storage/ClosureMacros.h +++ b/includes/rts/storage/ClosureMacros.h @@ -184,8 +184,8 @@ STATIC_LINK(const StgInfoTable *info, StgClosure *p) case IND_STATIC: return IND_STATIC_LINK(p); default: - return &(p)->payload[info->layout.payload.ptrs + - info->layout.payload.nptrs]; + return &p->payload[info->layout.payload.ptrs + + info->layout.payload.nptrs]; } } diff --git a/rts/sm/Evac.c b/rts/sm/Evac.c index b4050512a6..2a2a26ec09 100644 --- a/rts/sm/Evac.c +++ b/rts/sm/Evac.c @@ -333,7 +333,7 @@ evacuate_static_object (StgClosure **link_field, StgClosure *q) StgWord link = (StgWord)*link_field; // See Note [STATIC_LINK fields] for how the link field bits work - if ((((StgWord)(link)&STATIC_BITS) | prev_static_flag) != 3) { + if (((link & STATIC_BITS) | prev_static_flag) != 3) { StgWord new_list_head = (StgWord)q | static_flag; #if !defined(THREADED_RTS) *link_field = gct->static_objects; diff --git a/rts/sm/GC.c b/rts/sm/GC.c index 5aa2d1bc85..4bf540a4a7 100644 --- a/rts/sm/GC.c +++ b/rts/sm/GC.c @@ -281,7 +281,7 @@ GarbageCollect (uint32_t collect_gen, // lose locality by moving cached data into another CPU's cache // (this effect can be quite significant). // - // We could have a more complex way to deterimine whether to do + // We could have a more complex way to determine whether to do // work stealing or not, e.g. it might be a good idea to do it // if the heap is big. For now, we just turn it on or off with // a flag. |