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

1 files changed, 4 insertions, 1 deletions

diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc
index 86f8b823cc..f8de9fa4a1 100644
--- a/compiler/driver/compiler_driver_test.cc
+++ b/compiler/driver/compiler_driver_test.cc
@@ -86,7 +86,10 @@ class CompilerDriverTest : public CommonCompilerTest {
       mirror::Class* c = class_linker->FindClass(soa.Self(), descriptor, loader);
       CHECK(c != nullptr);
       const auto pointer_size = class_linker->GetImagePointerSize();
-      for (auto& m : c->GetMethods(pointer_size)) {
+      for (auto& m : c->GetDirectMethods(pointer_size)) {
+        MakeExecutable(&m);
+      }
+      for (auto& m : c->GetVirtualMethods(pointer_size)) {
         MakeExecutable(&m);
       }
     }