commit 465ecc86ff65ca546629630c9469deb6d2d8137e
author Matthew Gharrity <gharrma@google.com> Tue Jul 19 21:32:52 2016 +0000
committer Matthew Gharrity <gharrma@google.com> Tue Jul 19 21:48:06 2016 +0000
tree 3a0ed3f2d3ab9fd2cffec44a659036efab35fb4e
parent bae13af2fc2fa89985d0466cedf155cb96767910

Revert "Revert "Refactor GetIMTIndex""

Originally reverted in order to revert
https://android-review.googlesource.com/#/c/244190/
but can now be merged again.

This reverts commit d4ceecc85a5aab2ec23ea1bd010692ba8c8aaa0c.

Test: m test-art-host

Change-Id: Id9205f2b77a378fc0f06088e78c66e81a49f712d

compiler/optimizing/instruction_builder.cc

diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index b412529..afac5f9 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -16,6 +16,7 @@
 
 #include "instruction_builder.h"
 
+#include "art_method-inl.h"
 #include "bytecode_utils.h"
 #include "class_linker.h"
 #include "driver/compiler_options.h"
@@ -890,7 +891,7 @@
                                            return_type,
                                            dex_pc,
                                            method_idx,
-                                           resolved_method->GetDexMethodIndex());
+                                           resolved_method->GetImtIndex());
   }
 
   return HandleInvoke(invoke,