--- old/src/share/vm/runtime/arguments.cpp	2017-01-31 21:58:37.223932450 -0800
+++ new/src/share/vm/runtime/arguments.cpp	2017-01-31 21:58:37.090931228 -0800
@@ -2454,8 +2454,8 @@
     }
 #endif
   }
-#if INCLUDE_JVMCI
 
+#if INCLUDE_JVMCI
   status = status && check_jvmci_args_consistency();
 
   if (EnableJVMCI) {
@@ -2463,6 +2463,11 @@
       warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled");
       ScavengeRootsInCode = 1;
     }
+    if (TieredStopAtLevel != CompLevel_full_optimization) {
+      // Currently JVMCI compiler can only work at the full optimization level
+      warning("forcing TieredStopAtLevel to full optimization because JVMCI is enabled");
+      TieredStopAtLevel = CompLevel_full_optimization;
+    }
     if (FLAG_IS_DEFAULT(TypeProfileLevel)) {
       TypeProfileLevel = 0;
     }