# HG changeset patch
# User tschatzl
# Date 1447418177 0
# Node ID 41cc1ac3e1d9a628b10af7da0aa9fa4488668c37
# Parent  317af749634b30b54e1cf7f46a266ea37ee98faa# Parent  7e08409e593514080df7eeb5b483ddd2fb092032
Merge

diff -r 317af749634b -r 41cc1ac3e1d9 hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp	Fri Nov 13 09:28:53 2015 +0100
+++ b/hotspot/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,