diff options
author | Mathieu Chartier <mathieuc@google.com> | 2014-05-07 15:43:14 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-13 14:45:54 -0700 |
commit | eb8167a4f4d27fce0530f6724ab8032610cd146b (patch) | |
tree | bcfeaf13ad78f2dd68466bbd0e20c71944f7e854 /runtime/stack.h | |
parent | 6fb66a2bc4e1c0b7931101153e58714991237af7 (diff) | |
download | art-eb8167a4f4d27fce0530f6724ab8032610cd146b.zip art-eb8167a4f4d27fce0530f6724ab8032610cd146b.tar.gz art-eb8167a4f4d27fce0530f6724ab8032610cd146b.tar.bz2 |
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
Diffstat (limited to 'runtime/stack.h')
-rw-r--r-- | runtime/stack.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/stack.h b/runtime/stack.h index 88ef78f..963983a 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<StackIndirectReferenceTable*>(sp); + ++sp; // Skip Method*; handle scope comes next; + return reinterpret_cast<HandleScope*>(sp); } std::string DescribeLocation() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |