Mercurial > hg > release > icedtea6-1.6
changeset 1710:3786ee25cc7b
Fix JNI DEFINE_NEWSCALARARRAY usage of DT_RETURN_MARK_DECL_FOR.
2009-10-19 Mark Wielaard <mjw@redhat.com>
* patches/icedtea-systemtap.patch: Add fix for JNI
DEFINE_NEWSCALARARRAY uses DT_RETURN_MARK_DECL_FOR.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Mon, 19 Oct 2009 21:49:33 +0200 |
| parents | 4ed9452515ba |
| children | c399646ec5d7 |
| files | ChangeLog patches/icedtea-systemtap.patch |
| diffstat | 2 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 19 21:23:00 2009 +0200 +++ b/ChangeLog Mon Oct 19 21:49:33 2009 +0200 @@ -28,6 +28,11 @@ 2009-10-19 Mark Wielaard <mjw@redhat.com> + * patches/icedtea-systemtap.patch: Add fix for JNI + DEFINE_NEWSCALARARRAY uses DT_RETURN_MARK_DECL_FOR. + +2009-10-19 Mark Wielaard <mjw@redhat.com> + * patches/icedtea-systemtap.patch: Add fix for GetObjectArrayElement return probe ret value.
--- a/patches/icedtea-systemtap.patch Mon Oct 19 21:23:00 2009 +0200 +++ b/patches/icedtea-systemtap.patch Mon Oct 19 21:49:33 2009 +0200 @@ -44,6 +44,24 @@ return ret; } else { char buf[jintAsStringSize]; +@@ -2150,14 +2150,14 @@ + + #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); \ + diff -r 945bf7540697 src/share/vm/utilities/dtrace.hpp --- openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Thu Jan 22 14:42:01 2009 -0800 +++ openjdk/hotspot/src/share/vm/utilities/dtrace.hpp Mon Feb 02 13:47:34 2009 +0100