Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 10132:5b6512efcdc4
Merge
author | dcubed |
---|---|
date | Fri, 19 Apr 2013 16:51:27 -0700 |
parents | 6f817ce50129 f36e073d56a4 |
children | cc12becb22e7 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Fri Apr 19 11:08:52 2013 -0700 +++ b/src/share/vm/memory/allocation.hpp Fri Apr 19 16:51:27 2013 -0700 @@ -190,7 +190,7 @@ #endif // INCLUDE_NMT // debug build does not inline -#if defined(_DEBUG_) +#if defined(_NMT_NOINLINE_) #define CURRENT_PC (NMT_track_callsite ? os::get_caller_pc(1) : 0) #define CALLER_PC (NMT_track_callsite ? os::get_caller_pc(2) : 0) #define CALLER_CALLER_PC (NMT_track_callsite ? os::get_caller_pc(3) : 0)