commit 58412b1f6c6c1fb1f212dd4e2cb442541fc91df5
author Vladimir Marko <vmarko@google.com> Mon Apr 01 13:26:34 2019 +0100
committer Vladimir Marko <vmarko@google.com> Tue Apr 02 07:57:27 2019 +0000
tree d0da00907ee46faec095c9f2bd62b83da3d99000
parent dfc0de7696a50a9aeee95dcf74dac036e3334314

ObjPtr<>-ify DexCache.

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

runtime/jni/java_vm_ext.cc

diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc
index 370a456..1bf88c5 100644
--- a/runtime/jni/java_vm_ext.cc
+++ b/runtime/jni/java_vm_ext.cc
@@ -38,6 +38,7 @@
 #include "jni_internal.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
+#include "mirror/dex_cache-inl.h"
 #include "nativebridge/native_bridge.h"
 #include "nativehelper/scoped_local_ref.h"
 #include "nativehelper/scoped_utf_chars.h"

runtime/jni/jni_internal.cc

diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc
index 370f19b..61dc6f6 100644
--- a/runtime/jni/jni_internal.cc
+++ b/runtime/jni/jni_internal.cc
@@ -48,6 +48,7 @@
 #include "mirror/class-alloc-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
+#include "mirror/dex_cache-inl.h"
 #include "mirror/field-inl.h"
 #include "mirror/method.h"
 #include "mirror/object-inl.h"

runtime/mirror/class.cc

diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc
index 1c03fc3..3b4ae0f 100644
--- a/runtime/mirror/class.cc
+++ b/runtime/mirror/class.cc
@@ -31,7 +31,7 @@
 #include "dex/dex_file-inl.h"
 #include "dex/dex_file_annotations.h"
 #include "dex/signature-inl.h"
-#include "dex_cache.h"
+#include "dex_cache-inl.h"
 #include "gc/accounting/card_table-inl.h"
 #include "gc/heap-inl.h"
 #include "handle_scope-inl.h"

runtime/mirror/dex_cache-inl.h

diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h
index c5a32ef..80b5a34 100644
--- a/runtime/mirror/dex_cache-inl.h
+++ b/runtime/mirror/dex_cache-inl.h
@@ -437,6 +437,10 @@
   }
 }
 
+inline ObjPtr<String> DexCache::GetLocation() {
+  return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(DexCache, location_));
+}
+
 }  // namespace mirror
 }  // namespace art
 

runtime/mirror/dex_cache.h

diff --git a/runtime/mirror/dex_cache.h b/runtime/mirror/dex_cache.h
index 3e433c9..e399a8c 100644
--- a/runtime/mirror/dex_cache.h
+++ b/runtime/mirror/dex_cache.h
@@ -209,9 +209,7 @@
   void FixupResolvedCallSites(GcRoot<mirror::CallSite>* dest, const Visitor& visitor)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  String* GetLocation() REQUIRES_SHARED(Locks::mutator_lock_) {
-    return GetFieldObject<String>(OFFSET_OF_OBJECT_MEMBER(DexCache, location_));
-  }
+  ObjPtr<String> GetLocation() REQUIRES_SHARED(Locks::mutator_lock_);
 
   static constexpr MemberOffset StringsOffset() {
     return OFFSET_OF_OBJECT_MEMBER(DexCache, strings_);

test/497-inlining-and-class-loader/clear_dex_cache.cc

diff --git a/test/497-inlining-and-class-loader/clear_dex_cache.cc b/test/497-inlining-and-class-loader/clear_dex_cache.cc
index 716d73b..6c6a08f 100644
--- a/test/497-inlining-and-class-loader/clear_dex_cache.cc
+++ b/test/497-inlining-and-class-loader/clear_dex_cache.cc
@@ -78,11 +78,11 @@
     uint32_t index;
     ArtMethod* method;
     if (sizeof(void*) == 4) {
-      ObjPtr<mirror::IntArray> int_array = down_cast<mirror::IntArray*>(old.Ptr());
+      ObjPtr<mirror::IntArray> int_array = ObjPtr<mirror::IntArray>::DownCast(old);
       index = static_cast<uint32_t>(int_array->Get(2u * i));
       method = reinterpret_cast32<ArtMethod*>(int_array->Get(2u * i + 1u));
     } else {
-      ObjPtr<mirror::LongArray> long_array = down_cast<mirror::LongArray*>(old.Ptr());
+      ObjPtr<mirror::LongArray> long_array = ObjPtr<mirror::LongArray>::DownCast(old);
       index = dchecked_integral_cast<uint32_t>(long_array->Get(2u * i));
       method = reinterpret_cast64<ArtMethod*>(long_array->Get(2u * i + 1u));
     }