diff options
| author | 2017-09-15 11:59:26 -0700 | |
|---|---|---|
| committer | 2017-09-18 11:36:24 -0700 | |
| commit | e2abbc604ce003c776c00ecf1293796bb4c4ac5a (patch) | |
| tree | f7d124d1861cad2162c30dfe932bb4e1beaf41ef /runtime/debugger.cc | |
| parent | 7090dfe84f78b1928fcbdfd664d0dd9ea52633ff (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/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index ce751697d1..6daec72229 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -34,6 +34,7 @@ #include "class_linker.h" #include "dex_file-inl.h" #include "dex_file_annotations.h" +#include "dex_file_types.h" #include "dex_instruction.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "gc/accounting/card_table-inl.h" @@ -2974,8 +2975,8 @@ class CatchLocationFinder : public StackVisitor { this_at_throw_(handle_scope_.NewHandle<mirror::Object>(nullptr)), catch_method_(nullptr), throw_method_(nullptr), - catch_dex_pc_(DexFile::kDexNoIndex), - throw_dex_pc_(DexFile::kDexNoIndex) { + catch_dex_pc_(dex::kDexNoIndex), + throw_dex_pc_(dex::kDexNoIndex) { } bool VisitFrame() OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) { @@ -2997,13 +2998,13 @@ class CatchLocationFinder : public StackVisitor { throw_dex_pc_ = dex_pc; } - if (dex_pc != DexFile::kDexNoIndex) { + if (dex_pc != dex::kDexNoIndex) { StackHandleScope<1> hs(GetThread()); uint32_t found_dex_pc; Handle<mirror::Class> exception_class(hs.NewHandle(exception_->GetClass())); bool unused_clear_exception; found_dex_pc = method->FindCatchBlock(exception_class, dex_pc, &unused_clear_exception); - if (found_dex_pc != DexFile::kDexNoIndex) { + if (found_dex_pc != dex::kDexNoIndex) { catch_method_ = method; catch_dex_pc_ = found_dex_pc; return false; // End stack walk. |