Mercurial > hg > openjdk > jdk9 > hotspot
changeset 11818:a83994c1cd49
8133740: NMT for Linux/x86/x64 and bsd/x64 slowdebug builds includes NativeCallStack::NativeCallStack() frame in backtrace
Summary: Skip an extra frame in _get_previous_fp() when it is not inlined.
Reviewed-by: dholmes, zgu
author | cjplummer |
---|---|
date | Mon, 15 Aug 2016 13:14:08 -0700 |
parents | 8f2230e4c0ed |
children | 5fd233e7cdc7 |
files | src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp src/os_cpu/linux_x86/vm/os_linux_x86.cpp src/os_cpu/windows_x86/vm/os_windows_x86.cpp |
diffstat | 3 files changed, 26 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Aug 15 13:13:48 2016 -0700 +++ b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Mon Aug 15 13:14:08 2016 -0700 @@ -417,7 +417,15 @@ #else register intptr_t **ebp __asm__ (SPELL_REG_FP); #endif - return (intptr_t*) *ebp; // we want what it points to. + // ebp is for this frame (_get_previous_fp). We want the ebp for the + // caller of os::current_frame*(), so go up two frames. However, for + // optimized builds, _get_previous_fp() will be inlined, so only go + // up 1 frame in that case. +#ifdef _NMT_NOINLINE_ + return **(intptr_t***)ebp; +#else + return *ebp; +#endif }
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Aug 15 13:13:48 2016 -0700 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Aug 15 13:14:08 2016 -0700 @@ -235,7 +235,15 @@ #else register intptr_t **ebp __asm__ (SPELL_REG_FP); #endif - return (intptr_t*) *ebp; // we want what it points to. + // ebp is for this frame (_get_previous_fp). We want the ebp for the + // caller of os::current_frame*(), so go up two frames. However, for + // optimized builds, _get_previous_fp() will be inlined, so only go + // up 1 frame in that case. +#ifdef _NMT_NOINLINE_ + return **(intptr_t***)ebp; +#else + return *ebp; +#endif }
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Mon Aug 15 13:13:48 2016 -0700 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Mon Aug 15 13:14:08 2016 -0700 @@ -496,7 +496,15 @@ __asm { mov frameptr, ebp }; + // ebp (frameptr) is for this frame (_get_previous_fp). We want the ebp for the + // caller of os::current_frame*(), so go up two frames. However, for + // optimized builds, _get_previous_fp() will be inlined, so only go + // up 1 frame in that case. +#ifdef _NMT_NOINLINE_ + return **(intptr_t***)frameptr; +#else return *frameptr; +#endif } #endif // !AMD64