Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp	Sat Nov 02 13:02:59 2013 -0700
     1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp	Thu Nov 07 15:17:10 2013 +0100
     1.3 @@ -601,7 +601,9 @@
     1.4  
     1.5  void HeapRegion::migrate_strong_code_roots() {
     1.6    assert(in_collection_set(), "only collection set regions");
     1.7 -  assert(!isHumongous(), "not humongous regions");
     1.8 +  assert(!isHumongous(),
     1.9 +          err_msg("humongous region "HR_FORMAT" should not have been added to collection set",
    1.10 +                  HR_FORMAT_PARAMS(this)));
    1.11  
    1.12    HeapRegionRemSet* hrrs = rem_set();
    1.13    hrrs->migrate_strong_code_roots();
    1.14 @@ -722,12 +724,11 @@
    1.15      return;
    1.16    }
    1.17  
    1.18 -  // An H-region should have an empty strong code root list
    1.19 -  if (isHumongous()) {
    1.20 +  if (continuesHumongous()) {
    1.21      if (strong_code_roots_length > 0) {
    1.22 -      gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
    1.23 -                             "but has "INT32_FORMAT" code root entries",
    1.24 -                             bottom(), end(), strong_code_roots_length);
    1.25 +      gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous "
    1.26 +                             "region but has "INT32_FORMAT" code root entries",
    1.27 +                             HR_FORMAT_PARAMS(this), strong_code_roots_length);
    1.28        *failures = true;
    1.29      }
    1.30      return;