src/share/vm/gc_implementation/g1/vm_operations_g1.cpp

rev 8331 : [mq]: is_system_gc

*** 167,178 ****
  
    // If the pause was initiated by a System.gc() and
    // +ExplicitGCInvokesConcurrent, we have to wait here for the cycle
    // that just started (or maybe one that was already in progress) to
    // finish.
!   if (_gc_cause == GCCause::_java_lang_system_gc &&
!       _should_initiate_conc_mark) {
      assert(ExplicitGCInvokesConcurrent,
             "the only way to be here is if ExplicitGCInvokesConcurrent is set");
  
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
  
--- 167,177 ----
  
    // If the pause was initiated by a System.gc() and
    // +ExplicitGCInvokesConcurrent, we have to wait here for the cycle
    // that just started (or maybe one that was already in progress) to
    // finish.
!   if (GCCause::is_system_gc(_gc_cause) && _should_initiate_conc_mark) {
      assert(ExplicitGCInvokesConcurrent,
             "the only way to be here is if ExplicitGCInvokesConcurrent is set");
  
      G1CollectedHeap* g1h = G1CollectedHeap::heap();