diff options
| author | Andreas Gampe <agampe@google.com> | 2014-05-30 16:46:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-30 16:46:04 +0000 |
| commit | b7f02280f7f56ae94fe7f01e161be0b725b6e4a9 (patch) | |
| tree | 5fdb2a6e703c57890e9c35e8efd82a60a3156069 /runtime/quick_exception_handler.h | |
| parent | ac70051a6f97025b8a93390b2b5a62e491fc77ca (diff) | |
| parent | cf4035a4c41ccfcc3e89a0cee25f5218a11b0705 (diff) | |
Merge "ART: Use StackReference in Quick Stack Frame"
Diffstat (limited to 'runtime/quick_exception_handler.h')
| -rw-r--r-- | runtime/quick_exception_handler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/quick_exception_handler.h b/runtime/quick_exception_handler.h index ef3766c0a6..2597ebd5c7 100644 --- a/runtime/quick_exception_handler.h +++ b/runtime/quick_exception_handler.h @@ -19,6 +19,7 @@ #include "base/logging.h" #include "base/mutex.h" +#include "stack.h" // StackReference namespace art { @@ -50,7 +51,7 @@ class QuickExceptionHandler { void UpdateInstrumentationStack() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void DoLongJump() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void SetHandlerQuickFrame(mirror::ArtMethod** handler_quick_frame) { + void SetHandlerQuickFrame(StackReference<mirror::ArtMethod>* handler_quick_frame) { handler_quick_frame_ = handler_quick_frame; } @@ -77,7 +78,7 @@ class QuickExceptionHandler { // Is method tracing active? const bool method_tracing_active_; // Quick frame with found handler or last frame if no handler found. - mirror::ArtMethod** handler_quick_frame_; + StackReference<mirror::ArtMethod>* handler_quick_frame_; // PC to branch to for the handler. uintptr_t handler_quick_frame_pc_; // Associated dex PC. |