jdk-sandbox: comparison src/hotspot/share/prims/jni.cpp

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceOop.hpp"
-#include "oops/markOop.hpp"
+#include "oops/markWord.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/compilationPolicy.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/events.hpp"
 #include "utilities/histogram.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
+#if INCLUDE_JVMCI
+#include "jvmci/jvmciCompiler.hpp"
+#endif
 static jint CurrentVersion = JNI_VERSION_10;
 #ifdef _WIN32
 extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* );
 loader = Handle(THREAD, k->class_loader());
 }
 }
 TempNewSymbol sym = SymbolTable::new_symbol(name);
-result = find_class_from_class_loader(env, sym, true, loader,
+result = find_class_from_class_loader(env, sym, true, true, loader,
 protection_domain, true, thread);
 if (log_is_enabled(Debug, class, resolve) && result != NULL) {
 trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
 }
 "java_super computation depends on interface, array, other super");
 obj = (super == NULL) ? NULL : (jclass) JNIHandles::make_local(super->java_mirror());
 return obj;
 JNI_END
-JNI_QUICK_ENTRY(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass super))
+JNI_ENTRY_NO_PRESERVE(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass super))
 JNIWrapper("IsSubclassOf");
 HOTSPOT_JNI_ISASSIGNABLEFROM_ENTRY(env, sub, super);
 oop sub_mirror   = JNIHandles::resolve_non_null(sub);
 oop super_mirror = JNIHandles::resolve_non_null(super);
 if (java_lang_Class::is_primitive(sub_mirror) ||
 java_lang_Class::is_primitive(super_mirror)) {
-jboolean ret = oopDesc::equals(sub_mirror, super_mirror);
+jboolean ret = (sub_mirror == super_mirror);
 HOTSPOT_JNI_ISASSIGNABLEFROM_RETURN(ret);
 return ret;
 }
 Klass* sub_klass   = java_lang_Class::as_Klass(sub_mirror);
 HOTSPOT_JNI_EXCEPTIONDESCRIBE_RETURN();
 JNI_END
-JNI_QUICK_ENTRY(void, jni_ExceptionClear(JNIEnv *env))
+JNI_ENTRY_NO_PRESERVE(void, jni_ExceptionClear(JNIEnv *env))
 JNIWrapper("ExceptionClear");
 HOTSPOT_JNI_EXCEPTIONCLEAR_ENTRY(env);
 // The jni code might be using this API to clear java thrown exception.
 JNIHandles::destroy_global(ref);
 HOTSPOT_JNI_DELETEGLOBALREF_RETURN();
 JNI_END
-JNI_QUICK_ENTRY(void, jni_DeleteLocalRef(JNIEnv *env, jobject obj))
+JNI_ENTRY_NO_PRESERVE(void, jni_DeleteLocalRef(JNIEnv *env, jobject obj))
 JNIWrapper("DeleteLocalRef");
 HOTSPOT_JNI_DELETELOCALREF_ENTRY(env, obj);
 JNIHandles::destroy_local(obj);
 HOTSPOT_JNI_DELETELOCALREF_RETURN();
 JNI_END
-JNI_QUICK_ENTRY(jboolean, jni_IsSameObject(JNIEnv *env, jobject r1, jobject r2))
+JNI_ENTRY_NO_PRESERVE(jboolean, jni_IsSameObject(JNIEnv *env, jobject r1, jobject r2))
 JNIWrapper("IsSameObject");
 HOTSPOT_JNI_ISSAMEOBJECT_ENTRY(env, r1, r2);
 jboolean ret = JNIHandles::is_same_object(r1, r2) ? JNI_TRUE : JNI_FALSE;
 // Invoke the method. Result is returned as oop.
 JavaCalls::call(result, method, &java_args, CHECK);
 // Convert result
-if (result->get_type() == T_OBJECT || result->get_type() == T_ARRAY) {
+if (is_reference_type(result->get_type())) {
 result->set_jobject(JNIHandles::make_local(env, (oop) result->get_jobject()));
 }
 }
 // Invoke the method. Result is returned as oop.
 JavaCalls::call(result, method, &java_args, CHECK);
 // Convert result
-if (result->get_type() == T_OBJECT || result->get_type() == T_ARRAY) {
+if (is_reference_type(result->get_type())) {
 result->set_jobject(JNIHandles::make_local(env, (oop) result->get_jobject()));
 }
 }
 HOTSPOT_JNI_GETOBJECTCLASS_RETURN(ret);
 return ret;
 JNI_END
