diff options
| author | 2015-03-06 16:10:31 +0000 | |
|---|---|---|
| committer | 2015-03-06 16:10:32 +0000 | |
| commit | 0e242b5cad3c0b68b72f28c1e5fd3fdd4c05bfd8 (patch) | |
| tree | 1446f5a1ec95cf1c641228fd7dc2fecb67962723 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 7e5b740cc387645c6b2e0dc8604b1e074c398b4d (diff) | |
| parent | 154552e666347d41d95d7619c6ee56249ff4feca (diff) | |
Merge "Revert "[optimizing] Enable x86 long support.""
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 9971daf371..eb984248a9 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -523,7 +523,7 @@ CompiledMethod* OptimizingCompiler::Compile(const DexFile::CodeItem* code_item, dex_file, dex_compilation_unit, &pass_info_printer); - } else if (shouldOptimize && can_allocate_registers) { + } else if (shouldOptimize && RegisterAllocator::Supports(instruction_set)) { LOG(FATAL) << "Could not allocate registers in optimizing compiler"; UNREACHABLE(); } else { |