commit bd9651e181474d835b8dd68a2b3f30fa763834bf
author Barry Hayes <bhayes@google.com> Wed Jul 21 11:38:54 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 21 11:38:54 2010 -0700
tree 07ce55337d8996f2eb2c93b7c249a6ac0bc3c1f5
parent 1c47636eb67c371653544c31612b35e0922a7689
parent 8a0b52386b1b34c132b11eba8e534ca26665077e

Merge "Fixup a failing assert." into dalvik-dev

vm/alloc/HeapSource.c

diff --git a/vm/alloc/HeapSource.c b/vm/alloc/HeapSource.c
index 527ec2e..62c0740 100644
--- a/vm/alloc/HeapSource.c
+++ b/vm/alloc/HeapSource.c
@@ -691,8 +691,8 @@
     dst->bitsLen = HB_OFFSET_TO_BYTE_INDEX(max - base) + sizeof(dst->bits);
     /* The exclusive limit from bitsLen is greater than the inclusive max. */
     assert(base + HB_MAX_OFFSET(dst) > max);
-    /* The exclusive limit is less than one word of bits beyond max. */
-    assert((base + HB_MAX_OFFSET(dst)) - max <
+    /* The exclusive limit is at most one word of bits beyond max. */
+    assert((base + HB_MAX_OFFSET(dst)) - max <=
            HB_OBJECT_ALIGNMENT * HB_BITS_PER_WORD);
     dst->allocLen = dst->bitsLen;
     offset = base - src->base;