src/hotspot/share/prims/whitebox.cpp

rev 59376 : 8153224.v2.10.patch merged with 8153224.v2.11.patch.
rev 59378 : CR changes from dholmes, dcubed; fix is_being_async_deflated() race found by eosterlund; WB_ForceSafepoint() should request a special clean up with AsyncDeflateIdleMonitors; add a barrier in install_displaced_markword_in_object() to separate the header load from the preceding loads in is_being_async_deflated().

*** 71,80 ****
--- 71,81 ----
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/javaCalls.hpp"
  #include "runtime/jniHandles.inline.hpp"
  #include "runtime/os.hpp"
  #include "runtime/sweeper.hpp"
+ #include "runtime/synchronizer.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/threadSMR.hpp"
  #include "runtime/vm_version.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/align.hpp"
*** 475,484 ****
--- 476,491 ----
    THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1InConcurrentMark: G1 GC is not enabled");
  WB_END
  
  WB_ENTRY(jboolean, WB_G1StartMarkCycle(JNIEnv* env, jobject o))
    if (UseG1GC) {
+     if (AsyncDeflateIdleMonitors) {
+       // AsyncDeflateIdleMonitors needs to know when System.gc() or
+       // the equivalent is called so any special clean up can be done
+       // at a safepoint, e.g., TestHumongousClassLoader.java.
+       ObjectSynchronizer::set_is_special_deflation_requested(true);
+     }
      G1CollectedHeap* g1h = G1CollectedHeap::heap();
      if (!g1h->concurrent_mark()->cm_thread()->during_cycle()) {
        g1h->collect(GCCause::_wb_conc_mark);
        return true;
      }
*** 1446,1455 ****
--- 1453,1468 ----
    jchar* name = java_lang_String::as_unicode_string(JNIHandles::resolve(javaString), len, CHECK_false);
    return (StringTable::lookup(name, len) != NULL);
  WB_END
  
  WB_ENTRY(void, WB_FullGC(JNIEnv* env, jobject o))
+   if (AsyncDeflateIdleMonitors) {
+     // AsyncDeflateIdleMonitors needs to know when System.gc() or
+     // the equivalent is called so any special clean up can be done
+     // at a safepoint, e.g., TestHumongousClassLoader.java.
+     ObjectSynchronizer::set_is_special_deflation_requested(true);
+   }
    Universe::heap()->soft_ref_policy()->set_should_clear_all_soft_refs(true);
    Universe::heap()->collect(GCCause::_wb_full_gc);
  #if INCLUDE_G1GC
    if (UseG1GC) {
      // Needs to be cleared explicitly for G1
*** 1795,1804 ****
--- 1808,1824 ----
    oop obj_oop = JNIHandles::resolve(obj);
    return (jboolean) obj_oop->mark().has_monitor();
  WB_END
  
  WB_ENTRY(void, WB_ForceSafepoint(JNIEnv* env, jobject wb))
+   if (AsyncDeflateIdleMonitors) {
+     // AsyncDeflateIdleMonitors needs to know when System.gc() or
+     // the equivalent is called so any special clean up can be done
+     // at a safepoint, e.g., TestRTMTotalCountIncrRate.java or
+     // TestUseRTMForStackLocks.java.
+     ObjectSynchronizer::set_is_special_deflation_requested(true);
+   }
    VM_ForceSafepoint force_safepoint_op;
    VMThread::execute(&force_safepoint_op);
  WB_END
  
  WB_ENTRY(jlong, WB_GetConstantPool(JNIEnv* env, jobject wb, jclass klass))