/hg/icedtea7: jstack.stp should be adapted CR#7172967

[yasuenag at icedtea.classpath.org]

changeset 8599fdfc398d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8599fdfc398d
author: Yasumasa Suenaga  <yasu at ysfactory.dip.jp>
date: Wed Oct 02 12:26:39 2013 +0900

	jstack.stp should be adapted CR#7172967
	Reviewed-by: Jiri Vanek  <jvanek at redhat.com> , Andrew Hughes  <gnu.andrew at redhat.com>
	Review-thread: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024880.html


diffstat:

 ChangeLog            |  4 ++++
 tapset/jstack.stp.in |  8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r c3c661000904 -r 8599fdfc398d ChangeLog
--- a/ChangeLog	Tue Sep 24 03:48:26 2013 +0100
+++ b/ChangeLog	Wed Oct 02 12:26:39 2013 +0900
@@ -1,3 +1,7 @@
+2013-10-02  Yasumasa Suenaga  <yasu at ysfactory.dip.jp>
+
+	* jstack.stp should be adapted CR#7172967
+
 2013-09-23  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Add 2.4.2 release notes.
diff -r c3c661000904 -r 8599fdfc398d tapset/jstack.stp.in
--- a/tapset/jstack.stp.in	Tue Sep 24 03:48:26 2013 +0100
+++ b/tapset/jstack.stp.in	Wed Oct 02 12:26:39 2013 +0900
@@ -85,7 +85,9 @@
   Universe_collectedHeap[pid()] = %( systemtap_v >= "1.8"
                                     %? @var("_collectedHeap at universe.cpp")
                                     %: $_collectedHeap %);
-  HeapWordSize[pid()] = $HeapWordSize;
+  HeapWordSize[pid()] = %( systemtap_v >= "1.8"
+                          %? @var("HeapWordSize")
+                          %: $HeapWordSize %);
 
   /**
    * The CodeCache class contains the static CodeHeap _heap that
@@ -395,7 +397,9 @@
                   // package name separator and that the method signature is
                   // encoded as a method descriptor string. Both of which we
                   // don't demangle here.
-                  constantPoolOopDesc = @cast(methodOopPtr, "methodOopDesc",
+                  constMethodOopPtr = @cast(methodOopPtr, "methodOopDesc",
+                                            "@ABS_SERVER_LIBJVM_SO@")->_constMethod;
+                  constantPoolOopDesc = @cast(constMethodOopPtr, "constMethodOopDesc",
                                               "@ABS_SERVER_LIBJVM_SO@")->_constants;
                   constantPoolOop_base = constantPoolOopDesc + constantPoolOopDesc_size;