src/hotspot/share/code/nmethod.hpp

@@ -205,11 +205,10 @@
    int _oops_offset;                       // offset to where embedded oop table begins (inside data)
    int _metadata_offset;                   // embedded meta data table
    int _scopes_data_offset;
    int _scopes_pcs_offset;
    int _dependencies_offset;
-   int _native_invokers_offset;
    int _handler_table_offset;
    int _nul_chk_table_offset;
  #if INCLUDE_JVMCI
    int _speculations_offset;
    int _jvmci_data_offset;

@@ -307,12 +306,11 @@
            int frame_size,
            OopMapSet* oop_maps,
            ExceptionHandlerTable* handler_table,
            ImplicitExceptionTable* nul_chk_table,
            AbstractCompiler* compiler,
-           int comp_level,
-           const GrowableArrayView<RuntimeStub*>& native_invokers
+           int comp_level
  #if INCLUDE_JVMCI
            , char* speculations,
            int speculations_len,
            int jvmci_data_size
  #endif

@@ -356,12 +354,11 @@
                                int frame_size,
                                OopMapSet* oop_maps,
                                ExceptionHandlerTable* handler_table,
                                ImplicitExceptionTable* nul_chk_table,
                                AbstractCompiler* compiler,
-                               int comp_level,
-                               const GrowableArrayView<RuntimeStub*>& native_invokers = GrowableArrayView<RuntimeStub*>::EMPTY
+                               int comp_level
  #if INCLUDE_JVMCI
                                , char* speculations = NULL,
                                int speculations_len = 0,
                                int nmethod_mirror_index = -1,
                                const char* nmethod_mirror_name = NULL,

@@ -406,13 +403,11 @@
  
    address scopes_data_end       () const          { return           header_begin() + _scopes_pcs_offset    ; }
    PcDesc* scopes_pcs_begin      () const          { return (PcDesc*)(header_begin() + _scopes_pcs_offset   ); }
    PcDesc* scopes_pcs_end        () const          { return (PcDesc*)(header_begin() + _dependencies_offset) ; }
    address dependencies_begin    () const          { return           header_begin() + _dependencies_offset  ; }
-   address dependencies_end      () const          { return           header_begin() + _native_invokers_offset ; }
-   RuntimeStub** native_invokers_begin() const     { return (RuntimeStub**)(header_begin() + _native_invokers_offset) ; }
-   RuntimeStub** native_invokers_end  () const     { return (RuntimeStub**)(header_begin() + _handler_table_offset); }
+   address dependencies_end      () const          { return           header_begin() + _handler_table_offset ; }
    address handler_table_begin   () const          { return           header_begin() + _handler_table_offset ; }
    address handler_table_end     () const          { return           header_begin() + _nul_chk_table_offset ; }
    address nul_chk_table_begin   () const          { return           header_begin() + _nul_chk_table_offset ; }
  #if INCLUDE_JVMCI
    address nul_chk_table_end     () const          { return           header_begin() + _speculations_offset  ; }

@@ -524,12 +519,10 @@
    }
  
    void copy_values(GrowableArray<jobject>* oops);
    void copy_values(GrowableArray<Metadata*>* metadata);
  
-   void free_native_invokers();
- 
    // Relocation support
  private:
    void fix_oop_relocations(address begin, address end, bool initialize_immediates);
    inline void initialize_immediate_oop(oop* dest, jobject handle);
  

@@ -662,11 +655,10 @@
    void print_pcs() { print_pcs_on(tty); }
    void print_pcs_on(outputStream* st);
    void print_scopes() { print_scopes_on(tty); }
    void print_scopes_on(outputStream* st)          PRODUCT_RETURN;
    void print_value_on(outputStream* st) const;
-   void print_native_invokers();
    void print_handler_table();
    void print_nul_chk_table();
    void print_recorded_oop(int log_n, int index);
    void print_recorded_oops();
    void print_recorded_metadata();