comparison src/share/vm/ci/ciMethodData.cpp @ 14726:92aa6797d639

Backed out merge changeset: b51e29501f30 Backed out merge revision to its first parent (8f483e200405)
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Mar 2014 21:30:43 +0100
parents 53ed0f89f44e
children
comparison
equal deleted inserted replaced
14719:0bdd0d157040 14726:92aa6797d639
85 DataLayout* dp_src = mdo->extra_data_base(); 85 DataLayout* dp_src = mdo->extra_data_base();
86 DataLayout* end_src = mdo->extra_data_limit(); 86 DataLayout* end_src = mdo->extra_data_limit();
87 DataLayout* dp_dst = extra_data_base(); 87 DataLayout* dp_dst = extra_data_base();
88 for (;; dp_src = MethodData::next_extra(dp_src), dp_dst = MethodData::next_extra(dp_dst)) { 88 for (;; dp_src = MethodData::next_extra(dp_src), dp_dst = MethodData::next_extra(dp_dst)) {
89 assert(dp_src < end_src, "moved past end of extra data"); 89 assert(dp_src < end_src, "moved past end of extra data");
90 // New traps in the MDO can be added as we translate the copy so 90 assert(dp_src->tag() == dp_dst->tag(), err_msg("should be same tags %d != %d", dp_src->tag(), dp_dst->tag()));
91 // look at the entries in the copy. 91 switch(dp_src->tag()) {
92 switch(dp_dst->tag()) {
93 case DataLayout::speculative_trap_data_tag: { 92 case DataLayout::speculative_trap_data_tag: {
94 ciSpeculativeTrapData* data_dst = new ciSpeculativeTrapData(dp_dst); 93 ciSpeculativeTrapData* data_dst = new ciSpeculativeTrapData(dp_dst);
95 SpeculativeTrapData* data_src = new SpeculativeTrapData(dp_src); 94 SpeculativeTrapData* data_src = new SpeculativeTrapData(dp_src);
96 data_dst->translate_from(data_src); 95 data_dst->translate_from(data_src);
97 break; 96 break;
101 case DataLayout::no_tag: 100 case DataLayout::no_tag:
102 case DataLayout::arg_info_data_tag: 101 case DataLayout::arg_info_data_tag:
103 // An empty slot or ArgInfoData entry marks the end of the trap data 102 // An empty slot or ArgInfoData entry marks the end of the trap data
104 return; 103 return;
105 default: 104 default:
106 fatal(err_msg("bad tag = %d", dp_dst->tag())); 105 fatal(err_msg("bad tag = %d", dp_src->tag()));
107 } 106 }
108 } 107 }
109 } 108 }
110 109
111 void ciMethodData::load_data() { 110 void ciMethodData::load_data() {