diff options
| author | Ian Rogers <irogers@google.com> | 2014-02-14 00:52:24 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-02-20 14:46:02 -0800 |
| commit | 936b37f3a7f224d990a36b2ec66782a4462180d6 (patch) | |
| tree | 94de34072e8ce0a2a251ed8d5ccc7d87709db750 /runtime/mirror/art_method.h | |
| parent | fd80b5717c0cdd10ef2caabf4291415a52fcc874 (diff) | |
| download | art-936b37f3a7f224d990a36b2ec66782a4462180d6.zip art-936b37f3a7f224d990a36b2ec66782a4462180d6.tar.gz art-936b37f3a7f224d990a36b2ec66782a4462180d6.tar.bz2 | |
Upcall support for x86-64.
Sufficient to pass jni_internal_test.
Change-Id: Ia0d9b8241ab8450e04765b9c32eb6dc8fc1a8733
Diffstat (limited to 'runtime/mirror/art_method.h')
| -rw-r--r-- | runtime/mirror/art_method.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/mirror/art_method.h b/runtime/mirror/art_method.h index 71cc7af..86f5348 100644 --- a/runtime/mirror/art_method.h +++ b/runtime/mirror/art_method.h @@ -313,9 +313,9 @@ class MANAGED ArtMethod : public Object { void SetOatNativeGcMapOffset(uint32_t gc_map_offset); uint32_t GetOatNativeGcMapOffset(); - size_t GetFrameSizeInBytes() { - DCHECK_EQ(sizeof(size_t), sizeof(uint32_t)); - size_t result = GetField32(OFFSET_OF_OBJECT_MEMBER(ArtMethod, quick_frame_size_in_bytes_), false); + uint32_t GetFrameSizeInBytes() { + uint32_t result = GetField32(OFFSET_OF_OBJECT_MEMBER(ArtMethod, quick_frame_size_in_bytes_), + false); DCHECK_LE(static_cast<size_t>(kStackAlignment), result); return result; } |