OSDN Git Service

Revert "When aliasing a bitmap, use smallest available limit."
authorCarl Shapiro <cshapiro@google.com>
Mon, 19 Jul 2010 22:55:01 +0000 (15:55 -0700)
committerCarl Shapiro <cshapiro@google.com>
Mon, 19 Jul 2010 22:55:01 +0000 (15:55 -0700)
This did not correctly compute the intended limit.

This reverts commit 740cd296284e682d9d92bd638d266efccf817bbe.

vm/alloc/HeapSource.c

index 8cf4b44..418945c 100644 (file)
@@ -711,10 +711,9 @@ void dvmHeapSourceGetObjectBitmaps(HeapBitmap liveBits[], HeapBitmap markBits[],
     HS_BOILERPLATE();
 
     assert(numHeaps == hs->numHeaps);
-    assert(hs->liveBits.max >= hs->markBits.max);
     for (i = 0; i < hs->numHeaps; ++i) {
         base = (uintptr_t)hs->heaps[i].base;
-        max = MIN((uintptr_t)hs->heaps[i].limit - 1, hs->liveBits.max);
+        max = (uintptr_t)hs->heaps[i].limit - 1;
         aliasBitmap(&liveBits[i], &hs->liveBits, base, max);
         aliasBitmap(&markBits[i], &hs->markBits, base, max);
     }