Mercurial > hg > graal-compiler
diff src/share/vm/code/nmethod.hpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 21 Aug 2012 10:39:19 +0200 |
| parents | e72dd6533eb9 d2a62e0f25eb |
| children | e522a00b91aa |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.hpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/code/nmethod.hpp Tue Aug 21 10:39:19 2012 +0200 @@ -31,7 +31,7 @@ // This class is used internally by nmethods, to cache // exception/pc/handler information. -class ExceptionCache : public CHeapObj { +class ExceptionCache : public CHeapObj<mtCode> { friend class VMStructs; private: enum { cache_size = 16 }; @@ -563,7 +563,7 @@ static void oops_do_marking_prologue(); static void oops_do_marking_epilogue(); static bool oops_do_marking_is_active() { return _oops_do_mark_nmethods != NULL; } - DEBUG_ONLY(bool test_oops_do_mark() { return _oops_do_mark_link != NULL; }) + bool test_oops_do_mark() { return _oops_do_mark_link != NULL; } // ScopeDesc for an instruction ScopeDesc* scope_desc_at(address pc);