From 586ebffda430661a30178285f4973b0b6bd5106b Mon Sep 17 00:00:00 2001
From: johnc <unknown>
Date: Wed, 9 Dec 2009 23:51:38 -0800
Subject: [PATCH] 6908215: G1: SEGV with G1PolicyVerbose=2 debug flag Summary:
 Change CollectionSetChooser::printSortedHeapRegions to handle null entries in
 _markedRegions growable array. Reviewed-by: jmasa, tonyp, iveresov

---
 .../vm/gc_implementation/g1/collectionSetChooser.cpp     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp b/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
index 3000f010b..967605176 100644
--- a/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
+++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
@@ -351,9 +351,16 @@ void
 CollectionSetChooser::printSortedHeapRegions() {
   gclog_or_tty->print_cr("Printing %d Heap Regions sorted by amount of known garbage",
                 _numMarkedRegions);
+
+  DEBUG_ONLY(int marked_count = 0;)
   for (int i = 0; i < _markedRegions.length(); i++) {
-    printHeapRegion(_markedRegions.at(i));
+    HeapRegion* r = _markedRegions.at(i);
+    if (r != NULL) {
+      printHeapRegion(r);
+      DEBUG_ONLY(marked_count++;)
+    }
   }
+  assert(marked_count == _numMarkedRegions, "must be");
   gclog_or_tty->print_cr("Done sorted heap region print");
 }
 
-- 
GitLab