commit bdc93b47e2e7e8f17413669e03bc461d259d16f6
author Vladimir Marko <vmarko@google.com> Fri Mar 29 16:12:04 2019 +0000
committer Vladimir Marko <vmarko@google.com> Mon Apr 01 09:37:59 2019 +0000
tree bd1c632196a437e90d012475afa83adf614be538
parent f52d92fce224c86491d9b0fd6fca805564119426

ObjPtr<>-ify StackTraceElement and ClassLoader.

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

runtime/mirror/stack_trace_element.h

diff --git a/runtime/mirror/stack_trace_element.h b/runtime/mirror/stack_trace_element.h
index 37ac575..67eedbc 100644
--- a/runtime/mirror/stack_trace_element.h
+++ b/runtime/mirror/stack_trace_element.h
@@ -29,27 +29,21 @@
 // C++ mirror of java.lang.StackTraceElement
 class MANAGED StackTraceElement final : public Object {
  public:
-  String* GetDeclaringClass() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(StackTraceElement, declaring_class_));
-  }
+  ObjPtr<String> GetDeclaringClass() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  String* GetMethodName() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(StackTraceElement, method_name_));
-  }
+  ObjPtr<String> GetMethodName() REQUIRES_SHARED(Locks::mutator_lock_);
 
-  String* GetFileName() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(StackTraceElement, file_name_));
-  }
+  ObjPtr<String> GetFileName() REQUIRES_SHARED(Locks::mutator_lock_);
 
   int32_t GetLineNumber() REQUIRES_SHARED(Locks::mutator_lock_) {
     return GetField32(OFFSET_OF_OBJECT_MEMBER(StackTraceElement, line_number_));
   }
 
-  static StackTraceElement* Alloc(Thread* self,
-                                  Handle<String> declaring_class,
-                                  Handle<String> method_name,
-                                  Handle<String> file_name,
-                                  int32_t line_number)
+  static ObjPtr<StackTraceElement> Alloc(Thread* self,
+                                         Handle<String> declaring_class,
+                                         Handle<String> method_name,
+                                         Handle<String> file_name,
+                                         int32_t line_number)
       REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_);
 
  private: