--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2014-12-18 15:48:33.802438426 +0100
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2014-12-18 15:48:33.729436246 +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) {
@@ -5095,7 +5095,7 @@
     assert(obj != NULL, "the caller should have filtered out NULL values");
 
     const InCSetState cset_state = _g1->in_cset_state(obj);
-    if (cset_state.is_not_in_cset()) {
+    if (!cset_state.is_in_cset_or_humongous()) {
       return;
     }
     if (cset_state.is_in_cset()) {