commit 4873d465a1eb6dfbdeddb085c81239d39db60c42
author Brian Carlstrom <bdc@google.com> Sun Aug 21 15:23:39 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 22 09:27:33 2011 -0700
tree 8eb73bf441d631b34252d8e358eff66718b63aab
parent 94496d37e42dbbbcf515f43ccb9a03ac82e48927

Move static field storage to end of Class instance

Change-Id: I90061999c9eef9d900e4269508b983a61f48b264

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index 7369804..f86f556 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -103,6 +103,7 @@
 Object* Heap::AllocObject(Class* klass, size_t num_bytes) {
   DCHECK(klass == NULL
          || klass->descriptor_ == NULL
+         || (klass->IsClassClass() && num_bytes >= sizeof(Class))
          || (klass->object_size_ == (klass->IsArray() ? 0 : num_bytes)));
   Object* obj = Allocate(num_bytes);
   if (obj != NULL) {