diff options
| author | 2024-05-02 15:40:47 +0100 | |
|---|---|---|
| committer | 2024-05-03 15:40:42 +0000 | |
| commit | a4ac01044c50f4da02c40b8da5520d2eb65b41d9 (patch) | |
| tree | cd19c2cf8a0422876df3d70327687229748bd77a /runtime/class_linker.h | |
| parent | 721bbf2bfd6ffe689067df5657059925e038bb0d (diff) | |
Workaround for b/336842546
Resolve the type if it hasn't been resolved before. Also, change to
use Handles instead of ObjPtr since ResolveType can potentially
suspend.
Bug: 336842546
Bug: 73760543
Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: I8ad77e63d6d9cc76fee8aac88742d4a4b678abf5
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index eabfb4926a..7f53ca6e93 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -339,8 +339,8 @@ class EXPORT ClassLinker { // Look up a previously resolved method with the given index. ArtMethod* LookupResolvedMethod(uint32_t method_idx, - ObjPtr<mirror::DexCache> dex_cache, - ObjPtr<mirror::ClassLoader> class_loader) + Handle<mirror::DexCache> dex_cache, + Handle<mirror::ClassLoader> class_loader) REQUIRES_SHARED(Locks::mutator_lock_); // Find a method with the given index from class `klass`, and update the dex cache. |