am c6c0a402: am 50dffeee: Merge "Fix local reference leaks in debugger and use a cache."

* commit 'c6c0a402fe2e7e51e9ba7dd8817eb44696f00347':
  Fix local reference leaks in debugger and use a cache.
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index dc6043d..2b04693 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) |