diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-08 15:21:04 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-03-09 02:17:46 +0000 |
| commit | e0dcd46314d07eeb332edea292f5110178e4e3d2 (patch) | |
| tree | d1060bc54e1ad26bad69a6e06662e643e75ce484 /runtime/mirror/art_method.h | |
| parent | 80a250f8862096b72e7357c12b40dc9d5310a475 (diff) | |
| download | art-e0dcd46314d07eeb332edea292f5110178e4e3d2.zip art-e0dcd46314d07eeb332edea292f5110178e4e3d2.tar.gz art-e0dcd46314d07eeb332edea292f5110178e4e3d2.tar.bz2 | |
JNI down call fixes.
Ensure SIRT isn't accessed via quick callee save frame.
Some tidying of code.
Change-Id: I8fec3e89aa6d2e86789c60a07550db2e92478ca7
Diffstat (limited to 'runtime/mirror/art_method.h')
| -rw-r--r-- | runtime/mirror/art_method.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/mirror/art_method.h b/runtime/mirror/art_method.h index a61698d..8c22e67 100644 --- a/runtime/mirror/art_method.h +++ b/runtime/mirror/art_method.h @@ -342,10 +342,13 @@ class MANAGED ArtMethod : public Object { return GetFrameSizeInBytes() - kPointerSize; } +#ifndef NDEBUG + size_t GetSirtOffsetInBytes() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); +#else size_t GetSirtOffsetInBytes() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - CHECK(IsNative()); return kPointerSize; } +#endif bool IsRegistered(); |