archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6667620: (Escape Analysis) fix deoptimization for scalar replaced objects

Browse source 
Deoptimization code for reallocation and relocking scalar replaced objects has to be fixed.

Reviewed-by: rasbold, never
This commit is contained in:
Vladimir Kozlov 2008-03-11 11:25:13 -07:00
parent 50708126d4
commit 96e8bcb6aa
6 changed files with 163 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

26
hotspot/src/share/vm/oops/instanceKlass.cpp
View file

@ -791,17 +791,39 @@ void instanceKlass::do_local_static_fields_impl(instanceKlassHandle this_oop, vo
}
static int compare_fields_by_offset(int* a, int* b) {
return a[0] - b[0];
}
void instanceKlass::do_nonstatic_fields(FieldClosure* cl) {
fieldDescriptor fd;
instanceKlass* super = superklass();
if (super != NULL) {
super->do_nonstatic_fields(cl);
}
fieldDescriptor fd;
int length = fields()->length();
// In DebugInfo nonstatic fields are sorted by offset.
int* fields_sorted = NEW_C_HEAP_ARRAY(int, 2*(length+1));
int j = 0;
for (int i = 0; i < length; i += next_offset) {
fd.initialize(as_klassOop(), i);
if (!(fd.is_static())) cl->do_field(&fd);
if (!fd.is_static()) {
fields_sorted[j + 0] = fd.offset();
fields_sorted[j + 1] = i;
j += 2;
}
}
if (j > 0) {
length = j;
// _sort_Fn is defined in growableArray.hpp.
qsort(fields_sorted, length/2, 2*sizeof(int), (_sort_Fn)compare_fields_by_offset);
for (int i = 0; i < length; i += 2) {
fd.initialize(as_klassOop(), fields_sorted[i + 1]);
assert(!fd.is_static() && fd.offset() == fields_sorted[i], "only nonstatic fields");
cl->do_field(&fd);
}
}
FREE_C_HEAP_ARRAY(int, fields_sorted);
}