summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter_common.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2017-09-15 11:59:26 -0700
committer Andreas Gampe <agampe@google.com> 2017-09-18 11:36:24 -0700
commite2abbc604ce003c776c00ecf1293796bb4c4ac5a (patch)
treef7d124d1861cad2162c30dfe932bb4e1beaf41ef /runtime/interpreter/interpreter_common.cc
parent7090dfe84f78b1928fcbdfd664d0dd9ea52633ff (diff)
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
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
-rw-r--r--runtime/interpreter/interpreter_common.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index 0028b21f94..c3450138eb 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 MoveToExceptionHandler(Thread* self,
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);