jdk8-mips64-public/hotspot: comparison src/share/vm/prims/jniCheck.cpp

-:33c52908bcdb
+:39deebbc90b3
 static const char * fatal_class_not_a_throwable_class = "JNI Throw or ThrowNew received a class argument that is not a Throwable or Throwable subclass";
 static const char * fatal_wrong_class_or_method = "Wrong object class or methodID passed to JNI call";
 static const char * fatal_non_weak_method = "non-weak methodID passed to JNI call";
 static const char * fatal_unknown_array_object = "Unknown array object passed to JNI array operations";
 static const char * fatal_object_array_expected = "Object array expected but not received for JNI array operation";
+static const char * fatal_prim_type_array_expected = "Primitive type array expected but not received for JNI array operation";
 static const char * fatal_non_array  = "Non-array passed to JNI array operations";
 static const char * fatal_element_type_mismatch = "Array element type mismatch in JNI";
 static const char * fatal_should_be_static = "Non-static field ID passed to JNI";
 static const char * fatal_wrong_static_field = "Wrong static field ID passed to JNI";
 static const char * fatal_static_field_not_found = "Static field not found in JNI get/set field operations";
 oop s = jniCheck::validate_object(thr, js);
 if (!s || !java_lang_String::is_instance(s))
 ReportJNIFatalError(thr, fatal_non_string);
 }
-static inline void
+static inline arrayOop
-checkArray(JavaThread* thr, jarray jArray, int elementType)
+check_is_array(JavaThread* thr, jarray jArray)
 {
 ASSERT_OOPS_ALLOWED;
 arrayOop aOop;
 aOop = (arrayOop)jniCheck::validate_object(thr, jArray);
-if (aOop == NULL || !aOop->is_array())
+if (aOop == NULL || !aOop->is_array()) {
 ReportJNIFatalError(thr, fatal_non_array);
-if (elementType != -1) {
-if (aOop->is_typeArray()) {
-BasicType array_type = TypeArrayKlass::cast(aOop->klass())->element_type();
-if (array_type != elementType)
-ReportJNIFatalError(thr, fatal_element_type_mismatch);
-} else if (aOop->is_objArray()) {
-if ( T_OBJECT != elementType)
-ReportJNIFatalError(thr, fatal_object_array_expected);
-} else {
-ReportJNIFatalError(thr, fatal_unknown_array_object);
-}
 }
-}
+return aOop;
+}
+static inline arrayOop
+check_is_primitive_array(JavaThread* thr, jarray jArray) {
+arrayOop aOop = check_is_array(thr, jArray);
+if (!aOop->is_typeArray()) {
+ReportJNIFatalError(thr, fatal_prim_type_array_expected);
+}
+return aOop;
+}
+static inline void
+check_primitive_array_type(JavaThread* thr, jarray jArray, BasicType elementType)
+{
+BasicType array_type;
+arrayOop aOop;
+aOop = check_is_primitive_array(thr, jArray);
+array_type = TypeArrayKlass::cast(aOop->klass())->element_type();
+if (array_type != elementType) {
+ReportJNIFatalError(thr, fatal_element_type_mismatch);
+}
+}
+static inline void
+check_is_obj_array(JavaThread* thr, jarray jArray) {
+BasicType array_type;
+arrayOop aOop;
+aOop = check_is_array(thr, jArray);
+array_type = TypeArrayKlass::cast(aOop->klass())->element_type();
+if (array_type != T_OBJECT) {
+ReportJNIFatalError(thr, fatal_object_array_expected);
+}
+}
 oop jniCheck::validate_handle(JavaThread* thr, jobject obj) {
 if (JNIHandles::is_frame_handle(thr, obj) ||
 JNIHandles::is_local_handle(thr, obj) ||
 JNIHandles::is_global_handle(obj) ||
 JNI_ENTRY_CHECKED(jsize,
 checked_jni_GetArrayLength(JNIEnv *env,
 jarray array))
 functionEnter(thr);
 IN_VM(
-checkArray(thr, array, -1);
+check_is_array(thr, array);
 )
 jsize result = UNCHECKED()->GetArrayLength(env,array);
 functionExit(env);
 return result;
 JNI_END
 checked_jni_GetObjectArrayElement(JNIEnv *env,
 jobjectArray array,
 jsize index))
 functionEnter(thr);
 IN_VM(
-checkArray(thr, array, T_OBJECT);
+check_is_obj_array(thr, array);
 )
 jobject result = UNCHECKED()->GetObjectArrayElement(env,array,index);
 functionExit(env);
 return result;
 JNI_END
 jobjectArray array,
 jsize index,
 jobject val))
 functionEnter(thr);
 IN_VM(
-checkArray(thr, array, T_OBJECT);
+check_is_obj_array(thr, array);
 )
 UNCHECKED()->SetObjectArrayElement(env,array,index,val);
 functionExit(env);
 JNI_END
 checked_jni_Get##Result##ArrayElements(JNIEnv *env, \
 ElementType##Array array, \
 jboolean *isCopy)) \
 functionEnter(thr); \
 IN_VM( \
-checkArray(thr, array, ElementTag); \
+check_primitive_array_type(thr, array, ElementTag); \
 ) \
 ElementType *result = UNCHECKED()->Get##Result##ArrayElements(env, \
 array, \
 isCopy); \
 functionExit(env); \
 ElementType##Array array, \
 ElementType *elems, \
 jint mode)) \
 functionEnterExceptionAllowed(thr); \
 IN_VM( \
-checkArray(thr, array, ElementTag); \
+check_primitive_array_type(thr, array, ElementTag); \
 ASSERT_OOPS_ALLOWED; \
 typeArrayOop a = typeArrayOop(JNIHandles::resolve_non_null(array)); \
 /* cannot check validity of copy, unless every request is logged by
 * checking code.  Implementation of this check is deferred until a
 * subsequent release.
 jsize start, \
 jsize len, \
 ElementType *buf)) \
 functionEnter(thr); \
 IN_VM( \
-checkArray(thr, array, ElementTag); \
+check_primitive_array_type(thr, array, ElementTag); \
 ) \
 UNCHECKED()->Get##Result##ArrayRegion(env,array,start,len,buf); \
 functionExit(env); \
 JNI_END
 jsize start, \
 jsize len, \
 const ElementType *buf)) \
 functionEnter(thr); \
 IN_VM( \
-checkArray(thr, array, ElementTag); \
+check_primitive_array_type(thr, array, ElementTag); \
 ) \
 UNCHECKED()->Set##Result##ArrayRegion(env,array,start,len,buf); \
 functionExit(env); \
 JNI_END
 checked_jni_GetPrimitiveArrayCritical(JNIEnv *env,
 jarray array,
 jboolean *isCopy))
 functionEnterCritical(thr);
 IN_VM(
-checkArray(thr, array, -1);
+check_is_primitive_array(thr, array);
 )
 void *result = UNCHECKED()->GetPrimitiveArrayCritical(env, array, isCopy);
 functionExit(env);
 return result;
 JNI_END
 jarray array,
 void *carray,
 jint mode))
 functionEnterCriticalExceptionAllowed(thr);
 IN_VM(
-checkArray(thr, array, -1);
+check_is_primitive_array(thr, array);
 )
 /* The Hotspot JNI code does not use the parameters, so just check the
 * array parameter as a minor sanity check
 */
 UNCHECKED()->ReleasePrimitiveArrayCritical(env, array, carray, mode);

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/prims/jniCheck.cpp

src/share/vm/prims/jniCheck.cpp