diff options
Diffstat (limited to 'runtime/mirror/object_test.cc')
| -rw-r--r-- | runtime/mirror/object_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc index 8e50a7a..85ea28f 100644 --- a/runtime/mirror/object_test.cc +++ b/runtime/mirror/object_test.cc @@ -77,9 +77,9 @@ class ObjectTest : public CommonRuntimeTest { TEST_F(ObjectTest, Constants) { EXPECT_EQ(kObjectReferenceSize, sizeof(HeapReference<Object>)); EXPECT_EQ(kObjectHeaderSize, sizeof(Object)); - EXPECT_EQ(MIRROR_ART_METHOD_QUICK_CODE_OFFSET_32, + EXPECT_EQ(ART_METHOD_QUICK_CODE_OFFSET_32, ArtMethod::EntryPointFromQuickCompiledCodeOffset(4).Int32Value()); - EXPECT_EQ(MIRROR_ART_METHOD_QUICK_CODE_OFFSET_64, + EXPECT_EQ(ART_METHOD_QUICK_CODE_OFFSET_64, ArtMethod::EntryPointFromQuickCompiledCodeOffset(8).Int32Value()); } @@ -306,7 +306,7 @@ TEST_F(ObjectTest, CheckAndAllocArrayFromCode) { // pretend we are trying to call 'new char[3]' from String.toCharArray ScopedObjectAccess soa(Thread::Current()); Class* java_util_Arrays = class_linker_->FindSystemClass(soa.Self(), "Ljava/util/Arrays;"); - ArtMethod* sort = java_util_Arrays->FindDirectMethod("sort", "([I)V"); + ArtMethod* sort = java_util_Arrays->FindDirectMethod("sort", "([I)V", sizeof(void*)); const DexFile::StringId* string_id = java_lang_dex_file_->FindStringId("[I"); ASSERT_TRUE(string_id != nullptr); const DexFile::TypeId* type_id = java_lang_dex_file_->FindTypeId( @@ -366,7 +366,7 @@ TEST_F(ObjectTest, StaticFieldFromCode) { StackHandleScope<2> hs(soa.Self()); Handle<mirror::ClassLoader> loader(hs.NewHandle(soa.Decode<ClassLoader*>(class_loader))); Class* klass = class_linker_->FindClass(soa.Self(), "LStaticsFromCode;", loader); - ArtMethod* clinit = klass->FindClassInitializer(); + ArtMethod* clinit = klass->FindClassInitializer(sizeof(void*)); const DexFile::StringId* klass_string_id = dex_file->FindStringId("LStaticsFromCode;"); ASSERT_TRUE(klass_string_id != nullptr); const DexFile::TypeId* klass_type_id = dex_file->FindTypeId( @@ -508,22 +508,22 @@ TEST_F(ObjectTest, DescriptorCompare) { Class* klass2 = linker->FindClass(soa.Self(), "LProtoCompare2;", class_loader_2); ASSERT_TRUE(klass2 != nullptr); - ArtMethod* m1_1 = klass1->GetVirtualMethod(0); + ArtMethod* m1_1 = klass1->GetVirtualMethod(0, sizeof(void*)); EXPECT_STREQ(m1_1->GetName(), "m1"); - ArtMethod* m2_1 = klass1->GetVirtualMethod(1); + ArtMethod* m2_1 = klass1->GetVirtualMethod(1, sizeof(void*)); EXPECT_STREQ(m2_1->GetName(), "m2"); - ArtMethod* m3_1 = klass1->GetVirtualMethod(2); + ArtMethod* m3_1 = klass1->GetVirtualMethod(2, sizeof(void*)); EXPECT_STREQ(m3_1->GetName(), "m3"); - ArtMethod* m4_1 = klass1->GetVirtualMethod(3); + ArtMethod* m4_1 = klass1->GetVirtualMethod(3, sizeof(void*)); EXPECT_STREQ(m4_1->GetName(), "m4"); - ArtMethod* m1_2 = klass2->GetVirtualMethod(0); + ArtMethod* m1_2 = klass2->GetVirtualMethod(0, sizeof(void*)); EXPECT_STREQ(m1_2->GetName(), "m1"); - ArtMethod* m2_2 = klass2->GetVirtualMethod(1); + ArtMethod* m2_2 = klass2->GetVirtualMethod(1, sizeof(void*)); EXPECT_STREQ(m2_2->GetName(), "m2"); - ArtMethod* m3_2 = klass2->GetVirtualMethod(2); + ArtMethod* m3_2 = klass2->GetVirtualMethod(2, sizeof(void*)); EXPECT_STREQ(m3_2->GetName(), "m3"); - ArtMethod* m4_2 = klass2->GetVirtualMethod(3); + ArtMethod* m4_2 = klass2->GetVirtualMethod(3, sizeof(void*)); EXPECT_STREQ(m4_2->GetName(), "m4"); } |