From 2efb0aa57da168944f99a2d13aed2a426cfa76e7 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Tue, 15 Dec 2015 22:15:34 +0000 Subject: Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class" This reverts commit 9539150b85142c18e9e8c2264b5b6100942667c3. Change-Id: I596876cd643ec0ad524a56621efb6b89e8886230 --- compiler/oat_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'compiler/oat_test.cc') diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index d6aafcbeef..c414e3120f 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -238,12 +238,12 @@ TEST_F(OatTest, WriteRead) { ++method_index; } size_t visited_virtuals = 0; - // TODO We should also check copied methods in this test. - for (auto& m : klass->GetDeclaredVirtualMethods(pointer_size)) { - EXPECT_FALSE(m.IsMiranda()); - CheckMethod(&m, oat_class.GetOatMethod(method_index), dex_file); - ++method_index; - ++visited_virtuals; + for (auto& m : klass->GetVirtualMethods(pointer_size)) { + if (!m.IsMiranda()) { + CheckMethod(&m, oat_class.GetOatMethod(method_index), dex_file); + ++method_index; + ++visited_virtuals; + } } EXPECT_EQ(visited_virtuals, num_virtual_methods); } -- cgit v1.2.3-59-g8ed1b