commit 2f7a55c0370583954239c8b36bf1beb2665d8379
author Andreas Gampe <agampe@google.com> Thu May 09 15:46:38 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Wed May 15 18:37:05 2019 +0000
tree 00550ea6a460b3044b8bea83a150cab0049b6d2b
parent 3ba32d966cc836b997a9ac595f32504554b958e0

ART: Forward-declare DexInstructionIterator (iwyu)

Test: mmma art
Change-Id: I43269f47668eece5204cc0895895346205a274d1

libdexfile/dex/code_item_accessors-inl.h

diff --git a/libdexfile/dex/code_item_accessors-inl.h b/libdexfile/dex/code_item_accessors-inl.h
index 632a787..261b913 100644
--- a/libdexfile/dex/code_item_accessors-inl.h
+++ b/libdexfile/dex/code_item_accessors-inl.h
@@ -22,6 +22,7 @@
 #include "base/iteration_range.h"
 #include "compact_dex_file.h"
 #include "dex_file-inl.h"
+#include "dex_instruction_iterator.h"
 #include "standard_dex_file.h"
 
 // The no ART version is used by binaries that don't include the whole runtime.

libdexfile/dex/code_item_accessors.h

diff --git a/libdexfile/dex/code_item_accessors.h b/libdexfile/dex/code_item_accessors.h
index 794f234..24296c8 100644
--- a/libdexfile/dex/code_item_accessors.h
+++ b/libdexfile/dex/code_item_accessors.h
@@ -21,7 +21,7 @@
 
 #include <android-base/logging.h>
 
-#include "dex_instruction_iterator.h"
+#include "dex_instruction.h"
 
 namespace art {
 
@@ -32,6 +32,7 @@
 
 class ArtMethod;
 class DexFile;
+class DexInstructionIterator;
 template <typename Iter>
 class IterationRange;