changeset 9425:fcace5e12e01

Merge
author tschatzl
date Fri, 13 Nov 2015 12:36:17 +0000
parents 636e286dd5da 4d465c7793ec
children 8386f0e46519
files src/share/vm/gc/g1/g1CollectedHeap.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc/g1/g1CollectedHeap.cpp	Fri Nov 13 09:28:53 2015 +0100
+++ b/src/share/vm/gc/g1/g1CollectedHeap.cpp	Fri Nov 13 12:36:17 2015 +0000
@@ -2278,6 +2278,10 @@
   // And as a result the region we'll allocate will be humongous.
   guarantee(is_humongous(word_size), "sanity");
 
+  // _filler_array_max_size is set to humongous object threshold
+  // but temporarily change it to use CollectedHeap::fill_with_object().
+  SizeTFlagSetting fs(_filler_array_max_size, word_size);
+
   for (uintx i = 0; i < G1DummyRegionsPerGC; ++i) {
     // Let's use the existing mechanism for the allocation
     HeapWord* dummy_obj = humongous_obj_allocate(word_size,