Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 11014:4b52137b07c9
Merge
author | chegar |
---|---|
date | Wed, 01 May 2013 14:11:01 +0100 |
parents | f75faf51e8c4 cc12becb22e7 |
children | 7ee0d5c53c78 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Sun Apr 28 08:15:33 2013 +0100 +++ b/src/share/vm/memory/allocation.hpp Wed May 01 14:11:01 2013 +0100 @@ -178,7 +178,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)