-JNI_QUICK_ENTRY(jboolean, jni_IsInstanceOf(JNIEnv *env, jobject obj, jclass clazz))
+JNI_ENTRY_NO_PRESERVE(jboolean, jni_IsInstanceOf(JNIEnv *env, jobject obj, jclass clazz))
 JNIWrapper("IsInstanceOf");
 HOTSPOT_JNI_ISINSTANCEOF_ENTRY(env, obj, clazz);
 jboolean ret = JNI_TRUE;
 , EntryProbe, ReturnProbe) \
 \
 DT_RETURN_MARK_DECL_FOR(Result, Get##Result##Field, Return \
 , ReturnProbe); \
 \
-JNI_QUICK_ENTRY(Return, jni_Get##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID)) \
+JNI_ENTRY_NO_PRESERVE(Return, jni_Get##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID)) \
 JNIWrapper("Get" XSTR(Result) "Field"); \
 \
 EntryProbe; \
 Return ret = 0;\
 DT_RETURN_MARK_FOR(Result, Get##Result##Field, Return, (const Return&)ret);\
 }
 address jni_GetDoubleField_addr() {
 return (address)jni_GetDoubleField;
 }
-JNI_QUICK_ENTRY(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID, jobject value))
+JNI_ENTRY_NO_PRESERVE(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID, jobject value))
 JNIWrapper("SetObjectField");
 HOTSPOT_JNI_SETOBJECTFIELD_ENTRY(env, obj, (uintptr_t) fieldID, value);
 oop o = JNIHandles::resolve_non_null(obj);
 Klass* k = o->klass();
 int offset = jfieldIDWorkaround::from_instance_jfieldID(k, fieldID);
 #define DEFINE_SETFIELD(Argument,Fieldname,Result,SigType,unionType \
 , EntryProbe, ReturnProbe) \
 \
-JNI_QUICK_ENTRY(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
+JNI_ENTRY_NO_PRESERVE(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfieldID fieldID, Argument value)) \
 JNIWrapper("Set" XSTR(Result) "Field"); \
 \
 EntryProbe; \
 \
 oop o = JNIHandles::resolve_non_null(obj); \
 ret = (jstring) JNIHandles::make_local(env, string);
 return ret;
 JNI_END
-JNI_QUICK_ENTRY(jsize, jni_GetStringLength(JNIEnv *env, jstring string))
+JNI_ENTRY_NO_PRESERVE(jsize, jni_GetStringLength(JNIEnv *env, jstring string))
 JNIWrapper("GetStringLength");
 HOTSPOT_JNI_GETSTRINGLENGTH_ENTRY(env, string);
 jsize ret = 0;
 oop s = JNIHandles::resolve_non_null(string);
 ret = java_lang_String::length(s);
 HOTSPOT_JNI_GETSTRINGLENGTH_RETURN(ret);
 return ret;
 JNI_END
