diff options
| author | 2017-01-16 15:50:46 +0000 | |
|---|---|---|
| committer | 2017-01-16 15:50:47 +0000 | |
| commit | 5e01df491f371cdafd5c348511c373b527329a01 (patch) | |
| tree | 22573d6cd092b9a7246ae12d8c83f9dc2f228400 /runtime/entrypoints/entrypoint_utils.h | |
| parent | d9a9d44ae018826a380b62cdc09d536f8ce30208 (diff) | |
| parent | 1998cd02603197f2acdc0734397a6d48b2f59b80 (diff) | |
Merge changes I168f24de,I8ec60a98,I3c426ed7,Ic809b0f3
* changes:
Implement HLoadClass/kBssEntry for boot image.
Store resolved types for AOT code in .bss.
Make runtime call on main for HLoadClass/kDexCacheViaMethod.
Remove HLoadClass::LoadKind::kDexCachePcRelative.
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.h')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 4794610ca8..d4cf83c8de 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -201,7 +201,13 @@ ArtMethod* GetCalleeSaveMethodCaller(ArtMethod** sp, bool do_caller_check = false) REQUIRES_SHARED(Locks::mutator_lock_); -ArtMethod* GetCalleeSaveMethodCaller(Thread* self, Runtime::CalleeSaveType type) +struct CallerAndOuterMethod { + ArtMethod* caller; + ArtMethod* outer_method; +}; + +CallerAndOuterMethod GetCalleeSaveMethodCallerAndOuterMethod(Thread* self, + Runtime::CalleeSaveType type) REQUIRES_SHARED(Locks::mutator_lock_); } // namespace art |