# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1510600127 0
# Node ID 8165ef17735a4989d3fe1bfc02fd542325cbe253
# Parent  ac075b2d46d6959d5d56c03e9bb92c0514a87d18
PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly

2017-10-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
	* AUTHORS: Add Severin.
	* NEWS: Updated.

2017-09-15  Severin Gehwolf  <sgehwolf@redhat.com>

	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
	* tapset/hotspot.stp.in:
	Revert HeapWordSize addition made to match
	systemtap-alloc-size-workaround.patch, which
	has since been removed.

diff -r ac075b2d46d6 -r 8165ef17735a AUTHORS
--- a/AUTHORS	Sun Nov 12 23:17:59 2017 +0000
+++ b/AUTHORS	Mon Nov 13 19:08:47 2017 +0000
@@ -16,6 +16,7 @@
 Matthew Flaschen <matthew.flaschen@gatech.edu>
 Michael Franz <mvfranz@gmail.com>
 Kyle Galloway <kgallowa@redhat.com>
+Severin Gehwolf <sgehwolf@redhat.com>
 Dennis Gilmore <dgilmore@redhat.com>
 Andrew Haley <aph@redhat.com>
 C. K. Jester-Young <cky944@gmail.com>
diff -r ac075b2d46d6 -r 8165ef17735a ChangeLog
--- a/ChangeLog	Sun Nov 12 23:17:59 2017 +0000
+++ b/ChangeLog	Mon Nov 13 19:08:47 2017 +0000
@@ -1,3 +1,17 @@
+2017-10-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
+	* AUTHORS: Add Severin.
+	* NEWS: Updated.
+
+2017-09-15  Severin Gehwolf  <sgehwolf@redhat.com>
+
+	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
+	* tapset/hotspot.stp.in:
+	Revert HeapWordSize addition made to match
+	systemtap-alloc-size-workaround.patch, which
+	has since been removed.
+
 2017-11-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-2.7.0pre15.
diff -r ac075b2d46d6 -r 8165ef17735a NEWS
--- a/NEWS	Sun Nov 12 23:17:59 2017 +0000
+++ b/NEWS	Mon Nov 13 19:08:47 2017 +0000
@@ -26,6 +26,7 @@
   - S8188030, PR3460, RH1484079: AWT java apps fail to start when some minimal fonts are present
 * Bug fixes
   - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466
+  - PR3470, RH1492139: Hotspot object_alloc tapset uses HeapWordSize incorrectly
   - PR3480, RH1486025: ECC and NSS JVM crash
 * AArch64 port
   - S8145438, PR3443, RH1482244: Guarantee failures since 8144028: Use AArch64 bit-test instructions in C2
diff -r ac075b2d46d6 -r 8165ef17735a tapset/hotspot.stp.in
--- a/tapset/hotspot.stp.in	Sun Nov 12 23:17:59 2017 +0000
+++ b/tapset/hotspot.stp.in	Mon Nov 13 19:08:47 2017 +0000
@@ -120,7 +120,7 @@
   name = "object_alloc";
   thread_id = $arg1;
   class = user_string_n($arg2, $arg3);
-  size = $arg4 * $HeapWordSize; // Note - systemtap-alloc-size-workaround.patch
+  size = $arg4;
   probestr = sprintf("%s(thread_id=%d,class='%s',size=0x%x)",
                      name, thread_id, class, size);
 }