--- old/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp	2014-12-18 15:48:35.602492181 +0100
+++ new/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp	2014-12-18 15:48:35.525489882 +0100
@@ -51,8 +51,8 @@
   } else if (in_cset_state.is_humongous()) {
     _g1h->set_humongous_is_live(obj);
   } else {
-    assert(in_cset_state.is_not_in_cset(),
-           err_msg("In_cset_state must be NotInCSet here, but is %d", in_cset_state.value()));
+    assert(!in_cset_state.is_in_cset_or_humongous(),
+           err_msg("In_cset_state must be NotInCSet here, but is " CSETSTATE_FORMAT, in_cset_state.value()));
   }
 
   assert(obj != NULL, "Must be");