commit e2abbc604ce003c776c00ecf1293796bb4c4ac5a
author Andreas Gampe <agampe@google.com> Fri Sep 15 11:59:26 2017 -0700
committer Andreas Gampe <agampe@google.com> Mon Sep 18 11:36:24 2017 -0700
tree f7d124d1861cad2162c30dfe932bb4e1beaf41ef
parent 7090dfe84f78b1928fcbdfd664d0dd9ea52633ff

ART: Move kDexNoIndex to dex_file_types.h

Define the constant with the types to allow lowering the dependency
on DexFile.

Test: m
Change-Id: I3c61421db45be96d2057e01b1a7825883d8bd178

runtime/interpreter/interpreter_common.cc

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 0028b21..c345013 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -20,6 +20,7 @@
 
 #include "base/enums.h"
 #include "debugger.h"
+#include "dex_file_types.h"
 #include "entrypoints/runtime_asm_entrypoints.h"
 #include "jit/jit.h"
 #include "jvalue.h"
@@ -438,7 +439,7 @@
   bool clear_exception = false;
   uint32_t found_dex_pc = shadow_frame.GetMethod()->FindCatchBlock(
       hs.NewHandle(exception->GetClass()), shadow_frame.GetDexPC(), &clear_exception);
-  if (found_dex_pc == DexFile::kDexNoIndex) {
+  if (found_dex_pc == dex::kDexNoIndex) {
     if (instrumentation != nullptr) {
       if (shadow_frame.NeedsNotifyPop()) {
         instrumentation->WatchedFramePopped(self, shadow_frame);