src/share/vm/gc_implementation/g1/concurrentMark.hpp

@@ -103,12 +103,14 @@
   }
   size_t heapWordToOffset(HeapWord* addr) const {
     return pointer_delta(addr, _bmStartWord) >> _shifter;
   }
   int heapWordDiffToOffsetDiff(size_t diff) const;
-  HeapWord* nextWord(HeapWord* addr) {
-    return offsetToHeapWord(heapWordToOffset(addr) + 1);
+
+  HeapWord* nextObject(HeapWord* addr) {
+    oop obj = (oop) addr;
+    return addr + obj->size();
   }
 
   // debugging
   NOT_PRODUCT(bool covers(ReservedSpace rs) const;)
 };