commit 698ebbca3c54d17c696e87b9e5838df6a5ac9b08
author Mathieu Chartier <mathieuc@google.com> Fri Jan 05 11:00:42 2018 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Jan 08 09:11:49 2018 -0800
tree 7887b2cd4662410114f205bbe1896ff094d51407
parent 4b9a11f1d43df69c50e93ba1793fce1c2216682b

Clean up CodeItemAccessors and Compact/StandardDexFile

Change constructor to use a reference to a dex file.

Remove duplicated logic for GetCodeItemSize.

Bug: 63756964
Test: test-art-host
Change-Id: I69af8b93abdf6bdfa4454e16db8f4e75883bca46

compiler/optimizing/code_generator.cc

diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index 07894fd..01155dc 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -911,7 +911,7 @@
   }
   ArenaVector<size_t> covered(
       loop_headers.size(), 0, graph.GetAllocator()->Adapter(kArenaAllocMisc));
-  for (const DexInstructionPcPair& pair : CodeItemInstructionAccessor(&graph.GetDexFile(),
+  for (const DexInstructionPcPair& pair : CodeItemInstructionAccessor(graph.GetDexFile(),
                                                                       &code_item)) {
     const uint32_t dex_pc = pair.DexPc();
     const Instruction& instruction = pair.Inst();