--- a/src/share/vm/jvmci/jvmciCompiler.cpp	Thu Sep 17 12:58:40 2015 -0700
+++ b/src/share/vm/jvmci/jvmciCompiler.cpp	Thu Sep 17 18:25:08 2015 -0700
@@ -69,8 +69,6 @@
   JavaThread* THREAD = JavaThread::current();
   _bootstrapping = true;
   // Allow bootstrap to perform JVMCI compilations of itself
-  bool c1only = JVMCICompileWithC1Only;
-  JVMCICompileWithC1Only = false;
   ResourceMark rm;
   HandleMark hm;
   if (PrintBootstrap) {
@@ -111,7 +109,6 @@
   if (PrintBootstrap) {
     tty->print_cr(" in " JLONG_FORMAT " ms (compiled %d methods)", os::javaTimeMillis() - start, _methodsCompiled);
   }
-  JVMCICompileWithC1Only = c1only;
   _bootstrapping = false;
 }
 
@@ -156,6 +153,13 @@
   ShouldNotReachHere();
 }
 
+bool JVMCICompiler::is_trivial(Method* method) {
+  if (_bootstrapping) {
+    return false;
+  }
+  return JVMCIRuntime::treat_as_trivial(method);
+}
+
 // Print compilation timers and statistics
 void JVMCICompiler::print_timers() {
   print_compilation_timers();