--- a/hotspot/src/share/vm/utilities/debug.cpp Fri Jan 08 10:14:02 2016 +0100
+++ b/hotspot/src/share/vm/utilities/debug.cpp Fri Dec 18 20:23:26 2015 +0300
@@ -480,12 +480,13 @@
extern "C" void disnm(intptr_t p) {
Command c("disnm");
CodeBlob* cb = CodeCache::find_blob((address) p);
- nmethod* nm = cb->as_nmethod_or_null();
- if (nm) {
- nm->print();
- Disassembler::decode(nm);
- } else {
- cb->print();
+ if (cb != NULL) {
+ nmethod* nm = cb->as_nmethod_or_null();
+ if (nm != NULL) {
+ nm->print();
+ } else {
+ cb->print();
+ }
Disassembler::decode(cb);
}
}