From a12c2a945fe3f10d3ed31aa5db3e422cc1ad7f98 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 21 Aug 2014 18:28:20 -0700 Subject: [PATCH] Fix testing wrong variable for non zygote. For non zygote we want to only have a single non moving space to let dex2oat use RosAlloc for all allocations. Fixed stale low memory logic in parsed options. Bug: 17189964 Change-Id: I85a565002fd18ae30105df084796521abd60ea12 --- runtime/gc/heap.cc | 2 +- runtime/parsed_options.cc | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 8d74f10eb..824791128 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -225,7 +225,7 @@ Heap::Heap(size_t initial_size, size_t growth_limit, size_t min_free, size_t max +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- */ bool support_homogeneous_space_compaction = - background_collector_type == gc::kCollectorTypeHomogeneousSpaceCompact || + background_collector_type_ == gc::kCollectorTypeHomogeneousSpaceCompact || use_homogeneous_space_compaction_for_oom; // We may use the same space the main space for the non moving space if we don't need to compact // from the main space. diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index bf379f6bd..cda6547c8 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -397,10 +397,6 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize } else if (option == "-XX:IgnoreMaxFootprint") { ignore_max_footprint_ = true; } else if (option == "-XX:LowMemoryMode") { - if (background_collector_type_ == gc::kCollectorTypeHomogeneousSpaceCompact) { - // Use semispace instead of homogenous space compact for low memory mode. - background_collector_type_ = gc::kCollectorTypeSS; - } low_memory_mode_ = true; // TODO Might want to turn off must_relocate here. } else if (option == "-XX:UseTLAB") { -- 2.11.0