From e64300b8488716056775ecbfa2915dd1b4ce7e08 Mon Sep 17 00:00:00 2001
From: Alex Light <allight@google.com>
Date: Tue, 15 Dec 2015 15:02:47 -0800
Subject: Revert "Revert "Combine direct_methods_ and virtual_methods_ fields
 of mirror::Class""

This reverts commit ae358c1d5cef227b44d6f4971b79e1ab91aa26eb.

Bug: 24618811

Change-Id: I8becf9bae3258450b90cfef5e79589db7c535a4d
---
 compiler/driver/compiler_driver.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'compiler/driver/compiler_driver.cc')

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index ba8f1d0df1..56839f85f9 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -790,10 +790,7 @@ class ResolveCatchBlockExceptionsClassVisitor : public ClassVisitor {
 
   virtual bool Visit(mirror::Class* c) OVERRIDE SHARED_REQUIRES(Locks::mutator_lock_) {
     const auto pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize();
-    for (auto& m : c->GetVirtualMethods(pointer_size)) {
-      ResolveExceptionsForMethod(&m, pointer_size);
-    }
-    for (auto& m : c->GetDirectMethods(pointer_size)) {
+    for (auto& m : c->GetMethods(pointer_size)) {
       ResolveExceptionsForMethod(&m, pointer_size);
     }
     return true;
-- 
cgit v1.2.3-59-g8ed1b