diff options
| author | 2015-01-26 23:46:42 +0000 | |
|---|---|---|
| committer | 2015-01-26 23:46:42 +0000 | |
| commit | 8c1a3a22542bbe6f42649f1af7c579ddbb8134b2 (patch) | |
| tree | 35644b91bd58aabc092976d18903d25a812e07eb /compiler/dex/compiler_ir.cc | |
| parent | ad3c05971fc4603d9151cc61d2c8289a3e3e4ae0 (diff) | |
| parent | 0b9203e7996ee1856f620f95d95d8a273c43a3df (diff) | |
Merge "ART: Some Quick cleanup"
Diffstat (limited to 'compiler/dex/compiler_ir.cc')
| -rw-r--r-- | compiler/dex/compiler_ir.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/compiler/dex/compiler_ir.cc b/compiler/dex/compiler_ir.cc index a2b3fe432f..0cfa966e25 100644 --- a/compiler/dex/compiler_ir.cc +++ b/compiler/dex/compiler_ir.cc @@ -16,16 +16,19 @@ #include "compiler_ir.h" +#include "arch/instruction_set_features.h" #include "base/dumpable.h" #include "backend.h" -#include "frontend.h" +#include "dex_flags.h" +#include "driver/compiler_driver.h" #include "mir_graph.h" namespace art { -CompilationUnit::CompilationUnit(ArenaPool* pool) - : compiler_driver(nullptr), - class_linker(nullptr), +CompilationUnit::CompilationUnit(ArenaPool* pool, InstructionSet isa, CompilerDriver* driver, + ClassLinker* linker) + : compiler_driver(driver), + class_linker(linker), dex_file(nullptr), class_loader(nullptr), class_def_idx(0), @@ -36,10 +39,8 @@ CompilationUnit::CompilationUnit(ArenaPool* pool) disable_opt(0), enable_debug(0), verbose(false), - compiler(nullptr), - instruction_set(kNone), - target64(false), - compiler_flip_match(false), + instruction_set(isa), + target64(Is64BitInstructionSet(isa)), arena(pool), arena_stack(pool), mir_graph(nullptr), |