commit 95a4de734c2d90481af9938e0759717895fdcc59
author Vladimir Marko <vmarko@google.com> Wed Dec 18 10:29:11 2013 +0000
committer Vladimir Marko <vmarko@google.com> Wed Dec 18 14:10:58 2013 +0000
tree 984a891b9ea93a2afc6a4bb079b32cb5d352c2db
parent ba45dcf4272cc52781a18ec99b925fcc2222dc8c

Fix test-art setup.

Change-Id: I5762bd10d0bb8346541346b3d5711200a0208c4f

compiler/oat_test.cc

diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc
index 94bc30d..2434262 100644
--- a/compiler/oat_test.cc
+++ b/compiler/oat_test.cc
@@ -80,7 +80,8 @@
 
   InstructionSetFeatures insn_features;
   verified_methods_data_.reset(new VerifiedMethodsData);
-  method_inliner_map_.reset(new DexFileToMethodInlinerMap);
+  method_inliner_map_.reset(compiler_backend == kQuick ? new DexFileToMethodInlinerMap : nullptr);
+  callbacks_.Reset(verified_methods_data_.get(), method_inliner_map_.get());
   compiler_driver_.reset(new CompilerDriver(verified_methods_data_.get(),
                                             method_inliner_map_.get(),
                                             compiler_backend, insn_set,