Mercurial > hg > graal-compiler
diff src/share/vm/runtime/thread.hpp @ 10409:36bcc10e01c0
merge fixes
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 19 Jun 2013 15:37:32 +0200 |
| parents | 836a62f43af9 |
| children | 6b0fd0964b87 |
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.hpp Wed Jun 19 10:45:56 2013 +0200 +++ b/src/share/vm/runtime/thread.hpp Wed Jun 19 15:37:32 2013 +0200 @@ -898,7 +898,8 @@ private: #ifdef GRAAL - address _graal_alternate_call_target; + address _graal_alternate_call_target; + address _graal_implicit_exception_pc; // pc at which the most recent implicit exception occurred #endif StackGuardState _stack_guard_state; @@ -1273,6 +1274,7 @@ #ifdef GRAAL void set_graal_alternate_call_target(address a) { _graal_alternate_call_target = a; } + void set_graal_implicit_exception_pc(address a) { _graal_implicit_exception_pc = a; } #endif // Exception handling for compiled methods @@ -1357,6 +1359,7 @@ static ByteSize osthread_offset() { return byte_offset_of(JavaThread, _osthread ); } #ifdef GRAAL static ByteSize graal_alternate_call_target_offset() { return byte_offset_of(JavaThread, _graal_alternate_call_target); } + static ByteSize graal_implicit_exception_pc_offset() { return byte_offset_of(JavaThread, _graal_implicit_exception_pc); } #endif static ByteSize exception_oop_offset() { return byte_offset_of(JavaThread, _exception_oop ); } static ByteSize exception_pc_offset() { return byte_offset_of(JavaThread, _exception_pc ); }