Mercurial > hg > graal-jvmci-8
changeset 23003:0f0188a02ecb
Merge
| author | coleenp |
|---|---|
| date | Mon, 04 May 2015 16:53:05 +0000 |
| parents | ed0067c67bd7 (diff) 37d4d581f698 (current diff) |
| children | 9a23a160ca57 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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);