From ae358c1d5cef227b44d6f4971b79e1ab91aa26eb Mon Sep 17 00:00:00 2001
From: Alex Light <allight@google.com>
Date: Tue, 15 Dec 2015 22:15:26 +0000
Subject: Revert "Combine direct_methods_ and virtual_methods_ fields of
 mirror::Class"

This reverts commit 6286a97bea0f584342803a215550038852b24776.

Change-Id: I5b00f6d1350e9c587acd4b185367dc815ea707de
---
 compiler/driver/compiler_driver.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 56839f85f9..ba8f1d0df1 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -790,7 +790,10 @@ 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->GetMethods(pointer_size)) {
+    for (auto& m : c->GetVirtualMethods(pointer_size)) {
+      ResolveExceptionsForMethod(&m, pointer_size);
+    }
+    for (auto& m : c->GetDirectMethods(pointer_size)) {
       ResolveExceptionsForMethod(&m, pointer_size);
     }
     return true;
-- 
cgit v1.2.3-59-g8ed1b