# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1255981773 -7200
# Node ID 3786ee25cc7b4c612c2e009987ef9291db076bfe
# Parent  4ed9452515bad25c7fab285532385c338802912d
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.

diff -r 4ed9452515ba -r 3786ee25cc7b ChangeLog
--- 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.
 
diff -r 4ed9452515ba -r 3786ee25cc7b patches/icedtea-systemtap.patch
--- 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