--- a/hotspot/src/share/vm/compiler/compileTask.cpp	Mon Apr 25 21:25:22 2016 +0300
+++ b/hotspot/src/share/vm/compiler/compileTask.cpp	Tue Apr 26 10:28:51 2016 +0200
@@ -135,7 +135,11 @@
 //
 nmethod* CompileTask::code() const {
   if (_code_handle == NULL)  return NULL;
-  return _code_handle->code();
+  CodeBlob *blob = _code_handle->code();
+  if (blob != NULL) {
+    return blob->as_nmethod();
+  }
+  return NULL;
 }
 
 void CompileTask::set_code(nmethod* nm) {