1.1 --- a/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Tue Dec 15 09:46:51 2015 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Wed Dec 02 13:58:34 2015 +0530
1.3 @@ -90,12 +90,8 @@
1.4
1.5 void VM_G1IncCollectionPause::doit() {
1.6 G1CollectedHeap* g1h = G1CollectedHeap::heap();
1.7 - assert(!_should_initiate_conc_mark ||
1.8 - ((_gc_cause == GCCause::_gc_locker && GCLockerInvokesConcurrent) ||
1.9 - (_gc_cause == GCCause::_java_lang_system_gc && ExplicitGCInvokesConcurrent) ||
1.10 - _gc_cause == GCCause::_g1_humongous_allocation ||
1.11 - _gc_cause == GCCause::_update_allocation_context_stats_inc),
1.12 - "only a GC locker, a System.gc(), stats update or a hum allocation induced GC should start a cycle");
1.13 + assert(!_should_initiate_conc_mark || g1h->should_do_concurrent_full_gc(_gc_cause),
1.14 + "only a GC locker, a System.gc(), stats update, whitebox, or a hum allocation induced GC should start a cycle");
1.15
1.16 if (_word_size > 0) {
1.17 // An allocation has been requested. So, try to do that first.
