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

compiler/optimizing/builder.h

diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h
index 5a1914c..c16a3a9 100644
--- a/compiler/optimizing/builder.h
+++ b/compiler/optimizing/builder.h
@@ -18,7 +18,6 @@
 #define ART_COMPILER_OPTIMIZING_BUILDER_H_
 
 #include "base/arena_object.h"
-#include "base/array_ref.h"
 #include "dex/code_item_accessors.h"
 #include "dex/dex_file-inl.h"
 #include "dex/dex_file.h"
@@ -41,7 +40,7 @@
                 CompilerDriver* driver,
                 CodeGenerator* code_generator,
                 OptimizingCompilerStats* compiler_stats,
-                ArrayRef<const uint8_t> interpreter_metadata,
+                const uint8_t* interpreter_metadata,
                 VariableSizedHandleScope* handles);
 
   // Only for unit testing.
@@ -74,7 +73,7 @@
   CodeGenerator* const code_generator_;
 
   OptimizingCompilerStats* const compilation_stats_;
-  const ArrayRef<const uint8_t> interpreter_metadata_;
+  const uint8_t* const interpreter_metadata_;
   VariableSizedHandleScope* const handles_;
   const DataType::Type return_type_;