--- old/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2014-07-03 21:12:51.821584178 +0200
+++ new/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp	2014-07-03 21:12:51.709584182 +0200
@@ -113,7 +113,7 @@
     q = n;
     oop obj = oop(q);
     if (obj->klass_or_null() == NULL) return q;
-    n += obj->size();
+    n += block_size(q);
   }
   assert(q <= n, "wrong order for q and addr");
   assert(addr < n, "wrong order for addr and n");