truffle: src/share/vm/ci/ciMethodData.hpp comparison

comparison src/share/vm/ci/ciMethodData.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Wed, 15 Oct 2014 16:02:50 +0200
parents	89152779163c 606acabe7b5c
children	7848fc12602b

comparison

equal deleted inserted replaced

-:45d7b2c7029d
+:52b4284cb496
 #include "ci/ciKlass.hpp"
 #include "ci/ciObject.hpp"
 #include "ci/ciUtilities.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/deoptimization.hpp"
 class ciBitData;
 class ciCounterData;
 class ciJumpData;
 class ciReceiverTypeData;
 class ciMultiBranchData;
 class ciArgInfoData;
 class ciCallTypeData;
 class ciVirtualCallTypeData;
 class ciParametersTypeData;
+class ciSpeculativeTrapData;;
 typedef ProfileData ciProfileData;
 class ciBitData : public BitData {
 public:
 bool return_maybe_null() const {
 return ret()->maybe_null();
 }
 #ifndef PRODUCT
-void print_data_on(outputStream* st) const;
+void print_data_on(outputStream* st, const char* extra) const;
 #endif
 };
 class ciReceiverTypeData : public ReceiverTypeData {
 public:
 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;
+void print_data_on(outputStream* st, const char* extra) const;
 void print_receiver_data_on(outputStream* st) const;
 #endif
 };
 class ciVirtualCallData : public VirtualCallData {
 // 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;
+void print_data_on(outputStream* st, const char* extra) const;
 #endif
 };
 class ciVirtualCallTypeData : public VirtualCallTypeData {
 private:
 bool return_maybe_null() const {
 return ret()->maybe_null();
 }
 #ifndef PRODUCT
-void print_data_on(outputStream* st) const;
+void print_data_on(outputStream* st, const char* extra) const;
 #endif
 };
 class ciRetData : public RetData {
 bool parameter_maybe_null(int i) const {
 return parameters()->maybe_null(i);
 }
 #ifndef PRODUCT
-void print_data_on(outputStream* st) const;
+void print_data_on(outputStream* st, const char* extra) 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);
+}
+void set_method(ciMethod* m) {
+set_intptr_at(method_offset, (intptr_t)m);
+}
+#ifndef PRODUCT
+void print_data_on(outputStream* st, const char* extra) const;
 #endif
 };
 // ciMethodData
 //
 // What is the index of the first data entry?
 int first_di() { return 0; }
 ciArgInfoData *arg_info() const;
+address data_base() const {
+return (address) _data;
+}
+DataLayout* limit_data_position() const {
+return (DataLayout*)((address)data_base() + _data_size);
+}
+void load_extra_data();
+ciProfileData* bci_to_extra_data(int bci, ciMethod* m, bool& two_free_slots);
 public:
 bool is_method_data() const { return true; }
 bool is_empty()  { return _state == empty_state; }
 bool is_mature() { return _state == mature_state; }
 int creation_mileage() { return _orig.creation_mileage(); }
 int current_mileage()  { return _current_mileage; }
 int invocation_count() { return _invocation_counter; }
 int backedge_count()   { return _backedge_counter;   }
+#if INCLUDE_RTM_OPT
+// return cached value
+int rtm_state() {
+if (is_empty()) {
+return NoRTM;
+} else {
+return get_MethodData()->rtm_state();
+}
+}
+#endif
 // Transfer information about the method to MethodData*.
 // would_profile means we would like to profile this method,
 // meaning it's not trivial.
 void set_would_profile(bool p);
 // Also set the numer of loops and blocks in the method.
 // Walk through the data in order.
 ciProfileData* first_data() { return data_at(first_di()); }
 ciProfileData* next_data(ciProfileData* current);
 bool is_valid(ciProfileData* current) { return current != NULL; }
-// Get the data at an arbitrary bci, or NULL if there is none.
+DataLayout* extra_data_base() const { return limit_data_position(); }
-ciProfileData* bci_to_data(int bci);
-ciProfileData* bci_to_extra_data(int bci, bool create_if_missing);
+// Get the data at an arbitrary bci, or NULL if there is none. If m
+// is not NULL look for a SpeculativeTrapData if any first.
+ciProfileData* bci_to_data(int bci, ciMethod* m = NULL);
 uint overflow_trap_count() const {
 return _orig.overflow_trap_count();
 }
 uint overflow_recompile_count() const {
 uint trap_reason_limit() const { return _orig.trap_reason_limit(); }
 uint trap_count_limit()  const { return _orig.trap_count_limit(); }
 // Helpful query functions that decode trap_state.
 int has_trap_at(ciProfileData* data, int reason);
-int has_trap_at(int bci, int reason) {
+int has_trap_at(int bci, ciMethod* m, int reason) {
-return has_trap_at(bci_to_data(bci), reason);
+assert((m != NULL) == Deoptimization::reason_is_speculate(reason), "inconsistent method/reason");
+return has_trap_at(bci_to_data(bci, m), reason);
 }
 int trap_recompiled_at(ciProfileData* data);
-int trap_recompiled_at(int bci) {
+int trap_recompiled_at(int bci, ciMethod* m) {
-return trap_recompiled_at(bci_to_data(bci));
+return trap_recompiled_at(bci_to_data(bci, m));
 }
 void clear_escape_info();
 bool has_escape_info();
 void update_escape_info();

Mercurial > hg > truffle

comparison src/share/vm/ci/ciMethodData.hpp @ 18041:52b4284cb496