am 60764549: Merge "Revert "Revert "Quick compiler: remove temporary workaround."""

* commit '607645493171eb84213c8af7efcb1c10480a281b':
  Revert "Revert "Quick compiler: remove temporary workaround.""

diff --cc compiler/dex/frontend.cc
index 3981550,dc6043d..d097500
--- 1/compiler/dex/frontend.cc
--- 2/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@@ -42,12 -42,11 +42,12 @@@ extern "C" void ArtUnInitQuickCompilerC
  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) |   // TODO:  Temporary workaround, restore when b/15024623 fixed.
+   // (1 << kSuppressLoads) |
    // (1 << kNullCheckElimination) |
    // (1 << kClassInitCheckElimination) |
 +  // (1 << kGlobalValueNumbering) |
    // (1 << kPromoteRegs) |
-   (1 << kTrackLiveTemps) |   // TODO: Temporary workaround, restore when b/15024623 fixed.
+   // (1 << kTrackLiveTemps) |
    // (1 << kSafeOptimizations) |
    // (1 << kBBOpt) |
    // (1 << kMatch) |