Mercurial > hg > truffle
diff src/share/vm/code/nmethod.cpp @ 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.cpp Fri Feb 10 10:07:48 2012 -0800 +++ b/src/share/vm/code/nmethod.cpp Fri Feb 10 10:16:19 2012 -0800 @@ -837,7 +837,7 @@ // Exception handler and deopt handler are in the stub section assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); - if (UseGraal) { +#ifdef GRAAL // graal produces no (!) stub section _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions); _deoptimize_offset = code_offset() + offsets->value(CodeOffsets::Deopt); @@ -846,7 +846,7 @@ } else { _deoptimize_mh_offset = -1; } - } else { +#else _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); if (offsets->value(CodeOffsets::DeoptMH) != -1) { @@ -854,7 +854,7 @@ } else { _deoptimize_mh_offset = -1; } - } +#endif if (offsets->value(CodeOffsets::UnwindHandler) != -1) { _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); } else { @@ -2353,7 +2353,9 @@ // information in a table. break; } - assert(UseGraal || stub == NULL || stub_contains(stub), "static call stub outside stub section"); +#ifndef GRAAL + assert(stub == NULL || stub_contains(stub), "static call stub outside stub section"); +#endif } }