src/hotspot/share/prims/jvm.cpp

rev 54612 : Checkpoint latest preliminary review patches for full OpenJDK review; merge with 8222295.patch.

*** 69,78 ****
--- 69,79 ----
  #include "runtime/jniHandles.inline.hpp"
  #include "runtime/orderAccess.hpp"
  #include "runtime/os.inline.hpp"
  #include "runtime/perfData.hpp"
  #include "runtime/reflection.hpp"
+ #include "runtime/synchronizer.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/threadSMR.hpp"
  #include "runtime/vframe.inline.hpp"
  #include "runtime/vmOperations.hpp"
  #include "runtime/vm_version.hpp"
*** 480,489 ****
--- 481,495 ----
  
  
  JVM_ENTRY_NO_ENV(void, JVM_GC(void))
    JVMWrapper("JVM_GC");
    if (!DisableExplicitGC) {
+     if (AsyncDeflateIdleMonitors) {
+       // AsyncDeflateIdleMonitors needs to know when System.gc() is
+       // called so any special clean up can be done at a safepoint.
+       ObjectSynchronizer::set_is_cleanup_requested(true);
+     }
      Universe::heap()->collect(GCCause::_java_lang_system_gc);
    }
  JVM_END