jdk-sandbox: comparison hotspot/src/share/vm/ci/ciMethodData.cpp

equal deleted inserted replaced

-:c646ef2f5d58
+:a0e996680b05
 _state = empty_state;
 _saw_free_extra_data = false;
 // Set an initial hint. Don't use set_hint_di() because
 // first_di() may be out of bounds if data_size is 0.
 _hint_di = first_di();
+// Initialize the escape information (to "don't know.");
+_eflags = _arg_local = _arg_stack = _arg_returned = 0;
 }
 // ------------------------------------------------------------------
 // ciMethodData::ciMethodData
 //
 _state = empty_state;
 _saw_free_extra_data = false;
 // Set an initial hint. Don't use set_hint_di() because
 // first_di() may be out of bounds if data_size is 0.
 _hint_di = first_di();
+// Initialize the escape information (to "don't know.");
+_eflags = _arg_local = _arg_stack = _arg_returned = 0;
 }
 void ciMethodData::load_data() {
 methodDataOop mdo = get_methodDataOop();
 if (mdo == NULL) return;
 return new ciRetData(data_layout);
 case DataLayout::branch_data_tag:
 return new ciBranchData(data_layout);
 case DataLayout::multi_branch_data_tag:
 return new ciMultiBranchData(data_layout);
+case DataLayout::arg_info_data_tag:
+return new ciArgInfoData(data_layout);
 };
 }
 // Iteration over data.
 ciProfileData* ciMethodData::next_data(ciProfileData* current) {
 DataLayout* end = data_layout_at(data_size() + extra_data_size());
 for (; dp < end; dp = methodDataOopDesc::next_extra(dp)) {
 if (dp->tag() == DataLayout::no_tag) {
 _saw_free_extra_data = true;  // observed an empty slot (common case)
 return NULL;
+}
+if (dp->tag() == DataLayout::arg_info_data_tag) {
+break; // ArgInfoData is at the end of extra data section.
 }
 if (dp->bci() == bci) {
 assert(dp->tag() == DataLayout::bit_data_tag, "sane");
 return new ciBitData(dp);
 }
 }
 void ciMethodData::clear_escape_info() {
 VM_ENTRY_MARK;
 methodDataOop mdo = get_methodDataOop();
-if (mdo != NULL)
+if (mdo != NULL) {
 mdo->clear_escape_info();
+ArgInfoData *aid = arg_info();
+int arg_count = (aid == NULL) ? 0 : aid->number_of_args();
+for (int i = 0; i < arg_count; i++) {
+set_arg_modified(i, 0);
+}
+}
 _eflags = _arg_local = _arg_stack = _arg_returned = 0;
 }
 // copy our escape info to the methodDataOop if it exists
 void ciMethodData::update_escape_info() {
 if ( mdo != NULL) {
 mdo->set_eflags(_eflags);
 mdo->set_arg_local(_arg_local);
 mdo->set_arg_stack(_arg_stack);
 mdo->set_arg_returned(_arg_returned);
+int arg_count = mdo->method()->size_of_parameters();
+for (int i = 0; i < arg_count; i++) {
+mdo->set_arg_modified(i, arg_modified(i));
+}
 }
 }
 bool ciMethodData::has_escape_info() {
 return eflag_set(methodDataOopDesc::estimated);
 void ciMethodData::set_arg_returned(int i) {
 set_nth_bit(_arg_returned, i);
 }
+void ciMethodData::set_arg_modified(int arg, uint val) {
+ArgInfoData *aid = arg_info();
+if (aid == NULL)
+return;
+assert(arg >= 0 && arg < aid->number_of_args(), "valid argument number");
+aid->set_arg_modified(arg, val);
+}
 bool ciMethodData::is_arg_local(int i) const {
 return is_set_nth_bit(_arg_local, i);
 }
 bool ciMethodData::is_arg_stack(int i) const {
 return is_set_nth_bit(_arg_stack, i);
 }
 bool ciMethodData::is_arg_returned(int i) const {
 return is_set_nth_bit(_arg_returned, i);
+}
+uint ciMethodData::arg_modified(int arg) const {
+ArgInfoData *aid = arg_info();
+if (aid == NULL)
+return 0;
+assert(arg >= 0 && arg < aid->number_of_args(), "valid argument number");
+return aid->arg_modified(arg);
 }
 ByteSize ciMethodData::offset_of_slot(ciProfileData* data, ByteSize slot_offset_in_data) {
 // Get offset within methodDataOop of the data array
 ByteSize data_offset = methodDataOopDesc::data_offset();
 // Add in counter_offset, the # of bytes into the ProfileData of counter or flag
 int offset = in_bytes(data_offset) + cell_offset + in_bytes(slot_offset_in_data);
 return in_ByteSize(offset);
 }
+ciArgInfoData *ciMethodData::arg_info() const {
+// Should be last, have to skip all traps.
+DataLayout* dp  = data_layout_at(data_size());
+DataLayout* end = data_layout_at(data_size() + extra_data_size());
+for (; dp < end; dp = methodDataOopDesc::next_extra(dp)) {
+if (dp->tag() == DataLayout::arg_info_data_tag)
+return new ciArgInfoData(dp);
+}
+return NULL;
+}
 // Implementation of the print method.
 void ciMethodData::print_impl(outputStream* st) {
 ciObject::print_impl(st);
 }
 for (data = first_data(); is_valid(data); data = next_data(data)) {
 st->print("%d", dp_to_di(data->dp()));
 st->fill_to(6);
 data->print_data_on(st);
 }
+st->print_cr("--- Extra data:");
+DataLayout* dp  = data_layout_at(data_size());
+DataLayout* end = data_layout_at(data_size() + extra_data_size());
+for (; dp < end; dp = methodDataOopDesc::next_extra(dp)) {
+if (dp->tag() == DataLayout::no_tag)  continue;
+if (dp->tag() == DataLayout::bit_data_tag) {
+data = new BitData(dp);
+} else {
+assert(dp->tag() == DataLayout::arg_info_data_tag, "must be BitData or ArgInfo");
+data = new ciArgInfoData(dp);
+dp = end; // ArgInfoData is at the end of extra data section.
+}
+st->print("%d", dp_to_di(data->dp()));
+st->fill_to(6);
+data->print_data_on(st);
+}
 }
 void ciReceiverTypeData::print_receiver_data_on(outputStream* st) {
 uint row;
 int entries = 0;

changeset 218	a0e996680b05
parent 1	489c9b5090e2
child 670	ddf3e9583f2f