am b15cbd16: am 8addd1f1: am 65e3b69b: Merge "Move modify_ldt_lock into global lock order."
* commit 'b15cbd16c062af85bbfe12019f7e7a2f5bd2fe5a':
Move modify_ldt_lock into global lock order.
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index ec2556b..b0cb80a 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;