stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6893483: DTrace probe return values for a couple JNI methods are wrong

Browse Source 
Fix the shadowing and incorrect macro usages

Reviewed-by: coleenp
This commit is contained in:
Keith McGuigan 2009-10-20 16:34:08 -04:00
parent 35ca20c546
commit 6dfb497d00
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/prims/jni.cpp
View File

@ -2116,7 +2116,7 @@ JNI_ENTRY(jobject, jni_GetObjectArrayElement(JNIEnv *env, jobjectArray array, js
DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret);
objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(array));
if (a->is_within_bounds(index)) {
jobject ret = JNIHandles::make_local(env, a->obj_at(index));
ret = JNIHandles::make_local(env, a->obj_at(index));
return ret;
} else {
char buf[jintAsStringSize];
@ -2150,14 +2150,14 @@ JNI_END
#define DEFINE_NEWSCALARARRAY(Return,Allocator,Result) \
\
DT_RETURN_MARK_DECL_FOR(Result, New##Result##Array, Return);\
DT_RETURN_MARK_DECL(New##Result##Array, Return);\
\
JNI_ENTRY(Return, \
jni_New##Result##Array(JNIEnv *env, jsize len)) \
JNIWrapper("New" XSTR(Result) "Array"); \
DTRACE_PROBE2(hotspot_jni, New##Result##Array__entry, env, len);\
Return ret = NULL;\
DT_RETURN_MARK_FOR(Result, New##Result##Array, Return, (const Return&)ret);\
DT_RETURN_MARK(New##Result##Array, Return, (const Return&)ret);\
\
oop obj= oopFactory::Allocator(len, CHECK_0); \
ret = (Return) JNIHandles::make_local(env, obj); \