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

*** 32,41 ****
--- 32,44 ----
  
  class MethodCounters: public MetaspaceObj {
   friend class VMStructs;
   friend class JVMCIVMStructs;
   private:
+ #if INCLUDE_AOT
+   Method*           _method;                     // Back link to Method
+ #endif
  #if defined(COMPILER2) || INCLUDE_JVMCI
    int               _interpreter_invocation_count; // Count of times invoked (reused as prev_event_count in tiered)
    u2                _interpreter_throwout_count; // Count of times method was exited via exception while interpreting
  #endif
  #if INCLUDE_JVMTI

*** 62,72 ****
--- 65,79 ----
    jlong             _prev_time;                   // Previous time the rate was acquired
    u1                _highest_comp_level;          // Highest compile level this method has ever seen.
    u1                _highest_osr_comp_level;      // Same for OSR level
  #endif
  
-   MethodCounters(methodHandle mh) : _nmethod_age(INT_MAX)
+ #if INCLUDE_AOT
+                                     _method(mh()),
+ #endif
+                                     _nmethod_age(INT_MAX)
  #ifdef TIERED
                                   , _rate(0),
                                     _prev_time(0),
                                     _highest_comp_level(0),
                                     _highest_osr_comp_level(0)

*** 105,114 ****
--- 112,123 ----
    static MethodCounters* allocate(methodHandle mh, TRAPS);
  
    void deallocate_contents(ClassLoaderData* loader_data) {}
    DEBUG_ONLY(bool on_stack() { return false; })  // for template
  
+   AOT_ONLY(Method* method() const { return _method; })
+ 
    static int size() { return sizeof(MethodCounters) / wordSize; }
  
    bool is_klass() const { return false; }
  
    void clear_counters();