diff options
| author | 2015-03-09 10:15:14 +0000 | |
|---|---|---|
| committer | 2015-03-09 10:15:14 +0000 | |
| commit | a60bb12ed88a0f11fb6a8444964ea55af2054824 (patch) | |
| tree | 8eabb49a208c04b219e5a1b037254647498d9d1d /runtime/trace.h | |
| parent | f20cc35c8e37a515fc19ca554b56ee78dfa7cc82 (diff) | |
| parent | 5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b (diff) | |
am 5c9d8f0d: Merge "Compute the right catch location for the debugger."
* commit '5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b':
Compute the right catch location for the debugger.
Diffstat (limited to 'runtime/trace.h')
| -rw-r--r-- | runtime/trace.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/trace.h b/runtime/trace.h index 9ba30d5f8f..dd8186a2cb 100644 --- a/runtime/trace.h +++ b/runtime/trace.h @@ -95,9 +95,7 @@ class Trace FINAL : public instrumentation::InstrumentationListener { mirror::ArtMethod* method, uint32_t dex_pc, mirror::ArtField* field, const JValue& field_value) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) OVERRIDE; - void ExceptionCaught(Thread* thread, const ThrowLocation& throw_location, - mirror::ArtMethod* catch_method, uint32_t catch_dex_pc, - mirror::Throwable* exception_object) + void ExceptionCaught(Thread* thread, mirror::Throwable* exception_object) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) OVERRIDE; void BackwardBranch(Thread* thread, mirror::ArtMethod* method, int32_t dex_pc_offset) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) OVERRIDE; |