Add a class flag CLASS_ISCLASS.

This flag is only turned on for the unique class Class, and it is
meant to make it possible to quickly test objects for "classiness" as
well as trivially figure out if one is looking at the class Class
itself.

Bonus: Made a few places that directly set class->accessFlags use
the prescribed macro for doing same.

Change-Id: I89fce708c407b597f28ce610b778123f5dcaecf6

1 files changed, 2 insertions, 2 deletions

diff --git a/vm/alloc/MarkSweep.cpp b/vm/alloc/MarkSweep.cpp
index e75130cbf..0bb5f02d6 100644
--- a/vm/alloc/MarkSweep.cpp
+++ b/vm/alloc/MarkSweep.cpp
@@ -445,7 +445,7 @@ static void scanInterfaces(const ClassObject *clazz, GcMarkContext *ctx)
 static void scanClassObject(const Object *obj, GcMarkContext *ctx)
 {
     assert(obj != NULL);
-    assert(obj->clazz == gDvm.classJavaLangClass);
+    assert(dvmIsClassObject(obj));
     assert(ctx != NULL);
     markObject((const Object *)obj->clazz, ctx);
     const ClassObject *asClass = (const ClassObject *)obj;
@@ -625,7 +625,7 @@ static void scanObject(const Object *obj, GcMarkContext *ctx)
     assert(obj->clazz != NULL);
     assert(ctx != NULL);
     assert(isMarked(obj, ctx));
-    if (obj->clazz == gDvm.classJavaLangClass) {
+    if (dvmIsClassObject(obj)) {
         scanClassObject(obj, ctx);
     } else if (IS_CLASS_FLAG_SET(obj->clazz, CLASS_ISARRAY)) {
         scanArrayObject(obj, ctx);