commit d4ceecc85a5aab2ec23ea1bd010692ba8c8aaa0c
author Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 08:39:47 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 08:39:47 2016 +0000
tree 982948a67a88a1f9a734c935f919f8d307969f48
parent 50706437d8216e41f0fea1e413cda7891324d397

Revert "Refactor GetIMTIndex"

I need to revert this to get https://android-review.googlesource.com/#/c/244190/ to cleanly revert. Matthew, do you mind rewriting it?

This reverts commit 50706437d8216e41f0fea1e413cda7891324d397.

Change-Id: I5c1435f5dffb46dbb5b613b22adb88c7770304f2

compiler/optimizing/instruction_builder.cc

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