Mercurial > hg > openjdk > hsx17

changeset 1292:b8a8eafd038d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6921710: G1: assert(new_finger >= _finger && new_finger < _region_limit,"invariant") Summary: If CM task was aborted while scanning the last object of the specified region and the size of that object is equal to bitmap's granularity then the next offset would be equal or over the region limit which is exactly what the assertion states. Reviewed-by: ysr, tonyp, jmasa
author apetrusenko
date Mon, 08 Mar 2010 04:07:12 -0800
parents 23decd59cae7
children 34571037987c
files src/share/vm/gc_implementation/g1/concurrentMark.cpp
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Wed Mar 03 13:26:19 2010 -0800
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Mon Mar 08 04:07:12 2010 -0800
@@ -3704,7 +3704,14 @@
         // enough to point to the next possible object header (the
         // bitmap knows by how much we need to move it as it knows its
         // granularity).
-        move_finger_to(_nextMarkBitMap->nextWord(_finger));
+        assert(_finger < _region_limit, "invariant");
+        HeapWord* new_finger = _nextMarkBitMap->nextWord(_finger);
+        // Check if bitmap iteration was aborted while scanning the last object
+        if (new_finger >= _region_limit) {
+            giveup_current_region();
+        } else {
+            move_finger_to(new_finger);
+        }
       }
     }
     // At this point we have either completed iterating over the