Mercurial > hg > release > icedtea6-1.5
changeset 1584:397c2dcd4a51
JNI GetObjectArrayElement mark probe ret value shadowed.
2009-10-19 Mark Wielaard <mjw@redhat.com>
* patches/icedtea-systemtap.patch: Add fix for GetObjectArrayElement
return probe ret value.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Mon, 19 Oct 2009 21:23:00 +0200 |
| parents | 58b7ae54c4de |
| children | 6bb9237570f2 |
| files | ChangeLog patches/icedtea-systemtap.patch |
| diffstat | 2 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 14 15:42:32 2009 +0200 +++ b/ChangeLog Mon Oct 19 21:23:00 2009 +0200 @@ -4,6 +4,11 @@ icedtea-6897844-xshm.patch, icedtea-linux-separate-debuginfo.patch. +2009-10-19 Mark Wielaard <mjw@redhat.com> + + * patches/icedtea-systemtap.patch: Add fix for GetObjectArrayElement + return probe ret value. + 2009-10-14 Mark Wielaard <mjw@redhat.com> * configure.ac: When enabling systemtap support check sys/sdt.h
--- a/patches/icedtea-systemtap.patch Wed Oct 14 15:42:32 2009 +0200 +++ b/patches/icedtea-systemtap.patch Mon Oct 19 21:23:00 2009 +0200 @@ -35,7 +35,15 @@ \ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID); \ assert(id->is_static_field_id(), "invalid static field id"); \ -- +@@ -2116,7 +2101,7 @@ + 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]; 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