--- a/hotspot/src/share/vm/prims/whitebox.cpp	Sat Jan 21 15:08:53 2017 -0800
+++ b/hotspot/src/share/vm/prims/whitebox.cpp	Sun Jan 22 22:18:49 2017 -0800
@@ -765,7 +765,7 @@
 
 bool WhiteBox::compile_method(Method* method, int comp_level, int bci, Thread* THREAD) {
   // Screen for unavailable/bad comp level or null method
-  if (method == NULL || comp_level > TieredStopAtLevel ||
+  if (method == NULL || comp_level > MIN2((CompLevel) TieredStopAtLevel, CompLevel_highest_tier) ||
       CompileBroker::compiler(comp_level) == NULL) {
     return false;
   }