diff options
| author | 2014-05-14 14:11:40 -0700 | |
|---|---|---|
| committer | 2014-05-14 14:11:40 -0700 | |
| commit | 421c53742610c053543f8c84e04d5e0c5185d68c (patch) | |
| tree | 8cd10900e452dc77f0637f9ee18f3e4347ea4b9f /runtime | |
| parent | d0916f36d27b643bca970f3645c38f44270c74ef (diff) | |
Address comments from HandleScope change.
For:
https://android-review.googlesource.com/#/c/93793
Change-Id: I020d22a1508bf4f1770e6806d70e4fbb9a0fa0ab
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/arm64/quick_entrypoints_arm64.S | 2 | ||||
| -rw-r--r-- | runtime/arch/x86_64/quick_entrypoints_x86_64.S | 4 | ||||
| -rw-r--r-- | runtime/handle_scope-inl.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index 2a21144f07..3d93399306 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -1444,7 +1444,7 @@ END art_quick_resolution_trampoline * | RDI/Method* | <- X0 * #-------------------# * | local ref cookie | // 4B - * | handle scope size | // 4B + * | handle scope size | // 4B * #-------------------# * | JNI Call Stack | * #-------------------# <--- SP on native call diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S index 73214ea6c5..9c86c75ddd 100644 --- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S +++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S @@ -1050,12 +1050,12 @@ END_FUNCTION art_quick_resolution_trampoline * | Return | * | Callee-Save Data | * #-------------------# - * | handle scope | + * | handle scope | * #-------------------# * | Method* | <--- (1) * #-------------------# * | local ref cookie | // 4B - * | handle scope size | // 4B TODO: roll into call stack alignment? + * | handle scope size | // 4B TODO: roll into call stack alignment? * #-------------------# * | JNI Call Stack | * #-------------------# <--- SP on native call diff --git a/runtime/handle_scope-inl.h b/runtime/handle_scope-inl.h index b9b51fde1e..634f2be666 100644 --- a/runtime/handle_scope-inl.h +++ b/runtime/handle_scope-inl.h @@ -25,7 +25,7 @@ namespace art { template<size_t kNumReferences> -StackHandleScope<kNumReferences>::StackHandleScope(Thread* self) +inline StackHandleScope<kNumReferences>::StackHandleScope(Thread* self) : HandleScope(kNumReferences), self_(self), pos_(0) { // TODO: Figure out how to use a compile assert. DCHECK_EQ(OFFSETOF_MEMBER(HandleScope, references_), @@ -37,7 +37,7 @@ StackHandleScope<kNumReferences>::StackHandleScope(Thread* self) } template<size_t kNumReferences> -StackHandleScope<kNumReferences>::~StackHandleScope() { +inline StackHandleScope<kNumReferences>::~StackHandleScope() { HandleScope* top_handle_scope = self_->PopHandleScope(); DCHECK_EQ(top_handle_scope, this); } |