From e9b2f65ae336d941929af728bf06a22f540c4092 Mon Sep 17 00:00:00 2001
From: iveresov <unknown>
Date: Mon, 16 Mar 2009 17:48:01 -0700
Subject: [PATCH] 6815683: G1: SEGV during marking Summary: We should mark the
 regions that continue humongous regions as live if the first region is live.
 Reviewed-by: tonyp

---
 src/share/vm/gc_implementation/g1/concurrentMark.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index 5b01157e9..3bc288dd0 100644
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -1232,7 +1232,16 @@ public:
     if (!_final && _regions_done == 0)
       _start_vtime_sec = os::elapsedVTime();
 
-    if (hr->continuesHumongous()) return false;
+    if (hr->continuesHumongous()) {
+      HeapRegion* hum_start = hr->humongous_start_region();
+      // If the head region of the humongous region has been determined
+      // to be alive, then all the tail regions should be marked
+      // such as well.
+      if (_region_bm->at(hum_start->hrs_index())) {
+        _region_bm->par_at_put(hr->hrs_index(), 1);
+      }
+      return false;
+    }
 
     HeapWord* nextTop = hr->next_top_at_mark_start();
     HeapWord* start   = hr->top_at_conc_mark_count();
-- 
GitLab