/hg/release/icedtea6-1.8: Shark calling static jni methods jclas...

[xranby at icedtea.classpath.org]

changeset 8c46a40782ff in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=8c46a40782ff
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Apr 22 11:16:37 2010 +0200

	Shark calling static jni methods jclass argument fix.

	2010-04-22 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
	(SharkNativeWrapper::initialize): Shark calling static jni
	methods jclass argument fix.


diffstat:

2 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog                                               |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |    3 ++-

diffs (26 lines):

diff -r 3d01ec99a8a6 -r 8c46a40782ff ChangeLog
--- a/ChangeLog	Thu Apr 22 07:48:15 2010 +0200
+++ b/ChangeLog	Thu Apr 22 11:16:37 2010 +0200
@@ -1,3 +1,9 @@ 2010-04-04  Nobuhiro Iwamatsu <iwamatsu@
+2010-04-22  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
+	(SharkNativeWrapper::initialize): Shark calling static jni
+	methods jclass argument fix.
+
 2010-04-04  Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
 
 	* acinclude.m4 (IT_SET_ARCH_SETTINGS): Fix Hitachi SH settings.
diff -r 3d01ec99a8a6 -r 8c46a40782ff ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp	Thu Apr 22 07:48:15 2010 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp	Thu Apr 22 11:16:37 2010 +0200
@@ -98,7 +98,8 @@ void SharkNativeWrapper::initialize(cons
   if (is_static()) {
     builder()->CreateStore(
       builder()->CreateInlineOop(
-        JNIHandles::make_local(target()->method_holder())),
+        JNIHandles::make_local(
+        target()->method_holder()->klass_part()->java_mirror())),
       oop_tmp_slot());
 
     param_types.push_back(box_type);