-JNI_QUICK_ENTRY(const jchar*, jni_GetStringChars(
+JNI_ENTRY_NO_PRESERVE(const jchar*, jni_GetStringChars(
 JNIEnv *env, jstring string, jboolean *isCopy))
 JNIWrapper("GetStringChars");
 HOTSPOT_JNI_GETSTRINGCHARS_ENTRY(env, string, (uintptr_t *) isCopy);
 jchar* buf = NULL;
 oop s = JNIHandles::resolve_non_null(string);
 HOTSPOT_JNI_GETSTRINGCHARS_RETURN(buf);
 return buf;
 JNI_END
-JNI_QUICK_ENTRY(void, jni_ReleaseStringChars(JNIEnv *env, jstring str, const jchar *chars))
+JNI_ENTRY_NO_PRESERVE(void, jni_ReleaseStringChars(JNIEnv *env, jstring str, const jchar *chars))
 JNIWrapper("ReleaseStringChars");
 HOTSPOT_JNI_RELEASESTRINGCHARS_ENTRY(env, str, (uint16_t *) chars);
 //%note jni_6
 if (chars != NULL) {
 // Since String objects are supposed to be immutable, don't copy any
 }
 HOTSPOT_JNI_RELEASESTRINGUTFCHARS_RETURN();
 JNI_END
-JNI_QUICK_ENTRY(jsize, jni_GetArrayLength(JNIEnv *env, jarray array))
+JNI_ENTRY_NO_PRESERVE(jsize, jni_GetArrayLength(JNIEnv *env, jarray array))
 JNIWrapper("GetArrayLength");
 HOTSPOT_JNI_GETARRAYLENGTH_ENTRY(env, array);
 arrayOop a = arrayOop(JNIHandles::resolve_non_null(array));
 assert(a->is_array(), "must be array");
 jsize ret = a->length();
 #define DEFINE_GETSCALARARRAYELEMENTS(ElementTag,ElementType,Result, Tag \
 , EntryProbe, ReturnProbe) \
 \
-JNI_QUICK_ENTRY(ElementType*, \
+JNI_ENTRY_NO_PRESERVE(ElementType*, \
 jni_Get##Result##ArrayElements(JNIEnv *env, ElementType##Array array, jboolean *isCopy)) \
 JNIWrapper("Get" XSTR(Result) "ArrayElements"); \
 EntryProbe; \
 /* allocate an chunk of memory in c land */ \
 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
 #define DEFINE_RELEASESCALARARRAYELEMENTS(ElementTag,ElementType,Result,Tag \
 , EntryProbe, ReturnProbe);\
 \
-JNI_QUICK_ENTRY(void, \
+JNI_ENTRY_NO_PRESERVE(void, \
 jni_Release##Result##ArrayElements(JNIEnv *env, ElementType##Array array, \
 ElementType *buf, jint mode)) \
 JNIWrapper("Release" XSTR(Result) "ArrayElements"); \
 EntryProbe; \
 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
 JNIHandles::destroy_weak_global(ref);
 HOTSPOT_JNI_DELETEWEAKGLOBALREF_RETURN();
 JNI_END
-JNI_QUICK_ENTRY(jboolean, jni_ExceptionCheck(JNIEnv *env))
+JNI_ENTRY_NO_PRESERVE(jboolean, jni_ExceptionCheck(JNIEnv *env))
 JNIWrapper("jni_ExceptionCheck");
 HOTSPOT_JNI_EXCEPTIONCHECK_ENTRY(env);
 jni_check_async_exceptions(thread);
 jboolean ret = (thread->has_pending_exception()) ? JNI_TRUE : JNI_FALSE;
 HOTSPOT_JNI_EXCEPTIONCHECK_RETURN(ret);
 static jclass lookupOne(JNIEnv* env, const char* name, TRAPS) {
 Handle loader;            // null (bootstrap) loader
 Handle protection_domain; // null protection domain
 TempNewSymbol sym = SymbolTable::new_symbol(name);
-jclass result =  find_class_from_class_loader(env, sym, true, loader, protection_domain, true, CHECK_NULL);
+jclass result =  find_class_from_class_loader(env, sym, true, true, loader, protection_domain, true, CHECK_NULL);
 if (log_is_enabled(Debug, class, resolve) && result != NULL) {
 trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
 }
 return result;
 }
 }
 void quicken_jni_functions() {
 // Replace Get<Primitive>Field with fast versions
-if (UseFastJNIAccessors && !JvmtiExport::can_post_field_access()
+if (UseFastJNIAccessors && !VerifyJNIFields && !CountJNICalls && !CheckJNICalls) {
-&& !VerifyJNIFields && !CountJNICalls && !CheckJNICalls) {
 address func;
 func = JNI_FastGetField::generate_fast_get_boolean_field();
 if (func != (address)-1) {
 jni_NativeInterface.GetBooleanField = (GetBooleanField_t)func;
 }
 thread->initialize_tlab();
 thread->cache_global_variables();
-// Crucial that we do not have a safepoint check for this thread, since it has
+// This thread will not do a safepoint check, since it has
 // not been added to the Thread list yet.
-{ Threads_lock->lock_without_safepoint_check();
+{ MutexLocker ml(Threads_lock);
 // This must be inside this lock in order to get FullGCALot to work properly, i.e., to
 // avoid this thread trying to do a GC before it is added to the thread-list
 thread->set_active_handles(JNIHandleBlock::allocate_block());
 Threads::add(thread, daemon);
-Threads_lock->unlock();
 }
 // Create thread group and name info from attach arguments
 oop group = NULL;
 char* thread_name = NULL;
 if (args != NULL && Threads::is_supported_jni_version(args->version)) {

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 54847	59ea39bb2809
child 58679	9c3209ff7550