Mercurial > hg > truffle
diff src/share/vm/runtime/sharedRuntime.hpp @ 8506:c3657d00e343
-Merge with tip
| author | Christos Kotselidis <christos.kotselidis@oracle.com> |
|---|---|
| date | Thu, 21 Mar 2013 14:11:13 +0100 |
| parents | 5fc51c1ecdeb |
| children | f94bb5d20e5d |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.hpp Thu Mar 21 11:30:38 2013 +0100 +++ b/src/share/vm/runtime/sharedRuntime.hpp Thu Mar 21 14:11:13 2013 +0100 @@ -32,6 +32,7 @@ #include "memory/resourceArea.hpp" #include "runtime/threadLocalStorage.hpp" #include "utilities/hashtable.hpp" +#include "utilities/macros.hpp" class AdapterHandlerEntry; class AdapterHandlerTable; @@ -168,11 +169,11 @@ static address raw_exception_handler_for_return_address(JavaThread* thread, address return_address); static address exception_handler_for_return_address(JavaThread* thread, address return_address); -#ifndef SERIALGC +#if INCLUDE_ALL_GCS // G1 write barriers static void g1_wb_pre(oopDesc* orig, JavaThread *thread); static void g1_wb_post(void* card_addr, JavaThread* thread); -#endif // !SERIALGC +#endif // INCLUDE_ALL_GCS // exception handling and implicit exceptions static address compute_compiled_exc_handler(nmethod* nm, address ret_pc, Handle& exception,