diff options
| author | 2016-02-18 16:55:42 +0000 | |
|---|---|---|
| committer | 2016-02-18 16:55:42 +0000 | |
| commit | 1fe26e1ca54e2f0eed6056ebdbc6b2e6c02ee0bb (patch) | |
| tree | b821021b98e5afae4c1feebc9a45631db427fed7 | |
| parent | 1d01ef7f0f79b032449c35203ca9543fb8a0b22f (diff) | |
Fix build aflter conflicting changes got in.
Change-Id: Ia3846e9a0dad137fe797bf3f2ece0cb78c106ec0
| -rw-r--r-- | compiler/optimizing/inliner.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index e3c2f5b37d..f39699e0a7 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -453,7 +453,8 @@ bool HInliner::TryInlinePolymorphicCall(HInvoke* invoke_instruction, 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)) { |