summaryrefslogtreecommitdiff
path: root/mark.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2019-01-15 19:52:15 +0300
committerIvan Maidanski <ivmai@mail.ru>2019-01-15 19:52:15 +0300
commitb44088c81ce1e864b4c1d05a523c0150beeb7b8b (patch)
tree30216f0285e3eda9f97517b343e6f5bc243de230 /mark.c
parent45f6872e8660951249da418395981e58c232076c (diff)
downloadbdwgc-b44088c81ce1e864b4c1d05a523c0150beeb7b8b.tar.gz
Workaround 'if condition is the same as the previous one' cppcheck warnings
* alloc.c [THREAD_LOCAL_ALLOC] (GC_stopped_mark): Set GC_world_stopped to FALSE after GC_on_collection_event(GC_EVENT_PRE_START_WORLD). * alloc.c [THREAD_LOCAL_ALLOC] (GC_stopped_mark): Collapse adjacent "if" statements. * mark.c [!GC_DISABLE_INCREMENTAL] (GC_initiate_gc): Likewise. * pthread_stop_world.c [!NACL && !GC_OPENBSD_UTHREADS && !GC_NETBSD_THREADS_WORKAROUND] (GC_start_world): Likewise.
Diffstat (limited to 'mark.c')
-rw-r--r--mark.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/mark.c b/mark.c
index 72223bb6..9cc9d11c 100644
--- a/mark.c
+++ b/mark.c
@@ -253,15 +253,11 @@ GC_INNER void GC_initiate_gc(void)
if (GC_incremental) {
# ifdef CHECKSUMS
GC_read_dirty(FALSE);
+ GC_check_dirty();
# else
GC_read_dirty(GC_mark_state == MS_INVALID);
# endif
}
-# endif
-# ifdef CHECKSUMS
- if (GC_incremental) GC_check_dirty();
-# endif
-# if !defined(GC_DISABLE_INCREMENTAL)
GC_n_rescuing_pages = 0;
# endif
if (GC_mark_state == MS_NONE) {