Mercurial > hg > openjdk > jdk9 > hotspot
changeset 12776:531cb9202a0f
Merge
author | lana |
---|---|
date | Fri, 26 May 2017 00:45:12 +0000 |
parents | 385668275400 (current diff) 63ac6d565c21 (diff) |
children | 1ae9e84f68b3 |
files | |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/code/relocInfo.cpp Fri May 26 00:29:12 2017 +0000 +++ b/src/share/vm/code/relocInfo.cpp Fri May 26 00:45:12 2017 +0000 @@ -129,9 +129,9 @@ if (nm == NULL && begin != NULL) { // allow nmethod to be deduced from beginning address CodeBlob* cb = CodeCache::find_blob(begin); - nm = cb->as_compiled_method_or_null(); + nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL; } - assert(nm != NULL, "must be able to deduce nmethod from other arguments"); + guarantee(nm != NULL, "must be able to deduce nmethod from other arguments"); _code = nm; _current = nm->relocation_begin() - 1;
--- a/src/share/vm/runtime/sharedRuntime.cpp Fri May 26 00:29:12 2017 +0000 +++ b/src/share/vm/runtime/sharedRuntime.cpp Fri May 26 00:45:12 2017 +0000 @@ -549,7 +549,7 @@ CodeBlob *cb = CodeCache::find_blob(pc); // Should be an nmethod - assert(cb && cb->is_compiled(), "safepoint polling: pc must refer to an nmethod"); + guarantee(cb != NULL && cb->is_compiled(), "safepoint polling: pc must refer to an nmethod"); // Look up the relocation information assert(((CompiledMethod*)cb)->is_at_poll_or_poll_return(pc), @@ -1802,7 +1802,7 @@ if (destination != entry_point) { CodeBlob* callee = CodeCache::find_blob(destination); // callee == cb seems weird. It means calling interpreter thru stub. - if (callee == cb || callee->is_adapter_blob()) { + if (callee != NULL && (callee == cb || callee->is_adapter_blob())) { // static call or optimized virtual if (TraceCallFixup) { tty->print("fixup callsite at " INTPTR_FORMAT " to compiled code for", p2i(caller_pc)); @@ -1851,7 +1851,7 @@ // ask me how I know this... CodeBlob* cb = CodeCache::find_blob(caller_pc); - if (!cb->is_compiled() || entry_point == moop->get_c2i_entry()) { + if (cb == NULL || !cb->is_compiled() || entry_point == moop->get_c2i_entry()) { return; }