commit f52d92fce224c86491d9b0fd6fca805564119426
author Vladimir Marko <vmarko@google.com> Fri Mar 29 12:33:02 2019 +0000
committer Vladimir Marko <vmarko@google.com> Mon Apr 01 09:37:59 2019 +0000
tree fbf38f272a980e965627918d9dc6bbb536395c00
parent e660f7232a19a2c173f562b8e0987755a78ee298

ObjPtr<>-ify Monitor/-Pool.

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

runtime/runtime_callbacks_test.cc

diff --git a/runtime/runtime_callbacks_test.cc b/runtime/runtime_callbacks_test.cc
index a4f3df2..4a60c04 100644
--- a/runtime/runtime_callbacks_test.cc
+++ b/runtime/runtime_callbacks_test.cc
@@ -37,9 +37,9 @@
 #include "handle_scope-inl.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_loader.h"
-#include "monitor.h"
+#include "monitor-inl.h"
 #include "nativehelper/scoped_local_ref.h"
-#include "obj_ptr.h"
+#include "obj_ptr-inl.h"
 #include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-inl.h"
@@ -443,7 +443,8 @@
   }
 
   struct Callback : public MonitorCallback {
-    bool IsInterestingObject(mirror::Object* obj) REQUIRES_SHARED(art::Locks::mutator_lock_) {
+    bool IsInterestingObject(ObjPtr<mirror::Object> obj)
+        REQUIRES_SHARED(art::Locks::mutator_lock_) {
       if (!obj->IsClass()) {
         return false;
       }
@@ -453,7 +454,8 @@
       return ref_ == test;
     }
 
-    void SetInterestingObject(mirror::Object* obj) REQUIRES_SHARED(art::Locks::mutator_lock_) {
+    void SetInterestingObject(ObjPtr<mirror::Object> obj)
+        REQUIRES_SHARED(art::Locks::mutator_lock_) {
       std::lock_guard<std::mutex> lock(ref_guard_);
       ObjPtr<mirror::Class> k = obj->AsClass();
       ref_ = { &k->GetDexFile(), k->GetDexClassDefIndex() };
@@ -501,11 +503,11 @@
     {
       ScopedObjectAccess soa(self);
       cb_.SetInterestingObject(
-          soa.Decode<mirror::Class>(WellKnownClasses::java_util_Collections).Ptr());
+          soa.Decode<mirror::Class>(WellKnownClasses::java_util_Collections));
       Monitor::Wait(
           self,
           // Just a random class
-          soa.Decode<mirror::Class>(WellKnownClasses::java_util_Collections).Ptr(),
+          soa.Decode<mirror::Class>(WellKnownClasses::java_util_Collections),
           /*ms=*/0,
           /*ns=*/0,
           /*interruptShouldThrow=*/false,