hotspot: Support sun.misc.Unsafe intrinsics

Author: duanyangjing

src/hotspot/share/c1/c1_Compiler.cpp

@@ -110,6 +110,11 @@ bool Compiler::is_intrinsic_supported(const methodHandle& method) {
 
 bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   switch (id) {
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  case vmIntrinsics::_putOrderedObject:
+  case vmIntrinsics::_putOrderedInt:
+  case vmIntrinsics::_putOrderedLong:
+#endif
   case vmIntrinsics::_compareAndSetLong:
     break;
   case vmIntrinsics::_getAndAddInt:

src/hotspot/share/c1/c1_GraphBuilder.cpp

@@ -3613,6 +3613,11 @@ void GraphBuilder::build_graph_for_intrinsic(ciMethod* callee, bool ignore_retur
   case vmIntrinsics::_putLongVolatile        : append_unsafe_put(callee, T_LONG,    true); return;
   case vmIntrinsics::_putFloatVolatile       : append_unsafe_put(callee, T_FLOAT,   true); return;
   case vmIntrinsics::_putDoubleVolatile      : append_unsafe_put(callee, T_DOUBLE,  true); return;
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  case vmIntrinsics::_putOrderedObject       : append_unsafe_put(callee, T_OBJECT,  true); return;
+  case vmIntrinsics::_putOrderedInt          : append_unsafe_put(callee, T_INT,     true); return;
+  case vmIntrinsics::_putOrderedLong         : append_unsafe_put(callee, T_LONG,    true); return;
+#endif
   case vmIntrinsics::_compareAndSetLong:
   case vmIntrinsics::_compareAndSetInt:
   case vmIntrinsics::_compareAndSetReference : append_unsafe_CAS(callee); return;

src/hotspot/share/classfile/vmIntrinsics.cpp

@@ -433,6 +433,11 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_compareAndExchangeReferenceAcquire:
   case vmIntrinsics::_compareAndExchangeReferenceRelease:
   case vmIntrinsics::_allocateInstance:
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  case vmIntrinsics::_putOrderedObject:
+  case vmIntrinsics::_putOrderedInt:
+  case vmIntrinsics::_putOrderedLong:
+#endif
     if (!InlineUnsafeOps) return true;
     break;
   case vmIntrinsics::_getShortUnaligned:

src/hotspot/share/classfile/vmIntrinsics.hpp

@@ -687,6 +687,11 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_putLongVolatile:
   case vmIntrinsics::_putFloatVolatile:
   case vmIntrinsics::_putDoubleVolatile:
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  case vmIntrinsics::_putOrderedObject:
+  case vmIntrinsics::_putOrderedInt:
+  case vmIntrinsics::_putOrderedLong:
+#endif
   case vmIntrinsics::_getReferenceAcquire:
   case vmIntrinsics::_getBooleanAcquire:
   case vmIntrinsics::_getByteAcquire:

src/hotspot/share/opto/c2compiler.cpp

@@ -355,6 +355,11 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_putLongVolatile:          return inline_unsafe_access( is_store, T_LONG,     Volatile, false);
   case vmIntrinsics::_putFloatVolatile:         return inline_unsafe_access( is_store, T_FLOAT,    Volatile, false);
   case vmIntrinsics::_putDoubleVolatile:        return inline_unsafe_access( is_store, T_DOUBLE,   Volatile, false);
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  case vmIntrinsics::_putOrderedObject:         return inline_unsafe_access( is_store, T_OBJECT,   Release, false);
+  case vmIntrinsics::_putOrderedInt:            return inline_unsafe_access( is_store, T_INT,      Release, false);
+  case vmIntrinsics::_putOrderedLong:           return inline_unsafe_access( is_store, T_LONG,     Release, false);
+#endif
 
   case vmIntrinsics::_getShortUnaligned:        return inline_unsafe_access(!is_store, T_SHORT,    Relaxed, true);
   case vmIntrinsics::_getCharUnaligned:         return inline_unsafe_access(!is_store, T_CHAR,     Relaxed, true);

src/hotspot/share/opto/library_call.cpp

@@ -379,6 +379,13 @@ UNSAFE_ENTRY(jobject, Unsafe_AllocateInstance(JNIEnv *env, jobject unsafe, jclas
 UNSAFE_LEAF(jlong, Unsafe_AllocateMemory0(JNIEnv *env, jobject unsafe, jlong size)) {
   size_t sz = (size_t)size;
 
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  // classlib8 needs alignment here
+  if (!is_aligned(sz, HeapWordSize)) {
+    sz = align_up(sz, HeapWordSize);
+  }
+#endif
+
   assert(is_aligned(sz, HeapWordSize), "sz not aligned");
 
   void* x = os::malloc(sz, mtOther);
@@ -390,6 +397,13 @@ UNSAFE_LEAF(jlong, Unsafe_ReallocateMemory0(JNIEnv *env, jobject unsafe, jlong a
   void* p = addr_from_java(addr);
   size_t sz = (size_t)size;
 
+#if HOTSPOT_TARGET_CLASSLIB == 8
+  // classlib8 needs alignment here
+  if (!is_aligned(sz, HeapWordSize)) {
+    sz = align_up(sz, HeapWordSize);
+  }
+#endif
+
   assert(is_aligned(sz, HeapWordSize), "sz not aligned");
 
   void* x = os::realloc(p, sz, mtOther);