From e9987b0831403858d95bdd7a5ef9e56665a9702d Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 22 May 2018 16:26:43 +0100 Subject: 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 --- runtime/indirect_reference_table_test.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'runtime/indirect_reference_table_test.cc') diff --git a/runtime/indirect_reference_table_test.cc b/runtime/indirect_reference_table_test.cc index 92785090f5..141feb434f 100644 --- a/runtime/indirect_reference_table_test.cc +++ b/runtime/indirect_reference_table_test.cc @@ -60,8 +60,9 @@ TEST_F(IndirectReferenceTableTest, BasicTest) { &error_msg); ASSERT_TRUE(irt.IsValid()) << error_msg; - mirror::Class* c = class_linker_->FindSystemClass(soa.Self(), "Ljava/lang/Object;"); - StackHandleScope<4> hs(soa.Self()); + StackHandleScope<5> hs(soa.Self()); + Handle c = + hs.NewHandle(class_linker_->FindSystemClass(soa.Self(), "Ljava/lang/Object;")); ASSERT_TRUE(c != nullptr); Handle obj0 = hs.NewHandle(c->AllocObject(soa.Self())); ASSERT_TRUE(obj0 != nullptr); @@ -278,8 +279,9 @@ TEST_F(IndirectReferenceTableTest, Holes) { ScopedObjectAccess soa(Thread::Current()); static const size_t kTableMax = 10; - mirror::Class* c = class_linker_->FindSystemClass(soa.Self(), "Ljava/lang/Object;"); - StackHandleScope<5> hs(soa.Self()); + StackHandleScope<6> hs(soa.Self()); + Handle c = hs.NewHandle( + class_linker_->FindSystemClass(soa.Self(), "Ljava/lang/Object;")); ASSERT_TRUE(c != nullptr); Handle obj0 = hs.NewHandle(c->AllocObject(soa.Self())); ASSERT_TRUE(obj0 != nullptr); @@ -487,8 +489,9 @@ TEST_F(IndirectReferenceTableTest, Resize) { ScopedObjectAccess soa(Thread::Current()); static const size_t kTableMax = 512; - mirror::Class* c = class_linker_->FindSystemClass(soa.Self(), "Ljava/lang/Object;"); - StackHandleScope<1> hs(soa.Self()); + StackHandleScope<2> hs(soa.Self()); + Handle c = hs.NewHandle( + class_linker_->FindSystemClass(soa.Self(), "Ljava/lang/Object;")); ASSERT_TRUE(c != nullptr); Handle obj0 = hs.NewHandle(c->AllocObject(soa.Self())); ASSERT_TRUE(obj0 != nullptr); -- cgit v1.2.3-59-g8ed1b