Various bits of cleanup.
Most notable: PrettyField now includes the type (but, like PrettyMethod,
lets you turn this off), and there's a new PrettyClass, and PrettyType
has been renamed to PrettyTypeOf.
I've also moved the dalvik "sync" stuff into files named "monitor", and
made some of the implementation details private.
Change-Id: I39ea79b45e173f9ebbf9878bcead207766a5653f
diff --git a/src/object.cc b/src/object.cc
index 1e0d5c6..c54364f 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -10,14 +10,14 @@
#include "class_linker.h"
#include "class_loader.h"
+#include "dex_cache.h"
+#include "dex_file.h"
#include "globals.h"
#include "heap.h"
#include "intern_table.h"
#include "logging.h"
-#include "dex_cache.h"
-#include "dex_file.h"
+#include "monitor.h"
#include "runtime.h"
-#include "sync.h"
namespace art {
@@ -766,8 +766,8 @@
void Class::CanPutArrayElementFromCode(const Class* object_class, const Class* array_class) {
if (!CanPutArrayElement(object_class, array_class)) {
- LOG(ERROR) << "Can't put a " << PrettyDescriptor(object_class->GetDescriptor())
- << " into a " << PrettyDescriptor(array_class->GetDescriptor());
+ LOG(ERROR) << "Can't put a " << PrettyClass(object_class)
+ << " into a " << PrettyClass(array_class);
UNIMPLEMENTED(FATAL) << "need to throw ArrayStoreException and unwind stack";
}
}