commit df7f7f02b26f8a8b47345e713ce097ec0e956a11
author Mathieu Chartier <mathieuc@google.com> Thu Oct 05 09:47:58 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Oct 05 09:49:51 2017 -0700
tree 2bb4d112aa8f7b08725ae060256bbe86cabd1525
parent f931445cc883e70240f744a5fa842aba339e46dd

Address comment for aog/502433

Added a comment describing the fix.

Bug: 37885600
Test: test-art-host

Change-Id: Ia21ce29a6bee1b8f6992a2c051b32b5ab4356191

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 10fa4d2..4004af2 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -3855,6 +3855,8 @@
 }
 
 void Heap::CheckPreconditionsForAllocObject(ObjPtr<mirror::Class> c, size_t byte_count) {
+  // Compare rounded sizes since the allocation may have been retried after rounding the size.
+  // See b/37885600
   CHECK(c == nullptr || (c->IsClassClass() && byte_count >= sizeof(mirror::Class)) ||
         (c->IsVariableSize() ||
             RoundUp(c->GetObjectSize(), kObjectAlignment) ==