*** old/src/share/vm/oops/method.hpp	Thu Nov  3 14:16:45 2016
--- new/src/share/vm/oops/method.hpp	Thu Nov  3 14:16:45 2016

*** 101,110 ****
--- 101,114 ----
    // time (whenever a compile completes).  It can transition from not-null to
    // NULL only at safepoints (because of a de-opt).
    CompiledMethod* volatile _code;                       // Points to the corresponding piece of native code
    volatile address           _from_interpreted_entry; // Cache of _code ? _adapter->i2c_entry() : _i2i_entry
  
+ #if INCLUDE_AOT && defined(TIERED)
+   CompiledMethod* _aot_code;
+ #endif
+ 
    // Constructor
    Method(ConstMethod* xconst, AccessFlags access_flags);
   public:
  
    static Method* allocate(ClassLoaderData* loader_data,

*** 384,394 ****
--- 388,411 ----
      MethodCounters* mcs = method_counters();
      if (mcs != NULL) {
        mcs->set_rate(rate);
      }
    }
  #endif
+ 
+ #if INCLUDE_AOT
+   void set_aot_code(CompiledMethod* aot_code) {
+     _aot_code = aot_code;
+   }
+ 
+   CompiledMethod* aot_code() const {
+     return _aot_code;
+   }
+ #else
+   CompiledMethod* aot_code() const { return NULL; }
+ #endif // INCLUDE_AOT
+ #endif // TIERED
+ 
    int nmethod_age() const {
      if (method_counters() == NULL) {
        return INT_MAX;
      } else {
        return method_counters()->nmethod_age();

*** 646,655 ****
--- 663,676 ----
    // compiled code support
    // NOTE: code() is inherently racy as deopt can be clearing code
    // simultaneously. Use with caution.
    bool has_compiled_code() const                 { return code() != NULL; }
  
+ #ifdef TIERED
+   bool has_aot_code() const                      { return aot_code() != NULL; }
+ #endif
+ 
    // sizing
    static int header_size()                       { return sizeof(Method)/wordSize; }
    static int size(bool is_native);
    int size() const                               { return method_size(); }
  #if INCLUDE_SERVICES