*** old/src/cpu/x86/vm/interp_masm_x86.hpp	Wed Sep 16 15:17:45 2015
--- new/src/cpu/x86/vm/interp_masm_x86.hpp	Wed Sep 16 15:17:44 2015

*** 30,39 ****
--- 30,40 ----
  #include "interpreter/invocationCounter.hpp"
  #include "runtime/frame.hpp"
  
  // This file specializes the assember with interpreter-specific macros
  
+ typedef ByteSize (*OffsetFunction)(uint);
  
  class InterpreterMacroAssembler: public MacroAssembler {
  
  #ifndef CC_INTERP
   protected:

*** 247,256 ****
--- 248,261 ----
    void record_klass_in_profile(Register receiver, Register mdp,
                                 Register reg2, bool is_virtual_call);
    void record_klass_in_profile_helper(Register receiver, Register mdp,
                                        Register reg2, int start_row,
                                        Label& done, bool is_virtual_call);
+   void record_item_in_profile_helper(Register item, Register mdp,
+                                      Register reg2, int start_row, Label& done, int total_rows,
+                                      OffsetFunction item_offset_fn, OffsetFunction item_count_offset_fn,
+                                      int non_profiled_offset);
  
    void update_mdp_by_offset(Register mdp_in, int offset_of_offset);
    void update_mdp_by_offset(Register mdp_in, Register reg, int offset_of_disp);
    void update_mdp_by_constant(Register mdp_in, int constant);
    void update_mdp_for_ret(Register return_bci);

*** 260,269 ****
--- 265,277 ----
    void profile_call(Register mdp);
    void profile_final_call(Register mdp);
    void profile_virtual_call(Register receiver, Register mdp,
                              Register scratch2,
                              bool receiver_can_be_null = false);
+ #if INCLUDE_JVMCI
+   void profile_called_method(Register method, Register mdp, Register reg2);
+ #endif
    void profile_ret(Register return_bci, Register mdp);
    void profile_null_seen(Register mdp);
    void profile_typecheck(Register mdp, Register klass, Register scratch);
    void profile_typecheck_failed(Register mdp);
    void profile_switch_default(Register mdp);