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

ensure that we populate the interface vtables of a class which does not declare any new virtual methods but does implement new interfaces relative to its superclass

Browse Source
This commit is contained in:
Joel Dice 2008-01-28 08:12:06 -07:00
parent 707359d555
commit de6a1ded92
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/machine.cpp
View File

@ -1344,6 +1344,8 @@ parseMethodTable(Thread* t, Stream& s, object class_, object pool)
set(t, class_, ClassMethodTable, methodTable);
}
bool populateInterfaceVtables = false;
if (declaredVirtualCount == 0
and (classFlags(t, class_) & ACC_INTERFACE) == 0)
{
@ -1358,10 +1360,12 @@ parseMethodTable(Thread* t, Stream& s, object class_, object pool)
// inherit interface table from superclass
set(t, class_, ClassInterfaceTable,
classInterfaceTable(t, classSuper(t, class_)));
}
} else {
populateInterfaceVtables = true;
}
} else {
// apparently Object does not have any virtual methods. We give
// it a vtable anyway so code doesn't break elsewhere.
// apparently, Object does not have any virtual methods. We
// give it a vtable anyway so code doesn't break elsewhere.
object vtable = makeArray(t, 0, false);
set(t, class_, ClassVirtualTable, vtable);
}
@ -1404,25 +1408,28 @@ parseMethodTable(Thread* t, Stream& s, object class_, object pool)
set(t, class_, ClassVirtualTable, vtable);
if ((classFlags(t, class_) & ACC_INTERFACE) == 0) {
// generate interface vtables
object itable = classInterfaceTable(t, class_);
if (itable) {
PROTECT(t, itable);
populateInterfaceVtables = true;
}
}
for (unsigned i = 0; i < arrayLength(t, itable); i += 2) {
object ivtable = classVirtualTable(t, arrayBody(t, itable, i));
if (ivtable) {
object vtable = arrayBody(t, itable, i + 1);
if (populateInterfaceVtables) {
// generate interface vtables
object itable = classInterfaceTable(t, class_);
if (itable) {
PROTECT(t, itable);
for (unsigned i = 0; i < arrayLength(t, itable); i += 2) {
object ivtable = classVirtualTable(t, arrayBody(t, itable, i));
if (ivtable) {
object vtable = arrayBody(t, itable, i + 1);
for (unsigned j = 0; j < arrayLength(t, ivtable); ++j) {
object method = arrayBody(t, ivtable, j);
method = hashMapFind
(t, virtualMap, method, methodHash, methodEqual);
assert(t, method);
for (unsigned j = 0; j < arrayLength(t, ivtable); ++j) {
object method = arrayBody(t, ivtable, j);
method = hashMapFind
(t, virtualMap, method, methodHash, methodEqual);
assert(t, method);
set(t, vtable, ArrayBody + (j * BytesPerWord), method);
}
set(t, vtable, ArrayBody + (j * BytesPerWord), method);
}
}
}
@ -2199,6 +2206,8 @@ allocate3(Thread* t, Allocator* allocator, Machine::AllocationType type,
if (t->heap == 0) {
ENTER(t, Thread::ExclusiveState);
// fprintf(stderr, "gc");
// vmPrintTrace(t);
collect(t, Heap::MinorCollection);
}

3
src/machine.h
View File

@ -2230,4 +2230,7 @@ makeSingleton(Thread* t, unsigned count)
} // namespace vm
void
vmPrintTrace(vm::Thread* t);
#endif//MACHINE_H