A bit further along the track of multiple threads.
This also makes valgrind happy, and tsan mostly happy. (The heap, it turns out,
doesn't have a lock yet.)
The DexVerifier changes are just to make valgrind happy, and the code a little
less unidiomatic.
Change-Id: Ic5d436b4863b9d7088eb0b8fe9d32308919899d8
diff --git a/src/object.cc b/src/object.cc
index d7b6024..7c27ec7 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -196,7 +196,7 @@
}
void Field::SetInt(Object* object, int32_t i) const {
- DCHECK(GetType()->IsPrimitiveInt());
+ DCHECK(GetType()->IsPrimitiveInt()) << PrettyField(this);
Set32(object, i);
}
@@ -273,7 +273,7 @@
}
Class* Method::GetReturnType() const {
- DCHECK(GetDeclaringClass()->IsLinked());
+ DCHECK(GetDeclaringClass()->IsResolved());
// Short-cut
Class* result = GetDexCacheResolvedTypes()->Get(GetReturnTypeIdx());
if (result == NULL) {