diff options
author | Igor Murashkin <iam@google.com> | 2015-02-04 15:11:27 -0800 |
---|---|---|
committer | Igor Murashkin <iam@google.com> | 2015-02-04 15:11:27 -0800 |
commit | 446ba4baa35f9eed9ee598438f25fdf02e4a582c (patch) | |
tree | a4bb75cbed9ab5c9806598b24454f44f2b21354f /runtime/gc | |
parent | 1bb6cb0b7e10698f12213f7a4fabc845057d9ab9 (diff) | |
download | art-446ba4baa35f9eed9ee598438f25fdf02e4a582c.zip art-446ba4baa35f9eed9ee598438f25fdf02e4a582c.tar.gz art-446ba4baa35f9eed9ee598438f25fdf02e4a582c.tar.bz2 |
Fix broken volantis build
Change-Id: Iedc1a94fd1ec4224b605b984c11cfcc8c1c510e3
Diffstat (limited to 'runtime/gc')
-rw-r--r-- | runtime/gc/heap.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index 0beb20c..57c1460 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -145,15 +145,14 @@ class Heap { static constexpr double kDefaultHeapGrowthMultiplier = 2.0; // Primitive arrays larger than this size are put in the large object space. static constexpr size_t kDefaultLargeObjectThreshold = 3 * kPageSize; + // Whether or not we use the free list large object space. Only use it if USE_ART_LOW_4G_ALLOCATOR // since this means that we have to use the slow msync loop in MemMap::MapAnonymous. -#if USE_ART_LOW_4G_ALLOCATOR - static constexpr space::LargeObjectSpaceType kDefaultLargeObjectSpaceType = - space::kLargeObjectSpaceTypeFreeList; -#else static constexpr space::LargeObjectSpaceType kDefaultLargeObjectSpaceType = - space::LargeObjectSpaceType::kMap; -#endif + USE_ART_LOW_4G_ALLOCATOR ? + space::LargeObjectSpaceType::kFreeList + : space::LargeObjectSpaceType::kMap; + // Used so that we don't overflow the allocation time atomic integer. static constexpr size_t kTimeAdjust = 1024; |