Changeset bcb311b for src/AST

Timestamp:

Jun 25, 2019, 2:49:56 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

92f5279

Parents:

9ea38de

Message:

Move trap to ref count updates from create/destroy

Location:

src/AST

Files:

• Node.cpp (modified) (2 diffs)
• Node.hpp (modified) (1 diff)

src/AST/Node.cpp

@@ -30 +30 @@
 #include "Print.hpp"
 
-/// MEMORY DEBUG -- allows breaking on construction/destruction of dynamically chosen object.
+/// MEMORY DEBUG -- allows breaking on ref-count changes of dynamically chosen object.
 /// Process to use in GDB:
 ///   break ast::Node::_trap()
@@ -39 +39 @@
 void * MEM_TRAP_OBJ = nullptr;
 
-void ast::Node::_trap() {
-        if ( this == MEM_TRAP_OBJ ) std::raise(SIGTRAP);
-}
-
-template< typename node_t, enum ast::Node::ref_type ref_t >
-void ast::ptr_base<node_t, ref_t>::_inc( const node_t * node ) { node->increment(ref_t); }
-
-template< typename node_t, enum ast::Node::ref_type ref_t >
-void ast::ptr_base<node_t, ref_t>::_dec( const node_t * node ) { node->decrement(ref_t); }
+void _trap( const void * node ) {
+        if ( node == MEM_TRAP_OBJ ) std::raise(SIGTRAP);
+}
+
+template< typename node_t, enum ast::Node::ref_type ref_t >
+void ast::ptr_base<node_t, ref_t>::_inc( const node_t * node ) {
+        node->increment(ref_t);
+        _trap( node );
+}
+
+template< typename node_t, enum ast::Node::ref_type ref_t >
+void ast::ptr_base<node_t, ref_t>::_dec( const node_t * node ) {
+        _trap( node );
+        node->decrement(ref_t);
+}
 
 template< typename node_t, enum ast::Node::ref_type ref_t >

src/AST/Node.hpp

@@ -30 +30 @@
 /// Keeps both strong and weak reference counts.
 class Node {
-        /// call to debug on node creation/deletion
-        void _trap();
 public:
         // override defaults to ensure assignment doesn't
         // change/share reference counts
-        Node() { _trap(); }
-        Node(const Node&) : strong_count(0), weak_count(0) { _trap(); }
-        Node(Node&&) : strong_count(0), weak_count(0) { _trap(); }
+        Node() = default;
+        Node(const Node&) : strong_count(0), weak_count(0) {}
+        Node(Node&&) : strong_count(0), weak_count(0) {}
         Node& operator= (const Node&) = delete;
         Node& operator= (Node&&) = delete;
-        virtual ~Node() { _trap(); }
+        virtual ~Node() {}
 
         virtual const Node * accept( Visitor & v ) const = 0;