Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorcoleenp
Sat, 05 Dec 2015 17:14:02 +0000
changeset 34652 1949213951a9
parent 34650 b4b00fdee76b (diff)
parent 34651 07b1cc0f6040 (current diff)
child 34654 e231223e6205
Merge
hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp file | annotate | diff | comparison | revisions
hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/share/vm/gc/g1/g1Predictions.hpp	Sat Dec 05 10:40:22 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/g1Predictions.hpp	Sat Dec 05 17:14:02 2015 +0000
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_GC_G1_G1PREDICTIONS_HPP
 #define SHARE_VM_GC_G1_G1PREDICTIONS_HPP
 
-#include "memory/allocation.inline.hpp"
 #include "utilities/numberSeq.hpp"
 
 // Utility class containing various helper methods for prediction.
--- a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp	Sat Dec 05 10:40:22 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp	Sat Dec 05 17:14:02 2015 +0000
@@ -1020,24 +1020,6 @@
 }
 
 #ifndef PRODUCT
-void PerRegionTable::test_fl_mem_size() {
-  PerRegionTable* dummy = alloc(NULL);
-
-  size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
-  assert(dummy->mem_size() > min_prt_size,
-         "PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. "
-         "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size);
-  free(dummy);
-  guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
-  // try to reset the state
-  _free_list = NULL;
-  delete dummy;
-}
-
-void HeapRegionRemSet::test_prt() {
-  PerRegionTable::test_fl_mem_size();
-}
-
 void HeapRegionRemSet::test() {
   os::sleep(Thread::current(), (jlong)5000, false);
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
--- a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp	Sat Dec 05 10:40:22 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.hpp	Sat Dec 05 17:14:02 2015 +0000
@@ -392,7 +392,6 @@
 
   // Run unit tests.
 #ifndef PRODUCT
-  static void test_prt();
   static void test();
 #endif
 };
--- a/hotspot/src/share/vm/prims/jni.cpp	Sat Dec 05 10:40:22 2015 -0500
+++ b/hotspot/src/share/vm/prims/jni.cpp	Sat Dec 05 17:14:02 2015 +0000
@@ -3933,7 +3933,6 @@
 #if INCLUDE_ALL_GCS
     run_unit_test(TestOldFreeSpaceCalculation_test());
     run_unit_test(TestG1BiasedArray_test());
-    run_unit_test(HeapRegionRemSet::test_prt());
     run_unit_test(TestBufferingOopClosure_test());
     run_unit_test(TestCodeCacheRemSet_test());
     if (UseG1GC) {
jdk-sandbox