*** old/src/share/vm/ci/ciMethodData.hpp	Tue Mar 25 10:47:52 2014
--- new/src/share/vm/ci/ciMethodData.hpp	Tue Mar 25 10:47:52 2014

*** 43,53 ****
--- 43,53 ----
  class ciMultiBranchData;
  class ciArgInfoData;
  class ciCallTypeData;
  class ciVirtualCallTypeData;
  class ciParametersTypeData;
- class ciSpeculativeTrapData;;
  
  typedef ProfileData ciProfileData;
  
  class ciBitData : public BitData {
  public:

*** 173,183 ****
--- 173,183 ----
    bool return_maybe_null() const {
      return ret()->maybe_null();
    }
  
  #ifndef PRODUCT
!   void print_data_on(outputStream* st, const char* extra = NULL) const;
  #endif
  };
  
  class ciReceiverTypeData : public ReceiverTypeData {
  public:

*** 200,210 ****
--- 200,210 ----
    virtual void translate_from(const ProfileData* data) {
      translate_receiver_data_from(data);
    }
    void translate_receiver_data_from(const ProfileData* data);
  #ifndef PRODUCT
!   void print_data_on(outputStream* st, const char* extra = NULL) const;
    void print_receiver_data_on(outputStream* st) const;
  #endif
  };
  
  class ciVirtualCallData : public VirtualCallData {

*** 225,235 ****
--- 225,235 ----
    // Copy & translate from oop based VirtualCallData
    virtual void translate_from(const ProfileData* data) {
      rtd_super()->translate_receiver_data_from(data);
    }
  #ifndef PRODUCT
!   void print_data_on(outputStream* st, const char* extra = NULL) const;
  #endif
  };
  
  class ciVirtualCallTypeData : public VirtualCallTypeData {
  private:

*** 287,297 ****
--- 287,297 ----
    bool return_maybe_null() const {
      return ret()->maybe_null();
    }
  
  #ifndef PRODUCT
!   void print_data_on(outputStream* st, const char* extra = NULL) const;
  #endif
  };
  
  
  class ciRetData : public RetData {

*** 336,365 ****
--- 336,365 ----
    bool parameter_maybe_null(int i) const {
      return parameters()->maybe_null(i);
    }
  
  #ifndef PRODUCT
!   void print_data_on(outputStream* st, const char* extra = NULL) const;
  #endif
  };
  
  class ciSpeculativeTrapData : public SpeculativeTrapData {
  public:
    ciSpeculativeTrapData(DataLayout* layout) : SpeculativeTrapData(layout) {}
  
    virtual void translate_from(const ProfileData* data);
  
    ciMethod* method() const {
!     return (ciMethod*)intptr_at(method_offset);
!     return (ciMethod*)intptr_at(speculative_trap_method);
    }
  
    void set_method(ciMethod* m) {
!     set_intptr_at(method_offset, (intptr_t)m);
!     set_intptr_at(speculative_trap_method, (intptr_t)m);
    }
  
  #ifndef PRODUCT
!   void print_data_on(outputStream* st, const char* extra = NULL) const;
  #endif
  };
  
  // ciMethodData
  //

*** 404,415 ****
--- 404,415 ----
    int _backedge_counter;
  
    // Coherent snapshot of original header.
    MethodData _orig;
  
    // Dedicated area dedicated to parameters. Null if no parameter
-   // profiling for this method.
+   // Area dedicated to parameters. NULL if no parameter profiling for
    DataLayout* _parameters;
  
    ciMethodData(MethodData* md);
    ciMethodData();
  

*** 465,474 ****
--- 465,479 ----
    }
  
    void load_extra_data();
    ciProfileData* bci_to_extra_data(int bci, ciMethod* m, bool& two_free_slots);
  
+   void dump_replay_data_type_helper(outputStream* out, int round, int& count, ProfileData* pdata, ByteSize offset, ciKlass* k);
+   template<class T> void dump_replay_data_call_type_helper(outputStream* out, int round, int& count, T* call_type_data);
+   template<class T> void dump_replay_data_receiver_type_helper(outputStream* out, int round, int& count, T* call_type_data);
+   void dump_replay_data_extra_data_helper(outputStream* out, int round, int& count);
+ 
  public:
    bool is_method_data() const { return true; }
  
    bool is_empty()  { return _state == empty_state; }
    bool is_mature() { return _state == mature_state; }