Merge "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""

1 files changed, 8 insertions, 2 deletions

diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index c7c190793c..638b897eea 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -142,7 +142,10 @@ void CommonCompilerTest::MakeExecutable(mirror::ClassLoader* class_loader, const
   mirror::Class* klass = class_linker_->FindClass(self, class_descriptor.c_str(), loader);
   CHECK(klass != nullptr) << "Class not found " << class_name;
   size_t pointer_size = class_linker_->GetImagePointerSize();
-  for (auto& m : klass->GetMethods(pointer_size)) {
+  for (auto& m : klass->GetDirectMethods(pointer_size)) {
+    MakeExecutable(&m);
+  }
+  for (auto& m : klass->GetVirtualMethods(pointer_size)) {
     MakeExecutable(&m);
   }
 }
@@ -256,7 +259,10 @@ void CommonCompilerTest::CompileClass(mirror::ClassLoader* class_loader, const c
   mirror::Class* klass = class_linker_->FindClass(self, class_descriptor.c_str(), loader);
   CHECK(klass != nullptr) << "Class not found " << class_name;
   auto pointer_size = class_linker_->GetImagePointerSize();
-  for (auto& m : klass->GetMethods(pointer_size)) {
+  for (auto& m : klass->GetDirectMethods(pointer_size)) {
+    CompileMethod(&m);
+  }
+  for (auto& m : klass->GetVirtualMethods(pointer_size)) {
     CompileMethod(&m);
   }
 }