Mercurial > hg > truffle
diff src/share/vm/runtime/sharedRuntime.cpp @ 14396:583211d4b16b
Merge
author | kvn |
---|---|
date | Wed, 03 Jul 2013 11:50:29 -0700 |
parents | f4f6ae481e1a 9ba41a4a71ff |
children | cfd05ec74089 |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Wed Jun 26 16:06:38 2013 +0200 +++ b/src/share/vm/runtime/sharedRuntime.cpp Wed Jul 03 11:50:29 2013 -0700 @@ -813,8 +813,11 @@ // 3. Implict null exception in nmethod if (!cb->is_nmethod()) { - guarantee(cb->is_adapter_blob() || cb->is_method_handles_adapter_blob(), - "exception happened outside interpreter, nmethods and vtable stubs (1)"); + bool is_in_blob = cb->is_adapter_blob() || cb->is_method_handles_adapter_blob(); + if (!is_in_blob) { + cb->print(); + fatal(err_msg("exception happened outside interpreter, nmethods and vtable stubs at pc " INTPTR_FORMAT, pc)); + } Events::log_exception(thread, "NullPointerException in code blob at " INTPTR_FORMAT, pc); // There is no handler here, so we will simply unwind. return StubRoutines::throw_NullPointerException_at_call_entry();