diff options
| author | 2022-10-14 16:17:32 +0200 | |
|---|---|---|
| committer | 2022-10-17 10:49:13 +0000 | |
| commit | afe6902accb6a4d3b3382cc501c4d005b6fb5b96 (patch) | |
| tree | d2e240e275c483c309e8a106822232fb7b07890a /runtime/class_loader_context_test.cc | |
| parent | ba5cc5b551fb72017c341ce243279351dea57267 (diff) | |
Change well known `ClassLoader` fields to `ArtField*`.
Note that the new field caching does not resolve the field's
type and does not initialize the class holding the field.
There is no reason why the `WellKnownClasses` should be
responsible for this type resolution and initialization.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 253570082
Change-Id: I692afdc891d161c813864543e47a2c02f93e93e8
Diffstat (limited to 'runtime/class_loader_context_test.cc')
| -rw-r--r-- | runtime/class_loader_context_test.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index 598670be82..9d3ceb2a70 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -839,8 +839,7 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibraries) { class_loader_1_dex_files); // Verify the shared libraries. - ArtField* field = - jni::DecodeArtField(WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders); + ArtField* field = WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders; ObjPtr<mirror::Object> raw_shared_libraries = field->GetObject(class_loader_1.Get()); ASSERT_TRUE(raw_shared_libraries != nullptr); @@ -924,8 +923,7 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibrariesInParentToo) class_loader_1_dex_files); // Verify its shared library. - ArtField* field = - jni::DecodeArtField(WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders); + ArtField* field = WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders; ObjPtr<mirror::Object> raw_shared_libraries = field->GetObject(class_loader_1.Get()); ASSERT_TRUE(raw_shared_libraries != nullptr); @@ -1024,8 +1022,7 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibrariesDependencies) class_loader_1_dex_files); // Verify its shared library. - ArtField* field = - jni::DecodeArtField(WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders); + ArtField* field = WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders; ObjPtr<mirror::Object> raw_shared_libraries = field->GetObject(class_loader_1.Get()); ASSERT_TRUE(raw_shared_libraries != nullptr); @@ -1139,8 +1136,7 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSameSharedLibraries) { class_loader_1_dex_files); // Verify its shared library. - ArtField* field = - jni::DecodeArtField(WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders); + ArtField* field = WellKnownClasses::dalvik_system_BaseDexClassLoader_sharedLibraryLoaders; ObjPtr<mirror::Object> raw_shared_libraries = field->GetObject(class_loader_1.Get()); ASSERT_TRUE(raw_shared_libraries != nullptr); |