1.1 --- a/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Thu Nov 21 09:57:00 2013 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Mon Oct 06 10:11:13 2014 +0200
1.3 @@ -95,8 +95,9 @@
1.4 assert(!_should_initiate_conc_mark ||
1.5 ((_gc_cause == GCCause::_gc_locker && GCLockerInvokesConcurrent) ||
1.6 (_gc_cause == GCCause::_java_lang_system_gc && ExplicitGCInvokesConcurrent) ||
1.7 - _gc_cause == GCCause::_g1_humongous_allocation),
1.8 - "only a GC locker, a System.gc() or a hum allocation induced GC should start a cycle");
1.9 + _gc_cause == GCCause::_g1_humongous_allocation ||
1.10 + _gc_cause == GCCause::_update_allocation_context_stats_inc),
1.11 + "only a GC locker, a System.gc(), stats update or a hum allocation induced GC should start a cycle");
1.12
1.13 if (_word_size > 0) {
1.14 // An allocation has been requested. So, try to do that first.
