commit 07f7affb338b529d34e4e18b7e8a631c16bd9765
author Nicolas Geoffray <ngeoffray@google.com> Thu Feb 18 16:56:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 18 16:56:43 2016 +0000
tree b821021b98e5afae4c1feebc9a45631db427fed7
parent 1d01ef7f0f79b032449c35203ca9543fb8a0b22f
parent 1fe26e1ca54e2f0eed6056ebdbc6b2e6c02ee0bb

Merge "Fix build aflter conflicting changes got in."

compiler/optimizing/inliner.cc

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index e3c2f5b..f39699e 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -453,7 +453,8 @@
     HInstruction* cursor = invoke_instruction->GetPrevious();
     HBasicBlock* bb_cursor = invoke_instruction->GetBlock();
 
-    uint32_t class_index = FindClassIndexIn(ic.GetTypeAt(i), caller_dex_file);
+    uint32_t class_index = FindClassIndexIn(
+        ic.GetTypeAt(i), caller_dex_file, caller_compilation_unit_.GetDexCache());
     HInstruction* return_replacement = nullptr;
     if (class_index == DexFile::kDexNoIndex ||
         !TryBuildAndInline(invoke_instruction, method, &return_replacement)) {