From eb8167a4f4d27fce0530f6724ab8032610cd146b Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 7 May 2014 15:43:14 -0700 Subject: Add Handle/HandleScope and delete SirtRef. Delete SirtRef and replaced it with Handle. Handles are value types which wrap around StackReference*. Renamed StackIndirectReferenceTable to HandleScope. Added a scoped handle wrapper which wraps around an Object** and restores it in its destructor. Renamed Handle::get -> Get. Bug: 8473721 Change-Id: Idbfebd4f35af629f0f43931b7c5184b334822c7a --- runtime/stack.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/stack.h') diff --git a/runtime/stack.h b/runtime/stack.h index 88ef78f4b2..963983a7a6 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -40,7 +40,7 @@ namespace mirror { class Context; class ShadowFrame; -class StackIndirectReferenceTable; +class HandleScope; class ScopedObjectAccess; class Thread; @@ -677,10 +677,10 @@ class StackVisitor { return cur_shadow_frame_; } - StackIndirectReferenceTable* GetCurrentSirt() const { + HandleScope* GetCurrentHandleScope() const { mirror::ArtMethod** sp = GetCurrentQuickFrame(); - ++sp; // Skip Method*; SIRT comes next; - return reinterpret_cast(sp); + ++sp; // Skip Method*; handle scope comes next; + return reinterpret_cast(sp); } std::string DescribeLocation() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -- cgit v1.2.3-59-g8ed1b