commit dbc2337eb9f010395cb78824a44481ddf2eb748a
author Vladimir Marko <vmarko@google.com> Mon Oct 12 12:45:52 2015 +0100
committer Vladimir Marko <vmarko@google.com> Mon Oct 12 12:45:52 2015 +0100
tree 37e1b84ca0d9d34a4da411b120f5f54ced755baf
parent 89792b9c5ed09dda2937944b69b1b2016807b6aa

Optimizing: Avoid string init register set copy for debuggable.

Change-Id: I9c0d2e1353c68129db06d53a190a015710e4fd0d

compiler/optimizing/builder.cc

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index 503d08f..94dcfdd 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -1175,10 +1175,9 @@
         verified_method->GetStringInitPcRegMap();
     auto map_it = string_init_map.find(dex_pc);
     if (map_it != string_init_map.end()) {
-      std::set<uint32_t> reg_set = map_it->second;
-      for (auto set_it = reg_set.begin(); set_it != reg_set.end(); ++set_it) {
+      for (uint32_t reg : map_it->second) {
         HInstruction* load_local = LoadLocal(original_dex_register, Primitive::kPrimNot, dex_pc);
-        UpdateLocal(*set_it, load_local, dex_pc);
+        UpdateLocal(reg, load_local, dex_pc);
       }
     }
   } else {