diff options
| 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 |
| commit | e2abbc604ce003c776c00ecf1293796bb4c4ac5a (patch) | |
| tree | f7d124d1861cad2162c30dfe932bb4e1beaf41ef /runtime/quick_exception_handler.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/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index b592247da3..d8b62370b8 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -19,6 +19,7 @@ #include "arch/context.h" #include "art_method-inl.h" #include "base/enums.h" +#include "dex_file_types.h" #include "dex_instruction.h" #include "entrypoints/entrypoint_utils.h" #include "entrypoints/quick/quick_entrypoints_enum.h" @@ -98,17 +99,17 @@ class CatchBlockStackVisitor FINAL : public StackVisitor { private: bool HandleTryItems(ArtMethod* method) REQUIRES_SHARED(Locks::mutator_lock_) { - uint32_t dex_pc = DexFile::kDexNoIndex; + uint32_t dex_pc = dex::kDexNoIndex; if (!method->IsNative()) { dex_pc = GetDexPc(); } - if (dex_pc != DexFile::kDexNoIndex) { + if (dex_pc != dex::kDexNoIndex) { bool clear_exception = false; StackHandleScope<1> hs(GetThread()); Handle<mirror::Class> to_find(hs.NewHandle((*exception_)->GetClass())); uint32_t found_dex_pc = method->FindCatchBlock(to_find, dex_pc, &clear_exception); exception_handler_->SetClearException(clear_exception); - if (found_dex_pc != DexFile::kDexNoIndex) { + if (found_dex_pc != dex::kDexNoIndex) { exception_handler_->SetHandlerMethod(method); exception_handler_->SetHandlerDexPc(found_dex_pc); exception_handler_->SetHandlerQuickFramePc( |