commit dfc0de7696a50a9aeee95dcf74dac036e3334314
author Vladimir Marko <vmarko@google.com> Mon Apr 01 10:57:55 2019 +0100
committer Vladimir Marko <vmarko@google.com> Tue Apr 02 07:57:27 2019 +0000
tree 20a6edd33cca852f8e65ce8d20a85949b566904c
parent 9ef308da0ea8d1df2edf65d4957599fafcc56aeb

Partially ObjPtr<>-ify Object, fix stale ref in test.

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

runtime/transaction_test.cc

diff --git a/runtime/transaction_test.cc b/runtime/transaction_test.cc
index fb0a5d9..aea2211 100644
--- a/runtime/transaction_test.cc
+++ b/runtime/transaction_test.cc
@@ -99,10 +99,10 @@
   Runtime::Current()->EnterTransactionMode();
   Handle<mirror::Object> h_obj(hs.NewHandle(h_klass->AllocObject(soa.Self())));
   ASSERT_TRUE(h_obj != nullptr);
-  ASSERT_EQ(h_obj->GetClass(), h_klass.Get());
+  ASSERT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
   // Rolling back transaction's changes must not clear the Object::class field.
   Runtime::Current()->RollbackAndExitTransactionMode();
-  EXPECT_EQ(h_obj->GetClass(), h_klass.Get());
+  EXPECT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
 }
 
 // Tests object's monitor state is preserved after transaction rollback.
@@ -114,7 +114,7 @@
   ASSERT_TRUE(h_klass != nullptr);
   Handle<mirror::Object> h_obj(hs.NewHandle(h_klass->AllocObject(soa.Self())));
   ASSERT_TRUE(h_obj != nullptr);
-  ASSERT_EQ(h_obj->GetClass(), h_klass.Get());
+  ASSERT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
 
   // Lock object's monitor outside the transaction.
   h_obj->MonitorEnter(soa.Self());
@@ -151,7 +151,7 @@
                                      h_klass->GetComponentSizeShift(),
                                      Runtime::Current()->GetHeap()->GetCurrentAllocator())));
   ASSERT_TRUE(h_obj != nullptr);
-  ASSERT_EQ(h_obj->GetClass(), h_klass.Get());
+  ASSERT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
   Runtime::Current()->RollbackAndExitTransactionMode();
 
   // Rolling back transaction's changes must not reset array's length.
@@ -227,7 +227,7 @@
   ASSERT_TRUE(object_klass != nullptr);
   Handle<mirror::Object> h_obj(hs.NewHandle(h_klass->AllocObject(soa.Self())));
   ASSERT_TRUE(h_obj != nullptr);
-  ASSERT_EQ(h_obj->GetClass(), h_klass.Get());
+  ASSERT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
 
   // Modify fields inside transaction then rollback changes.
   Runtime::Current()->EnterTransactionMode();
@@ -327,7 +327,7 @@
   ASSERT_TRUE(object_klass != nullptr);
   Handle<mirror::Object> h_obj(hs.NewHandle(h_klass->AllocObject(soa.Self())));
   ASSERT_TRUE(h_obj != nullptr);
-  ASSERT_EQ(h_obj->GetClass(), h_klass.Get());
+  ASSERT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
 
   // Modify fields inside transaction then rollback changes.
   Runtime::Current()->EnterTransactionMode();
@@ -450,7 +450,7 @@
   ASSERT_TRUE(object_klass != nullptr);
   Handle<mirror::Object> h_obj(hs.NewHandle(h_klass->AllocObject(soa.Self())));
   ASSERT_TRUE(h_obj != nullptr);
-  ASSERT_EQ(h_obj->GetClass(), h_klass.Get());
+  ASSERT_OBJ_PTR_EQ(h_obj->GetClass(), h_klass.Get());
 
   // Modify fields inside transaction then rollback changes.
   Runtime::Current()->EnterTransactionMode();