diff options
| author | Sebastien Hertz <shertz@google.com> | 2013-11-19 18:38:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-19 18:38:59 +0000 |
| commit | e24fa3e678b1432f8e7325b9b5718d5a31cb74e1 (patch) | |
| tree | 1711c7ef571a4ac030d4995de0c53fbeb7c6ea88 /runtime/instrumentation.h | |
| parent | d08a4984b4153f3be3d65d339eaac985da7e17ab (diff) | |
| parent | 51db44a194bafc3810a41164a8b39614f10e79df (diff) | |
| download | art-e24fa3e678b1432f8e7325b9b5718d5a31cb74e1.zip art-e24fa3e678b1432f8e7325b9b5718d5a31cb74e1.tar.gz art-e24fa3e678b1432f8e7325b9b5718d5a31cb74e1.tar.bz2 | |
Merge "Propagate 'this_object' for method unwind event." into dalvik-dev
Diffstat (limited to 'runtime/instrumentation.h')
| -rw-r--r-- | runtime/instrumentation.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h index 5647c0e..6bfc2d7 100644 --- a/runtime/instrumentation.h +++ b/runtime/instrumentation.h @@ -66,8 +66,9 @@ struct InstrumentationListener { // Call-back for when a method is popped due to an exception throw. A method will either cause a // MethodExited call-back or a MethodUnwind call-back when its activation is removed. - virtual void MethodUnwind(Thread* thread, const mirror::ArtMethod* method, - uint32_t dex_pc) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) = 0; + virtual void MethodUnwind(Thread* thread, mirror::Object* this_object, + const mirror::ArtMethod* method, uint32_t dex_pc) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) = 0; // Call-back for when the dex pc moves in a method. virtual void DexPcMoved(Thread* thread, mirror::Object* this_object, |