ObjPtr<>-ify mirror::IfTable.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 31113334
Change-Id: I77d36cc96f48ff92c1ca3b2581be7637a2ea22d7
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 58ac995..16f6383 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -6766,7 +6766,7 @@
if (method_array_count == 0) {
continue;
}
- auto* method_array = if_table->GetMethodArray(i);
+ ObjPtr<mirror::PointerArray> method_array = if_table->GetMethodArray(i);
for (size_t j = 0; j < method_array_count; ++j) {
ArtMethod* implementation_method =
method_array->GetElementPtrSize<ArtMethod*>(j, image_pointer_size_);
@@ -6824,7 +6824,7 @@
if (method_array_count == 0) {
continue;
}
- auto* method_array = if_table->GetMethodArray(i);
+ ObjPtr<mirror::PointerArray> method_array = if_table->GetMethodArray(i);
for (size_t j = 0; j < method_array_count; ++j) {
ArtMethod* implementation_method =
method_array->GetElementPtrSize<ArtMethod*>(j, image_pointer_size_);
@@ -7784,8 +7784,8 @@
// Go fix up all the stale iftable pointers.
for (size_t i = 0; i < ifcount; ++i) {
for (size_t j = 0, count = iftable->GetMethodArrayCount(i); j < count; ++j) {
- auto* method_array = iftable->GetMethodArray(i);
- auto* m = method_array->GetElementPtrSize<ArtMethod*>(j, pointer_size);
+ ObjPtr<mirror::PointerArray> method_array = iftable->GetMethodArray(i);
+ ArtMethod* m = method_array->GetElementPtrSize<ArtMethod*>(j, pointer_size);
DCHECK(m != nullptr) << klass_->PrettyClass();
auto it = move_table_.find(m);
if (it != move_table_.end()) {