diff options
| author | 2022-11-09 10:58:15 +0000 | |
|---|---|---|
| committer | 2022-11-09 17:03:26 +0000 | |
| commit | 4e0b5d713de14c3e2e4cdb2731bb3168b4a1a3f4 (patch) | |
| tree | b5bddfd6668c1c43e265cbfca19e9bfd408baed6 /runtime/hidden_api_test.cc | |
| parent | 176362af06aa22c10c9f16886cb80dd19205e45b (diff) | |
Clean up decoding well-known classes.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I27b4e8f5513511ce1c320e3224dd9c2a40880b69
Diffstat (limited to 'runtime/hidden_api_test.cc')
| -rw-r--r-- | runtime/hidden_api_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/hidden_api_test.cc b/runtime/hidden_api_test.cc index e204c57b28..781fcd1ffa 100644 --- a/runtime/hidden_api_test.cc +++ b/runtime/hidden_api_test.cc @@ -59,7 +59,7 @@ static bool Copy(const std::string& src, const std::string& dst, /*out*/ std::st } static bool LoadDexFiles(const std::string& path, - ScopedObjectAccess& soa, + Thread* self, /* out */ std::vector<std::unique_ptr<const DexFile>>* dex_files, /* out */ ObjPtr<mirror::ClassLoader>* class_loader, /* out */ std::string* error_msg) REQUIRES_SHARED(Locks::mutator_lock_) { @@ -74,11 +74,11 @@ static bool LoadDexFiles(const std::string& path, ClassLinker* const linker = Runtime::Current()->GetClassLinker(); - StackHandleScope<2> hs(soa.Self()); - Handle<mirror::Class> h_class = hs.NewHandle(soa.Decode<mirror::Class>( + StackHandleScope<2> hs(self); + Handle<mirror::Class> h_class = hs.NewHandle(WellKnownClasses::ToClass( WellKnownClasses::dalvik_system_PathClassLoader)); Handle<mirror::ClassLoader> h_loader = hs.NewHandle(linker->CreateWellKnownClassLoader( - soa.Self(), + self, MakeNonOwningPointerVector(*dex_files), h_class, /* parent_loader= */ ScopedNullHandle<mirror::ClassLoader>(), @@ -198,7 +198,7 @@ class HiddenApiTest : public CommonRuntimeTest { ObjPtr<mirror::ClassLoader> class_loader; ASSERT_TRUE(Copy(GetTestDexFileName("Main"), location, &error_msg)) << error_msg; - ASSERT_TRUE(LoadDexFiles(location, soa, &dex_files, &class_loader, &error_msg)) + ASSERT_TRUE(LoadDexFiles(location, soa.Self(), &dex_files, &class_loader, &error_msg)) << error_msg; ASSERT_GE(dex_files.size(), 1u); ASSERT_TRUE(CheckAllDexFilesInDomain(class_loader, |