Merge branch 'master' of oss.readytalk.com:/var/local/git/avian

This commit is contained in:
Joel Dice 2008-07-11 19:26:53 -06:00
commit 149949a2d2
2 changed files with 2 additions and 2 deletions

View File

@ -5107,7 +5107,7 @@ compile(MyThread* t, object method)
if (methodVirtual(t, method)) {
classVtable(t, methodClass(t, method), methodOffset(t, method))
= &singletonValue(t, compiled, 0);
= &singletonValue(t, methodCompiled(t, method), 0);
}
}
}

View File

@ -168,7 +168,7 @@ killZombies(Thread* t, Thread* o)
unsigned
footprint(Thread* t)
{
unsigned n = t->heapOffset + t->heapIndex;
unsigned n = t->heapOffset + t->heapIndex + t->backupHeapIndex;
for (Thread* c = t->child; c; c = c->peer) {
n += footprint(c);