commit 3747b48f7b09a9bc836397ceaacb9de0940db6fd
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 19 17:17:16 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jan 19 17:17:16 2015 +0000
tree 8d8d5a096504344ab2d336641ed272517dcbc42c
parent e210661a68e933cc6982368c24cca165eb61962f

Address review comments.

Comments were from:
https://android-review.googlesource.com/#/c/121992.

Change-Id: I8c59b30a356d606f12c50d0c8db916295a5c9e13

compiler/optimizing/code_generator_arm.cc

diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index 7ece4b2e..d40c2d1 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -785,7 +785,7 @@
         __ 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));

compiler/optimizing/ssa_liveness_analysis.h

diff --git a/compiler/optimizing/ssa_liveness_analysis.h b/compiler/optimizing/ssa_liveness_analysis.h
index b632c4d..a123313 100644
--- a/compiler/optimizing/ssa_liveness_analysis.h
+++ b/compiler/optimizing/ssa_liveness_analysis.h
@@ -530,7 +530,7 @@
   bool SameRegisterKind(Location other) const;
 
   bool HasHighInterval() const {
-    return !IsHighInterval() && (GetParent()->high_or_low_interval_ != nullptr);
+    return IsLowInterval();
   }
 
   bool HasLowInterval() const {