diff options
Diffstat (limited to 'runtime/instrumentation.h')
| -rw-r--r-- | runtime/instrumentation.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h index 2dd2cd7de8..d0cb4ded04 100644 --- a/runtime/instrumentation.h +++ b/runtime/instrumentation.h @@ -22,6 +22,7 @@ #include <list> #include "atomic.h" +#include "instruction_set.h" #include "base/macros.h" #include "base/mutex.h" #include "object_callbacks.h" @@ -236,6 +237,10 @@ class Instrumentation { return have_field_write_listeners_; } + bool HasExceptionCaughtListeners() const { + return have_exception_caught_listeners_; + } + bool IsActive() const { return have_dex_pc_listeners_ || have_method_entry_listeners_ || have_method_exit_listeners_ || have_field_read_listeners_ || have_field_write_listeners_ || @@ -311,8 +316,8 @@ class Instrumentation { // Called when an instrumented method is exited. Removes the pushed instrumentation frame // returning the intended link register. Generates method exit events. - uint64_t PopInstrumentationStackFrame(Thread* self, uintptr_t* return_pc, uint64_t gpr_result, - uint64_t fpr_result) + TwoWordReturn PopInstrumentationStackFrame(Thread* self, uintptr_t* return_pc, + uint64_t gpr_result, uint64_t fpr_result) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Pops an instrumentation frame from the current thread and generate an unwind event. |