Changeset 4c1403c

Timestamp:

Sep 14, 2016, 1:15:24 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

50c5cf3

Parents:

76af36f

Message:

fixed small issues with gcpointers and added method to validate them

Location:

src/examples/gc_no_raii

Files:

• src/gcpointers.c (modified) (1 diff)
• src/gcpointers.h (modified) (1 diff)
• test/badlll.c (modified) (1 diff)

src/examples/gc_no_raii/src/gcpointers.c

@@ -80 +80 @@
 
 //Logical operators
-bool gcpointer_equal(gcpointer_t* this, gcpointer_t* rhs)
+bool gcpointer_equal(const gcpointer_t* this, const gcpointer_t* rhs)
 {
         return this->ptr == rhs->ptr;
 }
 
-bool gcpointer_not_equal(gcpointer_t* this, gcpointer_t* rhs)
+bool gcpointer_not_equal(const gcpointer_t* this, const gcpointer_t* rhs)
 {
         return this->ptr != rhs->ptr;
 }
 
-bool gcpointer_null(gcpointer_t* this)
+bool gcpointer_null(const gcpointer_t* this)
 {
         return this->ptr == (intptr_t)NULL;
 }
+
+#ifndef NDEBUG
+        bool is_valid(const gcpointer_t* this) {
+                if(gcpointer_null(this)) return true;
+
+                gc_object_header* obj = gc_get_object_ptr((void*)this->ptr);
+                check(obj);
+                check(is_valid(obj));
+                check(!obj->root_chain || this->ptr == obj->root_chain->ptr);
+
+                if( !gc_is_managed(this))
+                {
+                        check( !(this->next) || this->ptr == this->next->ptr );
+                }
+
+                return true;
+        }
+#endif
 
 forall(otype T) void ?{}(gcpointer(T)* this) {

src/examples/gc_no_raii/src/gcpointers.h

@@ -22 +22 @@
 bool gcpointer_equal(gcpointer_t* this, gcpointer_t* rhs);
 bool gcpointer_not_equal(gcpointer_t* this, gcpointer_t* rhs);
-bool gcpointer_null(gcpointer_t* this);
+bool gcpointer_null(const gcpointer_t* this);
+
+
+#ifndef NDEBUG
+        bool is_valid(const gcpointer_t* this);
+#endif
 
 forall(dtype T)

src/examples/gc_no_raii/test/badlll.c

@@ -35 +35 @@
         }
 
+        check(is_valid( &ll0.internal ));
+
         return ll0;
 }