diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-10-23 15:21:37 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-10-23 15:38:26 -0700 |
| commit | 79b4f38dd35b83206e8166aaafb94bd75c3318b3 (patch) | |
| tree | 335bd7217c03932c0875697d431e475b56111cc5 /runtime/mirror/class-inl.h | |
| parent | 1984152ac92aad244ae15184d12f9ceade686b7b (diff) | |
| download | art-79b4f38dd35b83206e8166aaafb94bd75c3318b3.zip art-79b4f38dd35b83206e8166aaafb94bd75c3318b3.tar.gz art-79b4f38dd35b83206e8166aaafb94bd75c3318b3.tar.bz2 | |
Fix incorrect initial dex cache size.
We were previously setting it to be sizeof(DexCacheClass) instead
of sizeof(DexCache). This was causing some problems with
compaction when I relied on the object sizes being accurate to
visit objects in the bump pointer space.
Bug: 8981901
Change-Id: Iede04763aced041986b1b239368fc867143ad70d
Diffstat (limited to 'runtime/mirror/class-inl.h')
| -rw-r--r-- | runtime/mirror/class-inl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 88cffb7..cd5e865 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -35,9 +35,7 @@ namespace mirror { inline size_t Class::GetObjectSize() const { DCHECK(!IsVariableSize()) << " class=" << PrettyTypeOf(this); DCHECK_EQ(sizeof(size_t), sizeof(int32_t)); - size_t result = GetField32(OFFSET_OF_OBJECT_MEMBER(Class, object_size_), false); - DCHECK_GE(result, sizeof(Object)) << " class=" << PrettyTypeOf(this); - return result; + return GetField32(OFFSET_OF_OBJECT_MEMBER(Class, object_size_), false); } inline Class* Class::GetSuperClass() const { |