commit e4b7c892c4f40e76c172a77069afde3fe5ce87da
author Sebastien Hertz <shertz@google.com> Wed Dec 17 20:02:50 2014 +0100
committer Sebastien Hertz <shertz@google.com> Thu Dec 18 09:30:14 2014 +0100
tree 0d4b8c9725b476859e6e894922d5c725102147fc
parent f610c0597e001cb1043aa4074afe25ae79a800e3

Use correct handle scope offset from StackVisitor

Bug: 18785293
Change-Id: I10e144cffac00978e3c84d43a30caccd61559b27

runtime/mirror/art_method.h

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 @@
   }
 
   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)