diff options
| author | buzbee <buzbee@google.com> | 2014-08-28 21:11:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-28 21:11:06 +0000 |
| commit | 79e909bc9d95c3952be85af846ba8bda344531f5 (patch) | |
| tree | 7ebdb94279831d956506acfb0f3823c8d3c6e478 | |
| parent | 6950ae42dc0f64c825bf61cb13c0bfb254ad97bd (diff) | |
| parent | 3a658077af2a931e5d7f6cd22b777c57112c19df (diff) | |
| download | art-79e909bc9d95c3952be85af846ba8bda344531f5.tar.gz art-79e909bc9d95c3952be85af846ba8bda344531f5.tar.bz2 art-79e909bc9d95c3952be85af846ba8bda344531f5.zip | |
Merge "Quick compiler: Fix MIPS build"
| -rw-r--r-- | compiler/dex/quick/ralloc_util.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc index 0a737a9315..195da0dad2 100644 --- a/compiler/dex/quick/ralloc_util.cc +++ b/compiler/dex/quick/ralloc_util.cc @@ -934,9 +934,9 @@ void Mir2Lir::MarkInUse(RegStorage reg) { bool Mir2Lir::CheckCorePoolSanity() { GrowableArray<RegisterInfo*>::Iterator it(&tempreg_info_); for (RegisterInfo* info = it.Next(); info != nullptr; info = it.Next()) { - if (info->IsTemp() && info->IsLive() && info->IsWide()) { + int my_sreg = info->SReg(); + if (info->IsTemp() && info->IsLive() && info->IsWide() && my_sreg != INVALID_SREG) { RegStorage my_reg = info->GetReg(); - int my_sreg = info->SReg(); RegStorage partner_reg = info->Partner(); RegisterInfo* partner = GetRegInfo(partner_reg); DCHECK(partner != NULL); @@ -944,12 +944,8 @@ bool Mir2Lir::CheckCorePoolSanity() { DCHECK_EQ(my_reg.GetReg(), partner->Partner().GetReg()); DCHECK(partner->IsLive()); int partner_sreg = partner->SReg(); - if (my_sreg == INVALID_SREG) { - DCHECK_EQ(partner_sreg, INVALID_SREG); - } else { - int diff = my_sreg - partner_sreg; - DCHECK((diff == 0) || (diff == -1) || (diff == 1)); - } + int diff = my_sreg - partner_sreg; + DCHECK((diff == 0) || (diff == -1) || (diff == 1)); } if (info->Master() != info) { // Aliased. |