--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-12-15 12:59:11.586739656 +0100 +++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-12-15 12:59:11.520737677 +0100 @@ -2763,7 +2763,7 @@ default: ShouldNotReachHere(); } - return false; // keep some compilers happy + return false; // Keep some compilers happy } HeapWord* G1CollectedHeap::top_at_mark_start(HeapRegion* hr, VerifyOption vo) { @@ -5769,9 +5769,7 @@ } }; -#ifdef PRODUCT -bool G1CollectedHeap::check_cset_fast_test() { return true; } -#else +#ifndef PRODUCT class G1VerifyCardTableCleanup: public HeapRegionClosure { G1CollectedHeap* _g1h; G1SATBCardTableModRefBS* _ct_bs;