equal
deleted
inserted
replaced
334 |
334 |
335 int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i); |
335 int name_and_type_ref_i = scratch_cp->uncached_name_and_type_ref_index_at(scratch_i); |
336 int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i, |
336 int new_name_and_type_ref_i = find_or_append_indirect_entry(scratch_cp, name_and_type_ref_i, |
337 merge_cp_p, merge_cp_length_p, THREAD); |
337 merge_cp_p, merge_cp_length_p, THREAD); |
338 |
338 |
339 const char *entry_name; |
339 const char *entry_name = NULL; |
340 switch (scratch_cp->tag_at(scratch_i).value()) { |
340 switch (scratch_cp->tag_at(scratch_i).value()) { |
341 case JVM_CONSTANT_Fieldref: |
341 case JVM_CONSTANT_Fieldref: |
342 entry_name = "Fieldref"; |
342 entry_name = "Fieldref"; |
343 (*merge_cp_p)->field_at_put(*merge_cp_length_p, new_klass_ref_i, |
343 (*merge_cp_p)->field_at_put(*merge_cp_length_p, new_klass_ref_i, |
344 new_name_and_type_ref_i); |
344 new_name_and_type_ref_i); |