ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-08 14:03:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

check superclasses in fieldForOffset, not just immediate class

Browse Source
This commit is contained in:
Joel Dice 2012-03-11 05:04:12 -06:00
parent 8590695f2d
commit 3e38628ad6
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/classpath-openjdk.cpp
View File

@ -2207,19 +2207,40 @@ pipeAvailable(int fd, int* available)
} }
object object
fieldForOffset(Thread* t, object o, unsigned offset) fieldForOffsetInClass(Thread* t, object c, unsigned offset)
{ {
object table = classFieldTable(t, objectClass(t, o)); object super = classSuper(t, c);
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) { if (super) {
object field = objectArrayBody(t, table, i); object field = fieldForOffsetInClass(t, super, offset);
if ((fieldFlags(t, field) & ACC_STATIC) == 0 if (field) {
and fieldOffset(t, field) == offset)
{
return field; return field;
} }
} }
abort(t); object table = classFieldTable(t, c);
if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i);
if ((fieldFlags(t, field) & ACC_STATIC) == 0
and fieldOffset(t, field) == offset)
{
return field;
}
}
}
return 0;
}
object
fieldForOffset(Thread* t, object o, unsigned offset)
{
object field = fieldForOffsetInClass(t, objectClass(t, o), offset);
if (field) {
return field;
} else {
abort(t);
}
} }
} // namespace local } // namespace local