diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-12-18 08:43:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-18 08:43:14 +0000 |
| commit | fcd3f33dde47ce13305a7dfb5a665bf832535ae4 (patch) | |
| tree | 137a2f259ab37c1f2eeafbb62cfb0d78e5e5f097 /runtime | |
| parent | 58a1c07b7f01ed9b85fb89bfd4dab7ddd138cfcd (diff) | |
| parent | e4b7c892c4f40e76c172a77069afde3fe5ce87da (diff) | |
| download | art-fcd3f33dde47ce13305a7dfb5a665bf832535ae4.zip art-fcd3f33dde47ce13305a7dfb5a665bf832535ae4.tar.gz art-fcd3f33dde47ce13305a7dfb5a665bf832535ae4.tar.bz2 | |
Merge "Use correct handle scope offset from StackVisitor"
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/mirror/art_method.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/mirror/art_method.h b/runtime/mirror/art_method.h index 29e061a..f33ca94 100644 --- a/runtime/mirror/art_method.h +++ b/runtime/mirror/art_method.h @@ -26,6 +26,7 @@ #include "object_callbacks.h" #include "quick/quick_method_frame_info.h" #include "read_barrier_option.h" +#include "stack.h" #include "stack_map.h" namespace art { @@ -390,8 +391,9 @@ class MANAGED ArtMethod FINAL : public Object { } FrameOffset GetHandleScopeOffset() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - DCHECK_LT(sizeof(void*), GetFrameSizeInBytes()); - return FrameOffset(sizeof(void*)); + constexpr size_t handle_scope_offset = sizeof(StackReference<mirror::ArtMethod>); + DCHECK_LT(handle_scope_offset, GetFrameSizeInBytes()); + return FrameOffset(handle_scope_offset); } void RegisterNative(const void* native_method, bool is_fast) |