--- a/hotspot/src/share/vm/compiler/compileBroker.cpp	Thu Apr 06 23:46:38 2017 +0000
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp	Sun Apr 09 20:52:43 2017 -0700
@@ -1052,8 +1052,8 @@
 
   // lock, make sure that the compilation
   // isn't prohibited in a straightforward way.
-  AbstractCompiler *comp = CompileBroker::compiler(comp_level);
-  if (!comp->can_compile_method(method) ||
+  AbstractCompiler* comp = CompileBroker::compiler(comp_level);
+  if (comp == NULL || !comp->can_compile_method(method) ||
       compilation_is_prohibited(method, osr_bci, comp_level, directive->ExcludeOption)) {
     return NULL;
   }

--- a/hotspot/src/share/vm/opto/library_call.cpp	Thu Apr 06 23:46:38 2017 +0000
+++ b/hotspot/src/share/vm/opto/library_call.cpp	Sun Apr 09 20:52:43 2017 -0700
@@ -347,7 +347,7 @@
     // methods access VM-internal data.
     VM_ENTRY_MARK;
     methodHandle mh(THREAD, m->get_Method());
-    is_available = compiler->is_intrinsic_supported(mh, is_virtual) &&
+    is_available = compiler != NULL && compiler->is_intrinsic_supported(mh, is_virtual) &&
                    !C->directive()->is_intrinsic_disabled(mh) &&
                    !vmIntrinsics::is_disabled_by_flags(mh);
 

--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp	Thu Apr 06 23:46:38 2017 +0000
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp	Sun Apr 09 20:52:43 2017 -0700
@@ -77,8 +77,8 @@
   }
 #if INCLUDE_JVMCI
   if (UseJVMCICompiler) {
-    if (TieredCompilation && CompileBroker::compiler(CompLevel_full_optimization) != NULL &&
-        CompileBroker::compiler(CompLevel_full_optimization)->is_trivial(method)) {
+    AbstractCompiler* comp = CompileBroker::compiler(CompLevel_full_optimization);
+    if (TieredCompilation && comp != NULL && comp->is_trivial(method)) {
       return true;
     }
   }