/hg/icedtea6: 2 new changesets

[mjw at icedtea.classpath.org]

changeset 39976f8fb2fb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=39976f8fb2fb
author: Mark Wielaard <mark at klomp.org>
date: Mon Oct 19 21:23:00 2009 +0200

	JNI GetObjectArrayElement mark probe ret value shadowed.

	2009-10-19 Mark Wielaard <mjw at redhat.com>

	 * patches/icedtea-systemtap.patch: Add fix for
	GetObjectArrayElement return probe ret value.


changeset 36c7480eedce in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=36c7480eedce
author: Mark Wielaard <mark at klomp.org>
date: Mon Oct 19 21:49:33 2009 +0200

	Fix JNI DEFINE_NEWSCALARARRAY usage of DT_RETURN_MARK_DECL_FOR.

	2009-10-19 Mark Wielaard <mjw at redhat.com>

	 * patches/icedtea-systemtap.patch: Add fix for JNI
	DEFINE_NEWSCALARARRAY uses DT_RETURN_MARK_DECL_FOR.


diffstat:

2 files changed, 37 insertions(+), 1 deletion(-)
ChangeLog                       |   10 ++++++++++
patches/icedtea-systemtap.patch |   28 +++++++++++++++++++++++++++-

diffs (55 lines):

diff -r 820a1a20046c -r 36c7480eedce ChangeLog
--- a/ChangeLog	Mon Oct 19 10:30:42 2009 +0200
+++ b/ChangeLog	Mon Oct 19 21:49:33 2009 +0200
@@ -1,3 +1,13 @@ 2009-10-19  Mark Wielaard  <mjw at redhat.c
+2009-10-19  Mark Wielaard  <mjw at redhat.com>
+
+	* patches/icedtea-systemtap.patch: Add fix for JNI
+	DEFINE_NEWSCALARARRAY uses DT_RETURN_MARK_DECL_FOR.
+
+2009-10-19  Mark Wielaard  <mjw at redhat.com>
+
+	* patches/icedtea-systemtap.patch: Add fix for GetObjectArrayElement
+	return probe ret value.
+
 2009-10-19  Mark Wielaard  <mjw at redhat.com>
 
 	* patches/icedtea-messageutils.patch: Removed. Applied in b17 as
diff -r 820a1a20046c -r 36c7480eedce patches/icedtea-systemtap.patch
--- a/patches/icedtea-systemtap.patch	Mon Oct 19 10:30:42 2009 +0200
+++ b/patches/icedtea-systemtap.patch	Mon Oct 19 21:49:33 2009 +0200
@@ -35,7 +35,33 @@ diff -r 945bf7540697 make/linux/makefile
  \
    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];
+@@ -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