diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-25 14:35:34 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-06-26 09:27:37 +0100 |
| commit | f61b5377068f22c0be7b2f6e62961e620408beb2 (patch) | |
| tree | 15971fe1cf0797fa0b8ac0507b1a88c206f6c22e /compiler/optimizing/optimizing_compiler.cc | |
| parent | fe6bfba3153ab55dab3ec0d644d628136e5ff0a4 (diff) | |
| download | art-f61b5377068f22c0be7b2f6e62961e620408beb2.tar.gz art-f61b5377068f22c0be7b2f6e62961e620408beb2.tar.bz2 art-f61b5377068f22c0be7b2f6e62961e620408beb2.zip | |
Re-enable tests with the optimizing compiler.
Tests run ok on my host/target. I reverted the move to
using thumb2, because tests were crashing. But I could not
reproduce file limits issues.
Make SignalTest as crashing for optimizing. We need to implement
stack overflow checks.
Change-Id: Ieda575501eaf30af7aaa2c44e71544c9c467c24f
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) { |