Mercurial > hg > release > icedtea6-1.8
changeset 2028:8c46a40782ff
Shark calling static jni methods jclass argument fix.
2010-04-22 Xerxes R?nby <xerxes@zafena.se>
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp
(SharkNativeWrapper::initialize): Shark calling static jni
methods jclass argument fix.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Thu, 22 Apr 2010 11:16:37 +0200 |
| parents | 3d01ec99a8a6 |
| children | c30ad3953745 |
| files | ChangeLog ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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-22 Xerxes Rånby <xerxes@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@nigauri.org> * acinclude.m4 (IT_SET_ARCH_SETTINGS): Fix Hitachi SH settings.
--- 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 @@ 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);