archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Gary Collins 2012-10-12 10:49:39 -07:00
commit ad3844358d
57 changed files with 1064 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/prims/jni.cpp
View file

@ -3003,9 +3003,9 @@ JNI_ENTRY(jobject, jni_GetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID
HOTSPOT_JNI_GETSTATICOBJECTFIELD_ENTRY(
env, clazz, (uintptr_t) fieldID);
#endif /* USDT2 */
#ifndef JNICHECK_KERNEL
#if INCLUDE_JNI_CHECK
DEBUG_ONLY(Klass* param_k = jniCheck::validate_class(thread, clazz);)
#endif // JNICHECK_KERNEL
#endif // INCLUDE_JNI_CHECK
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID);
assert(id->is_static_field_id(), "invalid static field id");
// Keep JVMTI addition small and only check enabled flag here.
@ -3950,6 +3950,7 @@ DEFINE_SETSCALARARRAYREGION(T_DOUBLE, jdouble, Double, double
// SetNativeMethodPrefix(es) functions in the JVM TI Spec for details.
static Method* find_prefixed_native(KlassHandle k,
Symbol* name, Symbol* signature, TRAPS) {
#if INCLUDE_JVMTI
ResourceMark rm(THREAD);
Method* method;
int name_len = name->utf8_length();
@ -3981,6 +3982,7 @@ static Method* find_prefixed_native(KlassHandle k,
name_len = trial_len;
name_str = trial_name_str;
}
#endif // INCLUDE_JVMTI
return NULL; // not found
}
@ -4974,11 +4976,9 @@ void quicken_jni_functions() {
// Returns the function structure
struct JNINativeInterface_* jni_functions() {
#ifndef JNICHECK_KERNEL
#if INCLUDE_JNI_CHECK
if (CheckJNICalls) return jni_functions_check();
#else // JNICHECK_KERNEL
if (CheckJNICalls) warning("-Xcheck:jni is not supported in kernel vm.");
#endif // JNICHECK_KERNEL
#endif // INCLUDE_JNI_CHECK
return &jni_NativeInterface;
}