diff options
| author | Alex Light <allight@google.com> | 2015-12-17 15:48:01 -0800 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2015-12-17 15:48:01 -0800 |
| commit | 9c5572957bf357897f0969d002132fc647bfa649 (patch) | |
| tree | 84e853d076d2a7449e0eba1710b2a4b3d0872fda /compiler/driver/compiler_driver_test.cc | |
| parent | 90f5250d4ba7bcf6066edb022f8325df66d686f3 (diff) | |
| parent | 9f784b26a13101222c5e5927cafd7f500d3cff67 (diff) | |
resolve merge conflicts of 9f784b26a1 to master.
Change-Id: I9ebcb6e3d51be922e08e5f867fb8dcaf5cb9788d
Diffstat (limited to 'compiler/driver/compiler_driver_test.cc')
| -rw-r--r-- | compiler/driver/compiler_driver_test.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index 2e43c2c71a..462c511a83 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -86,10 +86,7 @@ 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->GetDirectMethods(pointer_size)) { - MakeExecutable(&m); - } - for (auto& m : c->GetVirtualMethods(pointer_size)) { + for (auto& m : c->GetMethods(pointer_size)) { MakeExecutable(&m); } } |