*** old/src/share/vm/memory/allocation.hpp	Thu Apr 11 07:43:21 2013
--- new/src/share/vm/memory/allocation.hpp	Thu Apr 11 07:43:20 2013

*** 1,7 ****
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 176,186 ****
--- 176,186 ----
  const bool NMT_track_callsite = false;
  
  #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)
  #else
    #define CURRENT_PC      (NMT_track_callsite? os::get_caller_pc(0) : 0)