diff options
| author | Jeff Hao <jeffhao@google.com> | 2015-06-22 22:26:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 22:26:55 +0000 |
| commit | 7695200065c2e81b40096e1018a0d73e7391da13 (patch) | |
| tree | 1dd198c3fc311c190c36ed0c32bfc06e96a3fbf1 /runtime | |
| parent | 67b00a12a07fb7c98477d9ca9a25522480fccea6 (diff) | |
| parent | 37fd5275c665b483f2d990634a500c4e79aae87f (diff) | |
| download | android_art-7695200065c2e81b40096e1018a0d73e7391da13.tar.gz android_art-7695200065c2e81b40096e1018a0d73e7391da13.tar.bz2 android_art-7695200065c2e81b40096e1018a0d73e7391da13.zip | |
Merge "Change GC to allow strings to use large object space." into mnc-dev
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/heap-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h index 2d5433032d..a6cafd66bb 100644 --- a/runtime/gc/heap-inl.h +++ b/runtime/gc/heap-inl.h @@ -391,7 +391,7 @@ inline bool Heap::ShouldAllocLargeObject(mirror::Class* c, size_t byte_count) co // Zygote resulting in it being prematurely freed. // We can only do this for primitive objects since large objects will not be within the card table // range. This also means that we rely on SetClass not dirtying the object's card. - return byte_count >= large_object_threshold_ && c->IsPrimitiveArray(); + return byte_count >= large_object_threshold_ && (c->IsPrimitiveArray() || c->IsStringClass()); } template <bool kGrow> |