Merge "ART: Added dirty flag to optimizations"

diff --cc compiler/dex/bb_optimizations.h
Simple merge

diff --cc compiler/dex/pass_driver_me_opts.cc
index aea7543,f3e82da..ed2c2d2
--- 1/compiler/dex/pass_driver_me_opts.cc
--- 2/compiler/dex/pass_driver_me_opts.cc
+++ b/compiler/dex/pass_driver_me_opts.cc
@@@ -69,14 -69,7 +69,11 @@@ std::string PassDriver<PassDriverMEOpts
  template<>
  bool PassDriver<PassDriverMEOpts>::default_print_passes_ = false;
  
 +// By default, there are no overridden pass settings.
 +template<>
 +std::string PassDriver<PassDriverMEOpts>::overridden_pass_options_list_ = std::string();
 +
  void PassDriverMEOpts::ApplyPass(PassDataHolder* data, const Pass* pass) {
-   // First call the base class' version.
-   PassDriver::ApplyPass(data, pass);
- 
    const PassME* pass_me = down_cast<const PassME*> (pass);
    DCHECK(pass_me != nullptr);
  

diff --cc compiler/dex/pass_me.h
Simple merge

diff --cc compiler/dex/post_opt_passes.h
Simple merge