--- old/src/share/vm/gc_implementation/g1/heapRegion.cpp	2013-11-05 14:42:33.052742666 +0100
+++ new/src/share/vm/gc_implementation/g1/heapRegion.cpp	2013-11-05 14:42:32.988742667 +0100
@@ -601,7 +601,7 @@
 
 void HeapRegion::migrate_strong_code_roots() {
   assert(in_collection_set(), "only collection set regions");
-  assert(!isHumongous(), "not humongous regions");
+  assert(!isHumongous(), "humongous region moved?");
 
   HeapRegionRemSet* hrrs = rem_set();
   hrrs->migrate_strong_code_roots();
@@ -722,10 +722,10 @@
     return;
   }
 
-  // An H-region should have an empty strong code root list
-  if (isHumongous()) {
+  // An H-region continuation should have an empty strong code root list
+  if (continuesHumongous()) {
     if (strong_code_roots_length > 0) {
-      gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
+      gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is a humongous continuation "
                              "but has "INT32_FORMAT" code root entries",
                              bottom(), end(), strong_code_roots_length);
       *failures = true;