diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-02-14 18:37:08 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-02-18 10:03:48 +0000 |
| commit | f5df8974173124faddb8e2b6a331959afdb94fdf (patch) | |
| tree | 26114bf466b445c60176b06a2f8a01f1e14e9358 /compiler/oat_test.cc | |
| parent | 32a6c7f3bd76bbe574675d44b7d8076995690a5b (diff) | |
| download | art-f5df8974173124faddb8e2b6a331959afdb94fdf.zip art-f5df8974173124faddb8e2b6a331959afdb94fdf.tar.gz art-f5df8974173124faddb8e2b6a331959afdb94fdf.tar.bz2 | |
Rewrite the compiler interface for CompilerDriver.
Change-Id: I15fa9afe7ffb7283ebda8d788a1e02793e3f75a6
Diffstat (limited to 'compiler/oat_test.cc')
| -rw-r--r-- | compiler/oat_test.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index f6b511c..10d2c5c 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -15,6 +15,7 @@ */ #include "compiler/oat_writer.h" +#include "compiler/compiler_backend.h" #include "mirror/art_method-inl.h" #include "mirror/class-inl.h" #include "mirror/object_array-inl.h" @@ -84,12 +85,14 @@ TEST_F(OatTest, WriteRead) { ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); // TODO: make selectable. - CompilerBackend compiler_backend = kUsePortableCompiler ? kPortable : kQuick; + CompilerBackend::Kind compiler_backend = kUsePortableCompiler + ? CompilerBackend::kPortable + : CompilerBackend::kQuick; InstructionSet insn_set = kIsTargetBuild ? kThumb2 : kX86; InstructionSetFeatures insn_features; verification_results_.reset(new VerificationResults); - method_inliner_map_.reset(compiler_backend == kQuick ? new DexFileToMethodInlinerMap : nullptr); + method_inliner_map_.reset(new DexFileToMethodInlinerMap); callbacks_.Reset(verification_results_.get(), method_inliner_map_.get()); timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(verification_results_.get(), |