changeset 1592:188882817ac2

PR icedtea/323 * patches/icedtea-zero.patch (JNIHandles::is_frame_handle) Changed stack boundary during compare to include the whole zero stack.
author Xerxes R?nby <xerxes@zafena.se>
date Wed, 10 Jun 2009 14:13:59 +0200
parents 852af6e8bf0e
children ce70ed27635c
files ChangeLog patches/icedtea-zero.patch
diffstat 2 files changed, 23 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 09 14:08:52 2009 -0400
+++ b/ChangeLog	Wed Jun 10 14:13:59 2009 +0200
@@ -1,3 +1,10 @@
+2009-06-10  Xerxes RĂ„nby  <xerxes@zafena.se>
+
+	PR icedtea/323
+	* patches/icedtea-zero.patch
+	(JNIHandles::is_frame_handle) Changed stack boundary
+	during compare to include the whole zero stack.
+
 2009-06-09  Omair Majid  <omajid@redhat.com>
 
 	* rt/net/sourceforge/jnlp/AssociationDesc.java: New file.
--- a/patches/icedtea-zero.patch	Tue Jun 09 14:08:52 2009 -0400
+++ b/patches/icedtea-zero.patch	Wed Jun 10 14:13:59 2009 +0200
@@ -221,3 +221,19 @@
          }
       }
  
+Index: openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp
+===================================================================
+--- openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp.orig	2009-06-10 11:30:46.000000000 +0200
++++ openjdk/hotspot/src/share/vm/runtime/jniHandles.cpp	2009-06-10 11:37:07.000000000 +0200
+@@ -173,7 +173,11 @@
+   // is not permitted.
+   return (thr->has_last_Java_frame() &&
+          (void*)obj < (void*)thr->stack_base() &&
++#ifdef ZERO
++         (void*)obj >= (void*)os::current_stack_pointer());
++#else
+          (void*)obj >= (void*)thr->last_Java_sp());
++#endif // ZERO
+ }
+ 
+