summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorJeff Hao <jeffhao@google.com>2015-06-22 15:14:49 -0700
committerJeff Hao <jeffhao@google.com>2015-06-22 15:14:49 -0700
commit37fd5275c665b483f2d990634a500c4e79aae87f (patch)
tree5ffa36b77ab487ef13a6e964ba0cbecefc13013f /runtime
parent38fafa18f0fcf610f6314a0fc4165e04e6e5d017 (diff)
downloadart-37fd5275c665b483f2d990634a500c4e79aae87f.zip
art-37fd5275c665b483f2d990634a500c4e79aae87f.tar.gz
art-37fd5275c665b483f2d990634a500c4e79aae87f.tar.bz2
Change GC to allow strings to use large object space.
Bug: 21209641 Change-Id: Ib007a30e575e391e2b5bddb816a9d2e82502c7d5
Diffstat (limited to 'runtime')
-rw-r--r--runtime/gc/heap-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h
index 2d54330..a6cafd6 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>