diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-01-19 17:36:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-19 17:36:23 +0000 |
| commit | 452773fec59e033da4bb258a64bd65bd2ae658e8 (patch) | |
| tree | 8d8d5a096504344ab2d336641ed272517dcbc42c /compiler | |
| parent | e210661a68e933cc6982368c24cca165eb61962f (diff) | |
| parent | 3747b48f7b09a9bc836397ceaacb9de0940db6fd (diff) | |
| download | art-452773fec59e033da4bb258a64bd65bd2ae658e8.tar.gz art-452773fec59e033da4bb258a64bd65bd2ae658e8.tar.bz2 art-452773fec59e033da4bb258a64bd65bd2ae658e8.zip | |
Merge "Address review comments."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/ssa_liveness_analysis.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 7ece4b2e9..d40c2d170 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -785,7 +785,7 @@ void CodeGeneratorARM::Move(HInstruction* instruction, Location location, HInstr __ StoreToOffset(kStoreWord, IP, SP, location.GetStackIndex()); } } else { - DCHECK(const_to_move->IsLongConstant()) << const_to_move; + DCHECK(const_to_move->IsLongConstant()) << const_to_move->DebugName(); int64_t value = const_to_move->AsLongConstant()->GetValue(); if (location.IsRegisterPair()) { __ LoadImmediate(location.AsRegisterPairLow<Register>(), Low32Bits(value)); diff --git a/compiler/optimizing/ssa_liveness_analysis.h b/compiler/optimizing/ssa_liveness_analysis.h index b632c4d05..a12331342 100644 --- a/compiler/optimizing/ssa_liveness_analysis.h +++ b/compiler/optimizing/ssa_liveness_analysis.h @@ -530,7 +530,7 @@ class LiveInterval : public ArenaObject<kArenaAllocMisc> { bool SameRegisterKind(Location other) const; bool HasHighInterval() const { - return !IsHighInterval() && (GetParent()->high_or_low_interval_ != nullptr); + return IsLowInterval(); } bool HasLowInterval() const { |