*** old/src/share/vm/code/relocInfo.hpp	Mon Oct 31 17:46:41 2016
--- new/src/share/vm/code/relocInfo.hpp	Mon Oct 31 17:46:41 2016

*** 1088,1098 ****
--- 1088,1098 ----
    void unpack_data();
  
    void clear_inline_cache();
  
    // find the matching static_stub
!   address static_stub(bool is_aot);
  };
  
  
  class static_call_Relocation : public CallRelocation {
    relocInfo::relocType type() { return relocInfo::static_call_type; }

*** 1122,1158 ****
--- 1122,1161 ----
    void unpack_data();
  
    void clear_inline_cache();
  
    // find the matching static_stub
!   address static_stub(bool is_aot);
  };
  
  class static_stub_Relocation : public Relocation {
    relocInfo::relocType type() { return relocInfo::static_stub_type; }
  
   public:
!   static RelocationHolder spec(address static_call, bool is_aot = false) {
      RelocationHolder rh = newHolder();
!     new(rh) static_stub_Relocation(static_call, is_aot);
      return rh;
    }
  
   private:
    address _static_call;  // location of corresponding static_call
+   bool _is_aot;          // trampoline to aot code
  
!   static_stub_Relocation(address static_call, bool is_aot) {
      _static_call = static_call;
+     _is_aot = is_aot;
    }
  
    friend class RelocIterator;
    static_stub_Relocation() { }
  
   public:
    void clear_inline_cache();
  
    address static_call() { return _static_call; }
+   bool is_aot() { return _is_aot; }
  
    // data is packed as a scaled offset in "1_int" format:  [c] or [Cc]
    void pack_data_to(CodeSection* dest);
    void unpack_data();
  };