# HG changeset patch
# User coleenp
# Date 1430758385 0
# Node ID 0f0188a02ecb851cc93a26cf4c0114cba2e8c931
# Parent  ed0067c67bd745bd594c6eac5224555acb895418# Parent  37d4d581f698c5df38c9fb5e6203577637d8280b
Merge

diff -r 37d4d581f698 -r 0f0188a02ecb src/share/vm/memory/allocation.inline.hpp
--- a/src/share/vm/memory/allocation.inline.hpp	Sat May 02 00:20:54 2015 +0000
+++ b/src/share/vm/memory/allocation.inline.hpp	Mon May 04 16:53:05 2015 +0000
@@ -62,11 +62,18 @@
   }
   return p;
 }
+
+#ifdef __GNUC__
+__attribute__((always_inline))
+#endif
 inline char* AllocateHeap(size_t size, MEMFLAGS flags,
     AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
   return AllocateHeap(size, flags, CURRENT_PC, alloc_failmode);
 }
 
+#ifdef __GNUC__
+__attribute__((always_inline))
+#endif
 inline char* ReallocateHeap(char *old, size_t size, MEMFLAGS flag,
     AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM) {
   char* p = (char*) os::realloc(old, size, flag, CURRENT_PC);