From 6716941120ae9f47ba1b8ef8e79820c4b5640350 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 12 Jan 2018 09:06:14 +0000
Subject: 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.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'compiler/optimizing/builder.cc')

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index a1a5692ef6..af537dd653 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -43,7 +43,7 @@ HGraphBuilder::HGraphBuilder(HGraph* graph,
                              CompilerDriver* driver,
                              CodeGenerator* code_generator,
                              OptimizingCompilerStats* compiler_stats,
-                             ArrayRef<const uint8_t> interpreter_metadata,
+                             const uint8_t* interpreter_metadata,
                              VariableSizedHandleScope* handles)
     : graph_(graph),
       dex_file_(&graph->GetDexFile()),
@@ -70,6 +70,7 @@ HGraphBuilder::HGraphBuilder(HGraph* graph,
       compiler_driver_(nullptr),
       code_generator_(nullptr),
       compilation_stats_(nullptr),
+      interpreter_metadata_(nullptr),
       handles_(handles),
       return_type_(return_type) {}
 
-- 
cgit v1.2.3-59-g8ed1b