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

openjdkjvmti/ti_stack.cc

diff --git a/openjdkjvmti/ti_stack.cc b/openjdkjvmti/ti_stack.cc
index e165187..699f695 100644
--- a/openjdkjvmti/ti_stack.cc
+++ b/openjdkjvmti/ti_stack.cc
@@ -46,6 +46,7 @@
 #include "base/mutex.h"
 #include "dex_file.h"
 #include "dex_file_annotations.h"
+#include "dex_file_types.h"
 #include "gc_root.h"
 #include "handle_scope-inl.h"
 #include "jni_env_ext.h"
@@ -88,7 +89,7 @@
       jmethodID id = art::jni::EncodeArtMethod(m);
 
       uint32_t dex_pc = GetDexPc(false);
-      jlong dex_location = (dex_pc == art::DexFile::kDexNoIndex) ? -1 : static_cast<jlong>(dex_pc);
+      jlong dex_location = (dex_pc == art::dex::kDexNoIndex) ? -1 : static_cast<jlong>(dex_pc);
 
       jvmtiFrameInfo info = { id, dex_location };
       fn(info);
@@ -819,7 +820,7 @@
   if (closure.method->IsNative()) {
     *location_ptr = -1;
   } else {
-    if (closure.dex_pc == art::DexFile::kDexNoIndex) {
+    if (closure.dex_pc == art::dex::kDexNoIndex) {
       return ERR(INTERNAL);
     }
     *location_ptr = static_cast<jlocation>(closure.dex_pc);