/hg/icedtea7-forest/hotspot: 8076212, PR2314: AllocateHeap() and...

[andrew at icedtea.classpath.org]

changeset 1bdef44123cd in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=1bdef44123cd
author: ysuenaga
date: Thu May 07 18:35:46 2015 +0100

	8076212, PR2314: AllocateHeap() and ReallocateHeap() should be inlined.
	Summary: NMT with detail option reports incorrect caller address on Linux.
	Reviewed-by: dholmes, coleenp, andrew


diffstat:

 src/share/vm/memory/allocation.inline.hpp |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r 9a48f5640626 -r 1bdef44123cd src/share/vm/memory/allocation.inline.hpp
--- a/src/share/vm/memory/allocation.inline.hpp	Wed Apr 15 00:46:59 2015 +0100
+++ b/src/share/vm/memory/allocation.inline.hpp	Thu May 07 18:35:46 2015 +0100
@@ -48,6 +48,9 @@
 #endif
 
 // allocate using malloc; will fail if no memory available
+#ifdef __GNUC__
+__attribute__((always_inline))
+#endif
 inline char* AllocateHeap(size_t size, MEMFLAGS flags, address pc = 0,
      AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
   if (pc == 0) {
@@ -62,6 +65,9 @@
   return p;
 }
 
+#ifdef __GNUC__
+__attribute__((always_inline))
+#endif
 inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flags,
     AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
   char* p = (char*) os::realloc(old, size, flags, CURRENT_PC);