stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8221149: os::malloc checks MallocCatchPtr outside of ifdef ASSERT block

Browse Source 
Reviewed-by: stuefe, dholmes
This commit is contained in:
Stefan Karlsson 2019-04-01 18:36:01 +02:00
parent 31ac44b710
commit 2480e3aa18
1 changed files with 7 additions and 6 deletions

13
src/hotspot/share/runtime/os.cpp

@ -704,12 +704,15 @@ void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
// Wrap memory with guard
GuardedMemory guarded(ptr, size + nmt_header_size);
ptr = guarded.get_user_ptr();
#endif
if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) {
log_warning(malloc, free)("os::malloc caught, " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, p2i(ptr));
breakpoint();
}
debug_only(if (paranoid) verify_memory(ptr));
if (paranoid) {
verify_memory(ptr);
}
#endif
// we do not track guard memory
return MemTracker::record_malloc((address)ptr, size, memflags, stack, level);
@ -760,10 +763,8 @@ void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCa
// Guard's user data contains NMT header
size_t memblock_size = guarded.get_user_size() - MemTracker::malloc_header_size(memblock);
memcpy(ptr, memblock, MIN2(size, memblock_size));
if (paranoid) verify_memory(MemTracker::malloc_base(ptr));
if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) {
log_warning(malloc, free)("os::realloc caught, " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, p2i(ptr));
breakpoint();
if (paranoid) {
verify_memory(MemTracker::malloc_base(ptr));
}
os::free(memblock);
}