commit 210531f8775c89feb90d430cd5b6026b4cf8ef89
author Mathieu Chartier <mathieuc@google.com> Fri Jan 12 10:15:51 2018 -0800
committer Mathieu Chartier <mathieuc@google.com> Sat Jan 13 01:40:03 2018 +0000
tree 3c23fffcc0d1d7876f15f64672e0de98b1f051ca
parent 3c9e0f69b04b614c44448e66e15c6f8a78da4b2c

Revert "Revert "Move quickening info logic to its own table""

Bug: 71605148
Bug: 63756964

Test: test-art-target on angler

This reverts commit 6716941120ae9f47ba1b8ef8e79820c4b5640350.

Change-Id: Ic01ea4e8bb2c1de761fab354c5bbe27290538631

runtime/art_method.cc

diff --git a/runtime/art_method.cc b/runtime/art_method.cc
index f9eedae..db7289a 100644
--- a/runtime/art_method.cc
+++ b/runtime/art_method.cc
@@ -577,14 +577,14 @@
   return true;
 }
 
-const uint8_t* ArtMethod::GetQuickenedInfo() {
+ArrayRef<const uint8_t> ArtMethod::GetQuickenedInfo() {
   const DexFile& dex_file = GetDeclaringClass()->GetDexFile();
   const OatFile::OatDexFile* oat_dex_file = dex_file.GetOatDexFile();
   if (oat_dex_file == nullptr || (oat_dex_file->GetOatFile() == nullptr)) {
-    return nullptr;
+    return ArrayRef<const uint8_t>();
   }
-  return oat_dex_file->GetOatFile()->GetVdexFile()->GetQuickenedInfoOf(
-      dex_file, GetCodeItemOffset());
+  return oat_dex_file->GetOatFile()->GetVdexFile()->GetQuickenedInfoOf(dex_file,
+                                                                       GetDexMethodIndex());
 }
 
 const OatQuickMethodHeader* ArtMethod::GetOatQuickMethodHeader(uintptr_t pc) {