Mercurial > hg > graal-jvmci-8
diff src/share/vm/code/nmethod.hpp @ 4562:ef00461e29af
Merge
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Fri, 10 Feb 2012 10:16:19 -0800 |
parents | 35ca3ade314d 723df37192d6 |
children | 33df1aeaebbf |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.hpp Fri Feb 10 10:07:48 2012 -0800 +++ b/src/share/vm/code/nmethod.hpp Fri Feb 10 10:16:19 2012 -0800 @@ -592,7 +592,7 @@ // (tw) When using graal, the address might be off by 5 (because this is the size of the call instruction. // (tw) TODO: Replace this by a more general mechanism. - bool is_deopt_entry (address pc) { return pc == deopt_handler_begin() || (UseGraal && pc == deopt_handler_begin() + 5); } + bool is_deopt_entry (address pc) { return pc == deopt_handler_begin() IS_GRAAL( || pc == deopt_handler_begin() + 5); } bool is_deopt_mh_entry(address pc) { return pc == deopt_mh_handler_begin(); } // Accessor/mutator for the original pc of a frame before a frame was deopted. address get_original_pc(const frame* fr) { return *orig_pc_addr(fr); }