diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-10 10:36:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-10 10:37:00 +0000 |
| commit | 9806199033fc2fb61bfd2260f0156d1b38d56beb (patch) | |
| tree | 14a5cd067fb01ace19fb5e0f7d494bd9e8744845 /compiler/optimizing/code_generator.cc | |
| parent | 255507d9c695aa9c774b882308faa8278382006b (diff) | |
| parent | 52839d17c06175e19ca4a093fb878450d1c4310d (diff) | |
| download | android_art-9806199033fc2fb61bfd2260f0156d1b38d56beb.tar.gz android_art-9806199033fc2fb61bfd2260f0156d1b38d56beb.tar.bz2 android_art-9806199033fc2fb61bfd2260f0156d1b38d56beb.zip | |
Merge "Support invoke-interface in optimizing."
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 0dfbad25f5..9d172638e1 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -216,10 +216,14 @@ void CodeGenerator::AllocateRegistersLocally(HInstruction* instruction) const { for (size_t i = 0, e = locations->GetTempCount(); i < e; ++i) { Location loc = locations->GetTemp(i); + // The DCHECKS below check that a register is not specified twice in + // the summary. if (loc.IsRegister()) { - // Check that a register is not specified twice in the summary. DCHECK(!blocked_core_registers_[loc.reg()]); blocked_core_registers_[loc.reg()] = true; + } else if (loc.IsFpuRegister()) { + DCHECK(!blocked_fpu_registers_[loc.reg()]); + blocked_fpu_registers_[loc.reg()] = true; } else { DCHECK_EQ(loc.GetPolicy(), Location::kRequiresRegister); } |