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

don't resolve all constant pool entries in linkClass - just the field and method specs

Browse Source
This commit is contained in:
Joel Dice 2009-08-18 15:27:21 -06:00
parent 6449c8275a
commit 01dcb1661b
1 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/machine.cpp
View File

@ -2943,48 +2943,13 @@ linkClass(Thread* t, object loader, object class_)
} }
if (classMethodTable(t, class_)) { if (classMethodTable(t, class_)) {
bool resolvedPool = false;
for (unsigned i = 0; for (unsigned i = 0;
i < arrayLength(t, classMethodTable(t, class_)); ++i) i < arrayLength(t, classMethodTable(t, class_)); ++i)
{ {
object method = arrayBody(t, classMethodTable(t, class_), i); object spec = methodSpec
PROTECT(t, method); (t, arrayBody(t, classMethodTable(t, class_), i));
object code = methodCode(t, method);
if ((not resolvedPool)
and code
and codePool(t, code)
and objectClass(t, codePool(t, code))
== arrayBody(t, t->m->types, Machine::SingletonType))
{
object pool = codePool(t, code);
PROTECT(t, pool);
unsigned count = singletonCount(t, pool);
for (unsigned j = 0; j < count; ++j) {
if (singletonIsObject(t, pool, j)) {
object entry = singletonObject(t, pool, j);
if (objectClass(t, entry)
== arrayBody(t, t->m->types, Machine::ReferenceType))
{
if (referenceSpec(t, entry) == 0) {
resolveClassInPool(t, loader, method, j);
} else if (byteArrayBody(t, referenceSpec(t, entry), 0) == '(')
{
resolveMethod(t, loader, method, j);
} else {
resolveField(t, loader, method, j);
}
if (UNLIKELY(t->exception)) return;
}
}
}
resolvedPool = true;
}
object spec = methodSpec(t, method);
PROTECT(t, spec); PROTECT(t, spec);
for (unsigned j = 1; j < byteArrayLength(t, spec);) { for (unsigned j = 1; j < byteArrayLength(t, spec);) {
j = resolveSpec(t, loader, spec, j); j = resolveSpec(t, loader, spec, j);
if (UNLIKELY(t->exception)) return; if (UNLIKELY(t->exception)) return;