Mercurial > hg > truffle
diff src/share/vm/memory/allocation.hpp @ 9159:43223d3f5dcd
Merge with hsx/hotspot-comp
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Tue, 16 Apr 2013 17:39:46 +0200 |
| parents | 89e4d67fdd2a f36e073d56a4 |
| children | 836a62f43af9 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.hpp Tue Apr 16 17:16:06 2013 +0200 +++ b/src/share/vm/memory/allocation.hpp Tue Apr 16 17:39:46 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -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)