--- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2013-11-05 14:42:32.652742674 +0100
+++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	2013-11-05 14:42:32.584742675 +0100
@@ -6656,7 +6656,7 @@
     if (!oopDesc::is_null(heap_oop)) {
       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
       HeapRegion* hr = _g1h->heap_region_containing(obj);
-      assert(!hr->isHumongous(), "code root in humongous region?");
+      assert(!hr->continuesHumongous(), "code root in continuation of humongous region?");
 
       // HeapRegion::add_strong_code_root() avoids adding duplicate
       // entries but having duplicates is  OK since we "mark" nmethods
@@ -6683,7 +6683,7 @@
     if (!oopDesc::is_null(heap_oop)) {
       oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
       HeapRegion* hr = _g1h->heap_region_containing(obj);
-      assert(!hr->isHumongous(), "code root in humongous region?");
+      assert(!hr->continuesHumongous(), "code root in continuation of humongous region?");
       hr->remove_strong_code_root(_nm);
       assert(!hr->rem_set()->strong_code_roots_list_contains(_nm), "remove failed?");
     }
@@ -6796,8 +6796,8 @@
 
   bool doHeapRegion(HeapRegion *hr) {
     HeapRegionRemSet* hrrs = hr->rem_set();
-    if (hr->isHumongous()) {
-      // Code roots should never be attached to a humongous region
+    if (hr->continuesHumongous()) {
+      // Code roots should never be attached to a continuation of a humongous region
       assert(hrrs->strong_code_roots_list_length() == 0, "sanity");
       return false;
     }