Changeset 24de7b1 for src/Common/GC.h

Timestamp:

Apr 16, 2018, 3:21:17 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

fb97252f

Parents:

6f81db3

Message:

Fix more missing visits in GcTracer?, add cycle detection back in, ensure mark isn't broken by defaulted GC_Object copy and assign

File:

• src/Common/GC.h (modified) (3 diffs)

src/Common/GC.h

@@ -18 +18 @@
 #include <vector>
 
-class GC_Traceable;
 class GC_Object;
 class BaseSyntaxNode;
@@ -30 +29 @@
 
         /// Traces a traceable object
-        const GC& operator<< (const GC_Traceable*) const;
+        const GC& operator<< (const GC_Object*) const;
 
         /// Adds a new object to garbage collection
@@ -111 +110 @@
 }
 
-/// Class that is traced by the GC, but not managed by it
-class GC_Traceable {
+/// Class that is managed by the GC
+class GC_Object {
         friend class GC;
 protected:
         mutable bool mark;
 
+        // Override default constructors to ensure clones are registered and properly marked
+        GC_Object();
+
+        GC_Object(const GC_Object&);
+
+        GC_Object(GC_Object&&);
+
+        GC_Object& operator= (const GC_Object&) { /* do not assign mark */ return *this; }
+
+        GC_Object& operator= (GC_Object&&) { /* do not assign mark */ return *this; }
+
+        // Ensure subclasses can be deleted by garbage collector
+        virtual ~GC_Object() {}
+
         /// override to trace any child objects
         virtual void trace(const GC&) const {}
-};
-
-/// Class that is managed by the GC
-class GC_Object : public GC_Traceable {
-        friend class GC;
-protected:
-        virtual ~GC_Object() {}
-public:
-        GC_Object();
 };