*** old/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp	Mon Oct 31 17:47:10 2016
--- new/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp	Mon Oct 31 17:47:10 2016

*** 25,41 ****
--- 25,46 ----
  #ifndef SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_INLINE_HPP
  #define SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_INLINE_HPP
  
  #include "compiler/compilerOracle.hpp"
  
+ #ifdef TIERED
+ 
  template<CompLevel level>
  bool SimpleThresholdPolicy::call_predicate_helper(int i, int b, double scale, Method* method) {
    double threshold_scaling;
    if (CompilerOracle::has_option_value(method, "CompileThresholdScaling", threshold_scaling)) {
      scale *= threshold_scaling;
    }
    switch(level) {
+   case CompLevel_aot:
+     return (i >= Tier3AOTInvocationThreshold * scale) ||
+            (i >= Tier3AOTMinInvocationThreshold * scale && i + b >= Tier3AOTCompileThreshold * scale);
    case CompLevel_none:
    case CompLevel_limited_profile:
      return (i >= Tier3InvocationThreshold * scale) ||
             (i >= Tier3MinInvocationThreshold * scale && i + b >= Tier3CompileThreshold * scale);
    case CompLevel_full_profile:

*** 50,59 ****
--- 55,66 ----
    double threshold_scaling;
    if (CompilerOracle::has_option_value(method, "CompileThresholdScaling", threshold_scaling)) {
      scale *= threshold_scaling;
    }
    switch(level) {
+   case CompLevel_aot:
+     return b >= Tier3AOTBackEdgeThreshold * scale;
    case CompLevel_none:
    case CompLevel_limited_profile:
      return b >= Tier3BackEdgeThreshold * scale;
    case CompLevel_full_profile:
      return b >= Tier4BackEdgeThreshold * scale;

*** 85,90 ****
--- 92,99 ----
      return true;
    }
    return false;
  }
  
+ #endif // TIERED
+ 
  #endif // SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_INLINE_HPP