commit 6716941120ae9f47ba1b8ef8e79820c4b5640350
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 12 09:06:14 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jan 12 09:06:14 2018 +0000
tree 76dd7d32703505d4ab44c0b55a7ecaf3ff66a94e
parent 7a26f948204377130be7b738d70d7365c86a804b

Revert "Move quickening info logic to its own table"

Bug: 71605148
Bug: 63756964

Seems to fail on armv7.

This reverts commit f5245188d9c61f6b90eb30cca0875fbdcc493b15.

Change-Id: I37786c04a8260ae3ec4a2cd73710126783c3ae7e

openjdkjvmti/fixed_up_dex_file.cc

diff --git a/openjdkjvmti/fixed_up_dex_file.cc b/openjdkjvmti/fixed_up_dex_file.cc
index 731566f..da7d60a 100644
--- a/openjdkjvmti/fixed_up_dex_file.cc
+++ b/openjdkjvmti/fixed_up_dex_file.cc
@@ -62,7 +62,8 @@
   if (vdex == nullptr) {
     return;
   }
-  vdex->UnquickenDexFile(new_dex_file, original_dex_file, /* decompile_return_instruction */true);
+  art::VdexFile::UnquickenDexFile(
+      new_dex_file, vdex->GetQuickeningInfo(), /* decompile_return_instruction */true);
 }
 
 std::unique_ptr<FixedUpDexFile> FixedUpDexFile::Create(const art::DexFile& original) {