diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-25 14:15:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-24 06:22:45 +0000 |
| commit | fe6bfba3153ab55dab3ec0d644d628136e5ff0a4 (patch) | |
| tree | 984d0609bf71e7705117e19eb836ddf203be6d01 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 84691ba238225dd77c7b498a153db4dd306e9712 (diff) | |
| parent | e61fd353c06f51f1b8ca5af69997d0185b7659b2 (diff) | |
| download | art-fe6bfba3153ab55dab3ec0d644d628136e5ff0a4.tar.gz art-fe6bfba3153ab55dab3ec0d644d628136e5ff0a4.tar.bz2 art-fe6bfba3153ab55dab3ec0d644d628136e5ff0a4.zip | |
Merge "Revert "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, 0 insertions, 4 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index ccacbef401..56029aa30b 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -101,10 +101,6 @@ 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) { |