Fix the weird state transitions in verification.
This probably wants to be done differently, without Compiler involving
ClassLinker, and with DexVerifier being told whether it should throw
or not. But this gets us further for now.
Test 077 still crashes, but that's now in code that's actively being
worked on, which I'll leave for now.
Change-Id: I4f265b20663837547933d0c5fa70032d22fc6c12
diff --git a/src/object.cc b/src/object.cc
index b812b90..342599e 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -795,21 +795,18 @@
}
void Class::SetStatus(Status new_status) {
- CHECK(new_status > GetStatus() || new_status == kStatusError ||
- !Runtime::Current()->IsStarted()) << PrettyClass(this);
+ CHECK(new_status > GetStatus() || new_status == kStatusError || !Runtime::Current()->IsStarted())
+ << PrettyClass(this) << " " << GetStatus() << " -> " << new_status;
CHECK(sizeof(Status) == sizeof(uint32_t)) << PrettyClass(this);
- return SetField32(OFFSET_OF_OBJECT_MEMBER(Class, status_),
- new_status, false);
+ return SetField32(OFFSET_OF_OBJECT_MEMBER(Class, status_), new_status, false);
}
DexCache* Class::GetDexCache() const {
- return GetFieldObject<DexCache*>(
- OFFSET_OF_OBJECT_MEMBER(Class, dex_cache_), false);
+ return GetFieldObject<DexCache*>(OFFSET_OF_OBJECT_MEMBER(Class, dex_cache_), false);
}
void Class::SetDexCache(DexCache* new_dex_cache) {
- SetFieldObject(OFFSET_OF_OBJECT_MEMBER(Class, dex_cache_),
- new_dex_cache, false);
+ SetFieldObject(OFFSET_OF_OBJECT_MEMBER(Class, dex_cache_), new_dex_cache, false);
}
Object* Class::AllocObject() {