objc4-818.2.tar.gz

[apple/objc4.git] / runtime / objc-runtime-old.h

diff --git a/runtime/objc-runtime-old.h b/runtime/objc-runtime-old.h
index 5f0ff029202e433cd78f9dafd449b1416de52ca9..14672106da8ca9ef8ba8c9b76689c0bcfa1d571f 100644 (file)
--- a/runtime/objc-runtime-old.h
+++ b/runtime/objc-runtime-old.h
@@ -65,8 +65,8 @@
 #define CLS_LEAF                0x800000
 // class instances may have associative references
 #define CLS_INSTANCES_HAVE_ASSOCIATED_OBJECTS 0x1000000
 #define CLS_LEAF                0x800000
 // class instances may have associative references
 #define CLS_INSTANCES_HAVE_ASSOCIATED_OBJECTS 0x1000000

-// class has instance-specific GC layout
-#define CLS_HAS_INSTANCE_SPECIFIC_LAYOUT 0x2000000
+// available for use; was CLS_HAS_INSTANCE_SPECIFIC_LAYOUT
+#define CLS_2000000 0x2000000

 // class compiled with ARC
 #define CLS_IS_ARC              0x4000000
 // class is not ARC but has ARC-style weak ivar layout
 // class compiled with ARC
 #define CLS_IS_ARC              0x4000000
 // class is not ARC but has ARC-style weak ivar layout


@@ -205,7 +205,7 @@ struct objc_class : objc_object {
 
     // set and clear must not overlap
     void changeInfo(uint32_t set, uint32_t clear) {
 
     // set and clear must not overlap
     void changeInfo(uint32_t set, uint32_t clear) {

-        assert((set & clear) == 0);
+        ASSERT((set & clear) == 0);

 
         uint32_t oldf, newf;
         do {
 
         uint32_t oldf, newf;
         do {


@@ -234,20 +234,19 @@ struct objc_class : objc_object {
         return info & CLS_IS_ARC;
     }
 
         return info & CLS_IS_ARC;
     }
 

-    bool hasCustomRR() { 
+    bool hasCustomRR() {

         return true;
     }
         return true;
     }

-    void setHasCustomRR(bool = false) { }
-    void setHasDefaultRR() { }
-    void printCustomRR(bool) { }

 
 

-    bool hasCustomAWZ() { 
+    bool hasCustomAWZ() {

         return true;
     }
         return true;
     }

-    void setHasCustomAWZ(bool = false) { }
-    void setHasDefaultAWZ() { }
-    void printCustomAWZ(bool) { }

 
 

+    bool forbidsAssociatedObjects() {
+        // Old runtime doesn't support forbidding associated objects.
+        return false;
+    }
+    

     bool instancesHaveAssociatedObjects() {
         return info & CLS_INSTANCES_HAVE_ASSOCIATED_OBJECTS;
     }
     bool instancesHaveAssociatedObjects() {
         return info & CLS_INSTANCES_HAVE_ASSOCIATED_OBJECTS;
     }


@@ -300,6 +299,14 @@ struct objc_class : objc_object {
     const char *mangledName() { return name; }
     const char *demangledName() { return name; }
     const char *nameForLogging() { return name; }
     const char *mangledName() { return name; }
     const char *demangledName() { return name; }
     const char *nameForLogging() { return name; }

+    
+    bool isRootClass() {
+        return superclass == nil;
+    }
+
+    bool isRootMetaclass() {
+        return ISA() == (Class)this;
+    }

 
     bool isMetaClass() {
         return info & CLS_META;
 
     bool isMetaClass() {
         return info & CLS_META;