--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Thu Oct 15 13:28:22 2015 +0200
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Sat Oct 17 19:40:30 2015 -0400
@@ -124,7 +124,7 @@
     // Note: with several active threads, the must_be_compiled may be true
     //       while can_be_compiled is false; remove assert
     // assert(CompilationPolicy::can_be_compiled(selected_method), "cannot compile");
-    if (THREAD->is_Compiler_thread()) {
+    if (!THREAD->can_call_java()) {
       // don't force compilation, resolve was on behalf of compiler
       return;
     }
@@ -450,7 +450,7 @@
       }
       return result;
     } else if (iid == vmIntrinsics::_invokeGeneric
-               && !THREAD->is_Compiler_thread()
+               && THREAD->can_call_java()
                && appendix_result_or_null != NULL) {
       // This is a method with type-checking semantics.
       // We will ask Java code to spin an adapter method for it.