diff options
| author | 2015-03-11 15:02:31 +0000 | |
|---|---|---|
| committer | 2015-03-11 15:02:32 +0000 | |
| commit | 356286f989941ac495417195e4129aaceaf36a83 (patch) | |
| tree | f6b68ff38722dc91bd0de2387609ee0ce950e0ce /compiler/optimizing/optimizing_compiler.cc | |
| parent | 31df246d330c45f5691e226d176d0c59450f8435 (diff) | |
| parent | 234d69d075d1608f80adb647f7935077b62b6376 (diff) | |
Merge "Revert "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 3470595b2c..475d98ce57 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -520,7 +520,7 @@ CompiledMethod* OptimizingCompiler::Compile(const DexFile::CodeItem* code_item, dex_file, dex_compilation_unit, &pass_info_printer); - } else if (shouldOptimize && RegisterAllocator::Supports(instruction_set)) { + } else if (shouldOptimize && can_allocate_registers) { LOG(FATAL) << "Could not allocate registers in optimizing compiler"; UNREACHABLE(); } else { |