src/share/vm/gc_implementation/g1/concurrentMark.cpp

Print this page
rev 7653 : 8068883: Remove disabling of warning "C4355: 'this' : used in base member initializer list"

*** 537,550 **** } } return true; } - #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away - #pragma warning( disable:4355 ) // 'this' : used in base member initializer list - #endif // _MSC_VER - uint ConcurrentMark::scale_parallel_threads(uint n_par_threads) { return MAX2((n_par_threads + 2) / 4, 1U); } ConcurrentMark::ConcurrentMark(G1CollectedHeap* g1h, G1RegionToSpaceMapper* prev_bitmap_storage, G1RegionToSpaceMapper* next_bitmap_storage) : --- 537,546 ----
*** 564,574 **** false /* in_resource_area*/), _prevMarkBitMap(&_markBitMap1), _nextMarkBitMap(&_markBitMap2), - _markStack(this), // _finger set in set_non_marking_state _max_worker_id(MAX2((uint)ParallelGCThreads, 1U)), // _active_tasks set in set_non_marking_state // _tasks set inside the constructor --- 560,569 ----
*** 593,602 **** --- 588,600 ---- _parallel_workers(NULL), _count_card_bitmaps(NULL), _count_marked_bytes(NULL), _completed_initialization(false) { + + _markStack = CMMarkStack(this); + CMVerboseLevel verbose_level = (CMVerboseLevel) G1MarkingVerboseLevel; if (verbose_level < no_verbose) { verbose_level = no_verbose; } if (verbose_level > high_verbose) {