diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-05 10:40:17 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-09 10:09:33 +0000 |
| commit | 14691c5e786e8c2c5734f687e4c96217340771be (patch) | |
| tree | 7c2156671b323c70ffdd1d48d5e2f1d1de79c5fc /runtime/trace.cc | |
| parent | 3d7d2af4c6502b771b032ee9bf3ab30e78f9c60d (diff) | |
| download | art-14691c5e786e8c2c5734f687e4c96217340771be.tar.gz art-14691c5e786e8c2c5734f687e4c96217340771be.tar.bz2 art-14691c5e786e8c2c5734f687e4c96217340771be.zip | |
Compute the right catch location for the debugger.
Also remove tls ThrowLocation, it is not needed anymore.
Change-Id: I78fddf09ce968ca475e39c17fa76d699c589c8d9
Diffstat (limited to 'runtime/trace.cc')
| -rw-r--r-- | runtime/trace.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/trace.cc b/runtime/trace.cc index 93b3877bf4..a1296f4a5c 100644 --- a/runtime/trace.cc +++ b/runtime/trace.cc @@ -619,11 +619,9 @@ void Trace::MethodUnwind(Thread* thread, mirror::Object* this_object ATTRIBUTE_U thread_clock_diff, wall_clock_diff); } -void Trace::ExceptionCaught(Thread* thread, const ThrowLocation& throw_location, - mirror::ArtMethod* catch_method, uint32_t catch_dex_pc, - mirror::Throwable* exception_object) +void Trace::ExceptionCaught(Thread* thread, mirror::Throwable* exception_object) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - UNUSED(thread, throw_location, catch_method, catch_dex_pc, exception_object); + UNUSED(thread, exception_object); LOG(ERROR) << "Unexpected exception caught event in tracing"; } |