diff options
| author | 2016-09-30 10:27:43 -0700 | |
|---|---|---|
| committer | 2016-10-03 14:06:27 -0700 | |
| commit | 3398c7874e002beaa6c2b2fadf183e7d1ddad23a (patch) | |
| tree | 7db754b5b0c3a6c68bc1f91d7cb2477f534d2ad3 /runtime/class_linker_test.cc | |
| parent | 462e21cc8d28a4d48342cf0f634bd1ecc63647d7 (diff) | |
Move ArtField to ObjPtr
Added EXPECT_OBJ_PTR_EQ and variants to gtests.
Fixed moving GC bugs in:
ClassLinker::CreatePathClassLoader
ClassLinkerTest: StaticFields
ObjPtr Decode call sites: 186 -> 181.
Some tests fail due to ResolvedFieldAccessTest, will fix in follow
up CL.
Bug: 31113334
Test: test-art-host CC baker
Change-Id: I8b266ad00f3c20c8cbe7cfdf280d175083df0b88
Diffstat (limited to 'runtime/class_linker_test.cc')
| -rw-r--r-- | runtime/class_linker_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 451b752ee5..3c12b18f98 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -243,10 +243,10 @@ class ClassLinkerTest : public CommonRuntimeTest { kRuntimePointerSize)); } - void AssertField(mirror::Class* klass, ArtField* field) + void AssertField(ObjPtr<mirror::Class> klass, ArtField* field) REQUIRES_SHARED(Locks::mutator_lock_) { EXPECT_TRUE(field != nullptr); - EXPECT_EQ(klass, field->GetDeclaringClass()); + EXPECT_OBJ_PTR_EQ(klass, field->GetDeclaringClass()); EXPECT_TRUE(field->GetName() != nullptr); EXPECT_TRUE(field->GetType<true>() != nullptr); } @@ -358,7 +358,7 @@ class ClassLinkerTest : public CommonRuntimeTest { MemberOffset current_ref_offset = start_ref_offset; for (size_t i = 0; i < klass->NumInstanceFields(); i++) { ArtField* field = klass->GetInstanceField(i); - mirror::Class* field_type = field->GetType<true>(); + ObjPtr<mirror::Class> field_type = field->GetType<true>(); ASSERT_TRUE(field_type != nullptr); if (!field->IsPrimitiveType()) { ASSERT_TRUE(!field_type->IsPrimitive()); @@ -1018,8 +1018,8 @@ TEST_F(ClassLinkerTest, StaticFields) { "Ljava/lang/String;"); EXPECT_EQ(s8->GetTypeAsPrimitiveType(), Primitive::kPrimNot); EXPECT_TRUE(s8->GetObject(statics.Get())->AsString()->Equals("android")); - s8->SetObject<false>(s8->GetDeclaringClass(), - mirror::String::AllocFromModifiedUtf8(soa.Self(), "robot")); + mirror::String* str_value = mirror::String::AllocFromModifiedUtf8(soa.Self(), "robot"); + s8->SetObject<false>(s8->GetDeclaringClass(), str_value); // TODO: Remove EXPECT_FALSE when GCC can handle EXPECT_EQ // http://code.google.com/p/googletest/issues/detail?id=322 |