commit 11d4ab2dd052b74923d4a3c6afc3ef4b15f064dc
author jeffhao <jeffhao@google.com> Mon Nov 19 15:29:34 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 19 15:29:35 2012 -0800
tree e4d5c4d8ca1bc68d1736df7ec5e87b9b5c71f712
parent 2eb840353822092d542361c8d6c4938acfddee8e
parent b5bd814f9dafe99909818fc4b2ad84639bc1601a

Merge "Fixed bug in checking wide constants causing cts failures." into dalvik-dev

src/verifier/reg_type.h

diff --git a/src/verifier/reg_type.h b/src/verifier/reg_type.h
index 5daaf60..79ff674 100644
--- a/src/verifier/reg_type.h
+++ b/src/verifier/reg_type.h
@@ -127,8 +127,8 @@
   bool CheckWidePair(const RegType& type_h) const {
     if (IsLowHalf()) {
       return (type_h.type_ == type_ + 1) ||
-          (IsPreciseConstantLo() && !type_h.IsPreciseConstantHi()) ||
-          (!IsPreciseConstantLo() && type_h.IsPreciseConstantHi());
+          (IsPreciseConstantLo() && type_h.IsImpreciseConstantHi()) ||
+          (IsImpreciseConstantLo() && type_h.IsPreciseConstantHi());
     }
     return false;
   }
@@ -141,14 +141,16 @@
     return type_ == kRegTypePreciseConst;
   }
   bool IsPreciseConstantLo() const {
-    bool result = (type_ == kRegTypePreciseConstLo);
-    DCHECK(result || (type_ == kRegTypeImpreciseConstLo));
-    return result;
+    return type_ == kRegTypePreciseConstLo;
   }
   bool IsPreciseConstantHi() const {
-    bool result = (type_ == kRegTypePreciseConstHi);
-    DCHECK(result || (type_ == kRegTypeImpreciseConstHi));
-    return result;
+    return type_ == kRegTypePreciseConstHi;
+  }
+  bool IsImpreciseConstantLo() const {
+    return type_ == kRegTypeImpreciseConstLo;
+  }
+  bool IsImpreciseConstantHi() const {
+    return type_ == kRegTypeImpreciseConstHi;
   }
   bool IsConstant() const {
     return type_ == kRegTypePreciseConst || type_ == kRegTypeImpreciseConst;