commit 423bebb17f15c3867a52315f0ae421f08f14544f
author Vladimir Marko <vmarko@google.com> Tue Mar 26 15:17:21 2019 +0000
committer Vladimir Marko <vmarko@google.com> Wed Mar 27 09:45:20 2019 +0000
tree 97bdf50c7144ae21e6abfe8bdc26858a6a10f94d
parent 93d99f3665cbd890509f4c707e1a62c5f26d320e

ObjPtr<>-ify mirror::ObjectArray.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I611b3e49d3feed306f6cd35d2b662a1e727e24c6

runtime/mirror/emulated_stack_frame.h

diff --git a/runtime/mirror/emulated_stack_frame.h b/runtime/mirror/emulated_stack_frame.h
index ec45f57..626215e 100644
--- a/runtime/mirror/emulated_stack_frame.h
+++ b/runtime/mirror/emulated_stack_frame.h
@@ -19,10 +19,9 @@
 
 #include "base/utils.h"
 #include "dex/dex_instruction.h"
-#include "method_type.h"
+#include "handle.h"
 #include "object.h"
 #include "stack.h"
-#include "string.h"
 
 namespace art {
 
@@ -30,12 +29,14 @@
 
 namespace mirror {
 
+class MethodType;
+
 // C++ mirror of dalvik.system.EmulatedStackFrame
 class MANAGED EmulatedStackFrame : public Object {
  public:
   // Creates an emulated stack frame whose type is |frame_type| from
   // a shadow frame.
-  static mirror::EmulatedStackFrame* CreateFromShadowFrameAndArgs(
+  static ObjPtr<mirror::EmulatedStackFrame> CreateFromShadowFrameAndArgs(
       Thread* self,
       Handle<mirror::MethodType> args_type,
       Handle<mirror::MethodType> frame_type,
@@ -56,24 +57,14 @@
   // Sets the return value slot of this emulated stack frame to |value|.
   void SetReturnValue(Thread* self, const JValue& value) REQUIRES_SHARED(Locks::mutator_lock_);
 
-  mirror::MethodType* GetType() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<MethodType>(OFFSET_OF_OBJECT_MEMBER(EmulatedStackFrame, type_));
-  }
+  ObjPtr<mirror::MethodType> GetType() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  mirror::Object* GetReceiver() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetReferences()->Get(0);
-  }
+  ObjPtr<mirror::Object> GetReceiver() REQUIRES_SHARED(Locks::mutator_lock_);
 
  private:
-  mirror::ObjectArray<mirror::Object>* GetReferences() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<mirror::ObjectArray<mirror::Object>>(
-        OFFSET_OF_OBJECT_MEMBER(EmulatedStackFrame, references_));
-  }
+  ObjPtr<mirror::ObjectArray<mirror::Object>> GetReferences() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  mirror::ByteArray* GetStackFrame() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<mirror::ByteArray>(
-        OFFSET_OF_OBJECT_MEMBER(EmulatedStackFrame, stack_frame_));
-  }
+  ObjPtr<mirror::ByteArray> GetStackFrame() REQUIRES_SHARED(Locks::mutator_lock_);
 
   static MemberOffset CallsiteTypeOffset() {
     return MemberOffset(OFFSETOF_MEMBER(EmulatedStackFrame, callsite_type_));