commit ae826983f7903bc0a6bbbe8426bf393fb2f6d747
author Brian Carlstrom <bdc@google.com> Wed Nov 09 01:33:42 2011 -0800
committer Brian Carlstrom <bdc@google.com> Tue Nov 29 13:46:50 2011 -0800
tree 6fb83f2b19a1a50ade3c93cbf10485cd8fbc793f
parent 8aa6fc39f5cc0279d4ba2ee064de9758560dfedd

Add --image-classes to dex2oat

Change-Id: Ia88f9d302e0f9cd72be2199ee46d212d99864c67

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index 8cf79c2..abf8310 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -209,100 +209,100 @@
 }
 
 bool Field::GetBoolean(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimBoolean) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimBoolean) << PrettyField(this);
   return Get32(object);
 }
 
 void Field::SetBoolean(Object* object, bool z) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimBoolean) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimBoolean) << PrettyField(this);
   Set32(object, z);
 }
 
 int8_t Field::GetByte(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimByte) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimByte) << PrettyField(this);
   return Get32(object);
 }
 
 void Field::SetByte(Object* object, int8_t b) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimByte) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimByte) << PrettyField(this);
   Set32(object, b);
 }
 
 uint16_t Field::GetChar(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimChar) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimChar) << PrettyField(this);
   return Get32(object);
 }
 
 void Field::SetChar(Object* object, uint16_t c) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimChar) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimChar) << PrettyField(this);
   Set32(object, c);
 }
 
 int16_t Field::GetShort(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimShort) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimShort) << PrettyField(this);
   return Get32(object);
 }
 
 void Field::SetShort(Object* object, int16_t s) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimShort) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimShort) << PrettyField(this);
   Set32(object, s);
 }
 
 int32_t Field::GetInt(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimInt) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimInt) << PrettyField(this);
   return Get32(object);
 }
 
 void Field::SetInt(Object* object, int32_t i) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimInt) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimInt) << PrettyField(this);
   Set32(object, i);
 }
 
 int64_t Field::GetLong(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimLong) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimLong) << PrettyField(this);
   return Get64(object);
 }
 
 void Field::SetLong(Object* object, int64_t j) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimLong) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimLong) << PrettyField(this);
   Set64(object, j);
 }
 
 float Field::GetFloat(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimFloat) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimFloat) << PrettyField(this);
   JValue float_bits;
   float_bits.i = Get32(object);
   return float_bits.f;
 }
 
 void Field::SetFloat(Object* object, float f) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimFloat) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimFloat) << PrettyField(this);
   JValue float_bits;
   float_bits.f = f;
   Set32(object, float_bits.i);
 }
 
 double Field::GetDouble(const Object* object) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimDouble) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimDouble) << PrettyField(this);
   JValue double_bits;
   double_bits.j = Get64(object);
   return double_bits.d;
 }
 
 void Field::SetDouble(Object* object, double d) const {
-  DCHECK(GetPrimitiveType() == Primitive::kPrimDouble) << PrettyField(this);
+  DCHECK_EQ(GetPrimitiveType(), Primitive::kPrimDouble) << PrettyField(this);
   JValue double_bits;
   double_bits.d = d;
   Set64(object, double_bits.j);
 }
 
 Object* Field::GetObject(const Object* object) const {
-  CHECK(GetPrimitiveType() == Primitive::kPrimNot) << PrettyField(this);
+  CHECK_EQ(GetPrimitiveType(), Primitive::kPrimNot) << PrettyField(this);
   return GetObj(object);
 }
 
 void Field::SetObject(Object* object, const Object* l) const {
-  CHECK(GetPrimitiveType() == Primitive::kPrimNot) << PrettyField(this);
+  CHECK_EQ(GetPrimitiveType(), Primitive::kPrimNot) << PrettyField(this);
   SetObj(object, l);
 }