commit e9987b0831403858d95bdd7a5ef9e56665a9702d
author Vladimir Marko <vmarko@google.com> Tue May 22 16:26:43 2018 +0100
committer Vladimir Marko <vmarko@google.com> Wed May 23 15:16:45 2018 +0100
tree 3950da94b73665a52eb5e2b9c5aecc8c92145f13
parent 6ec2a1bf1cbecf17546df780dd0ad769042e1874

ObjPtr<>-ify tests using ClassLinker::FindClass().

ClassLinker::FindClass() returns a non-ObjPtr<> reference
but it has a lot of uses, so we shall change the uses in
a few steps. This change deals with several tests.

Test: Rely on TreeHugger.
Bug: 31113334
Change-Id: Ib75e20e7ebaff01fb607a09f96675f8cf397ae52

compiler/common_compiler_test.cc

diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 96a0c1b..a7f16d3 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -123,7 +123,7 @@
   Thread* self = Thread::Current();
   StackHandleScope<1> hs(self);
   Handle<mirror::ClassLoader> loader(hs.NewHandle(class_loader));
-  mirror::Class* klass = class_linker_->FindClass(self, class_descriptor.c_str(), loader);
+  ObjPtr<mirror::Class> klass = class_linker_->FindClass(self, class_descriptor.c_str(), loader);
   CHECK(klass != nullptr) << "Class not found " << class_name;
   PointerSize pointer_size = class_linker_->GetImagePointerSize();
   for (auto& m : klass->GetMethods(pointer_size)) {
@@ -222,7 +222,7 @@
   Thread* self = Thread::Current();
   StackHandleScope<1> hs(self);
   Handle<mirror::ClassLoader> loader(hs.NewHandle(class_loader));
-  mirror::Class* klass = class_linker_->FindClass(self, class_descriptor.c_str(), loader);
+  ObjPtr<mirror::Class> klass = class_linker_->FindClass(self, class_descriptor.c_str(), loader);
   CHECK(klass != nullptr) << "Class not found " << class_name;
   auto pointer_size = class_linker_->GetImagePointerSize();
   for (auto& m : klass->GetMethods(pointer_size)) {
@@ -244,7 +244,8 @@
                                              const char* signature) {
   std::string class_descriptor(DotToDescriptor(class_name));
   Thread* self = Thread::Current();
-  mirror::Class* klass = class_linker_->FindClass(self, class_descriptor.c_str(), class_loader);
+  ObjPtr<mirror::Class> klass =
+      class_linker_->FindClass(self, class_descriptor.c_str(), class_loader);
   CHECK(klass != nullptr) << "Class not found " << class_name;
   auto pointer_size = class_linker_->GetImagePointerSize();
   ArtMethod* method = klass->FindClassMethod(method_name, signature, pointer_size);
@@ -258,7 +259,8 @@
                                               const char* signature) {
   std::string class_descriptor(DotToDescriptor(class_name));
   Thread* self = Thread::Current();
-  mirror::Class* klass = class_linker_->FindClass(self, class_descriptor.c_str(), class_loader);
+  ObjPtr<mirror::Class> klass =
+      class_linker_->FindClass(self, class_descriptor.c_str(), class_loader);
   CHECK(klass != nullptr) << "Class not found " << class_name;
   auto pointer_size = class_linker_->GetImagePointerSize();
   ArtMethod* method = klass->FindClassMethod(method_name, signature, pointer_size);

compiler/jni/jni_compiler_test.cc

diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index c643af7..3cb4a65 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -245,7 +245,7 @@
     Handle<mirror::ClassLoader> loader(
         hs.NewHandle(soa.Decode<mirror::ClassLoader>(class_loader)));
     // Compile the native method before starting the runtime
-    mirror::Class* c = class_linker_->FindClass(soa.Self(), "LMyClassNatives;", loader);
+    ObjPtr<mirror::Class> c = class_linker_->FindClass(soa.Self(), "LMyClassNatives;", loader);
     const auto pointer_size = class_linker_->GetImagePointerSize();
     ArtMethod* method = c->FindClassMethod(method_name, method_sig, pointer_size);
     ASSERT_TRUE(method != nullptr) << method_name << " " << method_sig;