--- old/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp	2015-12-04 15:40:34.348494910 +0100
+++ new/src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp	2015-12-04 15:40:34.256491102 +0100
@@ -50,8 +50,8 @@
   } else if (in_cset_state.is_humongous()) {
     _g1h->set_humongous_is_live(obj);
   } else {
-    assert(!in_cset_state.is_in_cset_or_humongous(),
-           "In_cset_state must be NotInCSet here, but is " CSETSTATE_FORMAT, in_cset_state.value());
+    assert(in_cset_state.is_default() || in_cset_state.is_ext(),
+           "In_cset_state must be NotInCSet or Ext here, but is " CSETSTATE_FORMAT, in_cset_state.value());
   }
 
   assert(obj != NULL, "Must be");