diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-25 13:38:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-24 06:28:56 +0000 |
| commit | 84691ba238225dd77c7b498a153db4dd306e9712 (patch) | |
| tree | 685b5ede42c3583c0152f784567026b1afc8e55d /compiler/optimizing/optimizing_compiler.cc | |
| parent | ae43e2b11cc5af5b632700a9e4e4d9ed436b24dc (diff) | |
| parent | 20550910e608ed7d86db97927d2ce9d2191061a4 (diff) | |
| download | art-84691ba238225dd77c7b498a153db4dd306e9712.tar.gz art-84691ba238225dd77c7b498a153db4dd306e9712.tar.bz2 art-84691ba238225dd77c7b498a153db4dd306e9712.zip | |
Merge "Re-enable tests with the optimizing compiler."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 56029aa30b..ccacbef401 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -101,6 +101,10 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite } InstructionSet instruction_set = GetCompilerDriver()->GetInstructionSet(); + // The optimizing compiler currently does not have a Thumb2 assembler. + if (instruction_set == kThumb2) { + instruction_set = kArm; + } CodeGenerator* codegen = CodeGenerator::Create(&arena, graph, instruction_set); if (codegen == nullptr) { if (shouldCompile) { |