--- a/hotspot/src/share/vm/runtime/javaCalls.cpp	Wed Apr 27 13:37:07 2016 -0700
+++ b/hotspot/src/share/vm/runtime/javaCalls.cpp	Wed Apr 27 16:20:49 2016 -0700
@@ -343,13 +343,7 @@
   }
 #endif
 
-
-  assert(thread->can_call_java(), "cannot compile from the native compiler");
-  if (CompilationPolicy::must_be_compiled(method)) {
-    CompileBroker::compile_method(method, InvocationEntryBci,
-                                  CompilationPolicy::policy()->initial_compile_level(),
-                                  methodHandle(), 0, "must_be_compiled", CHECK);
-  }
+  CompilationPolicy::compile_if_required(method, CHECK);
 
   // Since the call stub sets up like the interpreter we call the from_interpreted_entry
   // so we can go compiled via a i2c. Otherwise initial entry method will always