diff options
| author | 2022-10-18 09:49:00 +0000 | |
|---|---|---|
| committer | 2022-10-18 15:58:58 +0000 | |
| commit | 5be5ce773a683439792c799827fcef2fea0cf157 (patch) | |
| tree | 0010a7309d5b8b955f5418515cd3fd54aa32a984 /runtime/class_loader_context_test.cc | |
| parent | b47fc9709ca8d36c44dca81dcb8cc211e933f082 (diff) | |
Reland "Change well known `ClassLoader` fields to `ArtField*`."
This reverts commit 839193ee2031d28aac2ce16c4b76ad40531b07cc.
Reason for revert: Reland with a fix - make CompilerDriver
reponsible for initializing required `ClassLoader` classes
for boot image.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Manually run Golem benchmark ArrayListStress.
Bug: 253570082
Change-Id: I2ddb70566352f8728f089b3a6c58473270240e25
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); |