--- old/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2013-05-14 15:41:33.744528770 +0200
+++ new/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2013-05-14 15:41:33.384528777 +0200
@@ -242,11 +242,19 @@
     PerRegionTable* cur = _free_list;
     size_t res = 0;
     while (cur != NULL) {
-      res += sizeof(PerRegionTable);
+      res += cur->mem_size();
       cur = cur->next();
     }
     return res;
   }
+
+#ifndef PRODUCT
+  static void test() {
+    PerRegionTable* dummy = alloc(NULL);
+    free(dummy);
+    guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
+  }
+#endif
 };
 
 PerRegionTable* PerRegionTable::_free_list = NULL;
@@ -1147,6 +1155,10 @@
 }
 
 #ifndef PRODUCT
+void HeapRegionRemSet::test_prt() {
+  PerRegionTable::test();
+}
+
 void HeapRegionRemSet::test() {
   os::sleep(Thread::current(), (jlong)5000, false);
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
--- old/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	2013-05-14 15:41:35.212528741 +0200
+++ new/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	2013-05-14 15:41:34.936528746 +0200
@@ -338,6 +338,7 @@
 
   // Run unit tests.
 #ifndef PRODUCT
+  static void test_prt();
   static void test();
 #endif
 };
--- old/src/share/vm/prims/jni.cpp	2013-05-14 15:41:36.828528709 +0200
+++ new/src/share/vm/prims/jni.cpp	2013-05-14 15:41:36.496528716 +0200
@@ -5015,6 +5015,9 @@
 #ifndef PRODUCT
 
 #include "gc_interface/collectedHeap.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc_implementation/g1/heapRegionRemSet.hpp"
+#endif
 #include "utilities/quickSort.hpp"
 #if INCLUDE_VM_STRUCTS
 #include "runtime/vmStructs.hpp"
@@ -5035,6 +5038,9 @@
 #if INCLUDE_VM_STRUCTS
     run_unit_test(VMStructs::test());
 #endif
+#if INCLUDE_ALL_GCS
+    run_unit_test(HeapRegionRemSet::test_prt());
+#endif
     tty->print_cr("All internal VM tests passed");
   }
 }