src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

rev 49484 : imported patch 8197573-remove-secondary-free-list
rev 49485 : imported patch 8197573-stefanj-review2
rev 49493 : imported patch 8199326-remove-gc-time-stamp-logic-only
rev 49494 : imported patch 8199742-collectorstate-fixes
rev 49496 : imported patch 8151171-renamings
rev 49498 : imported patch 8200234-g1concurrentmark-refactorings
rev 49499 : [mq]: 8200234-stefanj-review

@@ -47,10 +47,11 @@
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "gc/shared/vmGCOperations.hpp"
 #include "gc/shared/weakProcessor.hpp"
+#include "include/jvm.h"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"

@@ -534,14 +535,13 @@
 }
 
 void G1ConcurrentMark::humongous_object_eagerly_reclaimed(HeapRegion* r) {
   assert_at_safepoint_on_vm_thread();
 
-  G1CMBitMap* const bitmap = _g1h->collector_state()->mark_or_rebuild_in_progress() ? _next_mark_bitmap : _prev_mark_bitmap;
-  // Need to clear mark bit of the humongous object if already set and during a marking cycle.
-  if (bitmap->is_marked(r->bottom())) {
-    bitmap->clear(r->bottom());
+  // Need to clear mark bit of the humongous object.
+  if (_next_mark_bitmap->is_marked(r->bottom())) {
+    _next_mark_bitmap->clear(r->bottom());
   }
 
   if (!_g1h->collector_state()->mark_or_rebuild_in_progress()) {
     return;
   }

@@ -1005,11 +1005,11 @@
     GCTraceTime(Debug, gc, phases) trace(caller, _gc_timer_cm);
 
     size_t const BufLen = 512;
     char buffer[BufLen];
 
-    os::snprintf(buffer, BufLen, "During GC (%s)", caller);
+    jio_snprintf(buffer, BufLen, "During GC (%s)", caller);
     verifier->verify(type, vo, buffer);
   }
 
   verifier->check_bitmaps(caller);
 }