am 2895b7e6: am 3e0d1db6: am aca0ca9d: Merge "Change profiler file name parsing option"
* commit '2895b7e6257e6c600d37083c4ba9bb0c00b82850':
Change profiler file name parsing option
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index 77b5057..ba4c5e1 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -42,11 +42,11 @@
static uint32_t kCompilerOptimizerDisableFlags = 0 | // Disable specific optimizations
(1 << kLoadStoreElimination) | // TODO: this pass has been broken for awhile - fix or delete.
// (1 << kLoadHoisting) |
- // (1 << kSuppressLoads) |
+ (1 << kSuppressLoads) | // TODO: Temporary workaround, restore when b/15024623 fixed.
// (1 << kNullCheckElimination) |
// (1 << kClassInitCheckElimination) |
// (1 << kPromoteRegs) |
- // (1 << kTrackLiveTemps) |
+ (1 << kTrackLiveTemps) | // TODO: Temporary workaround, restore when b/15024623 fixed.
// (1 << kSafeOptimizations) |
// (1 << kBBOpt) |
// (1 << kMatch) |
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 4330d27..f86c73d 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -193,7 +193,7 @@
#endif
// If background_collector_type_ is kCollectorTypeNone, it defaults to the collector_type_ after
// parsing options.
- background_collector_type_ = gc::kCollectorTypeNone;
+ background_collector_type_ = gc::kCollectorTypeSS;
stack_size_ = 0; // 0 means default.
max_spins_before_thin_lock_inflation_ = Monitor::kDefaultMaxSpinsBeforeThinLockInflation;
low_memory_mode_ = false;