commit 102a8f27cc8d719f4bf58aa294475112c1ae66b9
author Sebastien Hertz <shertz@google.com> Wed Dec 18 11:41:30 2013 +0100
committer Sebastien Hertz <shertz@google.com> Wed Dec 18 11:44:47 2013 +0100
tree 35f1dd34fc6e0866aa7fafc0989d2eb096cbd12b
parent 9235ed3182eb19d04240b0a4367481ef2d9a25a7

Fix build - test issues.

Fix compilation errors in tests.

Change-Id: Id2405edc2eec5bef9ebf5f241db03a0bb4a6b5a3

compiler/oat_test.cc

diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc
index fd0a69d..94bc30d 100644
--- a/compiler/oat_test.cc
+++ b/compiler/oat_test.cc
@@ -79,7 +79,11 @@
   InstructionSet insn_set = kIsTargetBuild ? kThumb2 : kX86;
 
   InstructionSetFeatures insn_features;
-  compiler_driver_.reset(new CompilerDriver(compiler_backend, insn_set,
+  verified_methods_data_.reset(new VerifiedMethodsData);
+  method_inliner_map_.reset(new DexFileToMethodInlinerMap);
+  compiler_driver_.reset(new CompilerDriver(verified_methods_data_.get(),
+                                            method_inliner_map_.get(),
+                                            compiler_backend, insn_set,
                                             insn_features, false, NULL, 2, true));
   jobject class_loader = NULL;
   if (kCompile) {

runtime/common_test.h

diff --git a/runtime/common_test.h b/runtime/common_test.h
index d3151c3..8dd76fe 100644
--- a/runtime/common_test.h
+++ b/runtime/common_test.h
@@ -25,12 +25,14 @@
 #include <fstream>
 
 #include "../../external/icu4c/common/unicode/uvernum.h"
+#include "../compiler/dex/quick/dex_file_to_method_inliner_map.h"
+#include "../compiler/dex/verified_methods_data.h"
+#include "../compiler/driver/compiler_driver.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/unix_file/fd_file.h"
 #include "class_linker.h"
-#include "compiler/driver/compiler_driver.h"
 #include "dex_file-inl.h"
 #include "entrypoints/entrypoint_utils.h"
 #include "gc/heap.h"
@@ -454,7 +456,11 @@
         }
       }
       class_linker_->FixupDexCaches(runtime_->GetResolutionMethod());
-      compiler_driver_.reset(new CompilerDriver(compiler_backend, instruction_set,
+      verified_methods_data_.reset(new VerifiedMethodsData);
+      method_inliner_map_.reset(new DexFileToMethodInlinerMap);
+      compiler_driver_.reset(new CompilerDriver(verified_methods_data_.get(),
+                                                method_inliner_map_.get(),
+                                                compiler_backend, instruction_set,
                                                 instruction_set_features,
                                                 true, new CompilerDriver::DescriptorSet,
                                                 2, true));
@@ -634,6 +640,8 @@
   UniquePtr<Runtime> runtime_;
   // Owned by the runtime
   ClassLinker* class_linker_;
+  UniquePtr<VerifiedMethodsData> verified_methods_data_;
+  UniquePtr<DexFileToMethodInlinerMap> method_inliner_map_;
   UniquePtr<CompilerDriver> compiler_driver_;
 
  private: