diff options
Diffstat (limited to 'runtime/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index af56810fcb..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" @@ -268,6 +269,11 @@ class DebugInstrumentationListener FINAL : public instrumentation::Instrumentati LOG(ERROR) << "Unexpected exception handled event in debugger"; } + // TODO Might be worth it to implement this. + void WatchedFramePop(Thread* thread ATTRIBUTE_UNUSED, + const ShadowFrame& frame ATTRIBUTE_UNUSED) OVERRIDE { + LOG(ERROR) << "Unexpected WatchedFramePop event in debugger"; + } private: static bool IsReturn(ArtMethod* method, uint32_t dex_pc) @@ -2212,6 +2218,8 @@ JDWP::JdwpThreadStatus Dbg::ToJdwpThreadStatus(ThreadState state) { case kTerminated: return JDWP::TS_ZOMBIE; case kTimedWaiting: + case kWaitingForTaskProcessor: + case kWaitingForLockInflation: case kWaitingForCheckPointsToRun: case kWaitingForDebuggerSend: case kWaitingForDebuggerSuspension: @@ -2967,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_) { @@ -2990,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. |