Changeset ef5ef56

Timestamp:

May 22, 2019, 5:21:44 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5902625, 893e106

Parents:

dff6452 (diff), 8abee136 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• AST/Convert.cpp (modified) (16 diffs)
• AST/Expr.cpp (modified) (1 diff)
• AST/Node.hpp (modified) (1 diff)
• Common/utility.h (modified) (1 diff)
• include/cassert (modified) (1 diff)

src/AST/Convert.cpp

@@ -1342 +1342 @@
 };
 
-std::list< Declaration * > convert( std::list< ast::ptr< ast::Decl > > && translationUnit ) {
+std::list< Declaration * > convert( const std::list< ast::ptr< ast::Decl > > && translationUnit ) {
         ConverterNewToOld c;
         std::list< Declaration * > decls;
         for(auto d : translationUnit) {
                 decls.emplace_back( c.decl( d ) );
-                delete d;
         }
         return decls;
@@ -1436 +1435 @@
                         { old->get_funcSpec().val }
                 );
+                cache.emplace( old, decl );
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1441 +1441 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->extension  = old->extension;
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1458 +1457 @@
                         { old->get_funcSpec().val }
                 };
+                cache.emplace( old, decl );
                 decl->scopeLevel = old->scopeLevel;
                 decl->mangleName = old->mangleName;
@@ -1463 +1463 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->extension  = old->extension;
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1477 +1476 @@
                         { old->linkage.val }
                 );
+                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1484 +1484 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1497 +1496 @@
                         { old->linkage.val }
                 );
+                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1504 +1504 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1517 +1516 @@
                         { old->linkage.val }
                 );
+                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1524 +1524 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1537 +1536 @@
                         { old->linkage.val }
                 );
+                cache.emplace( old, decl );
                 decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
                 decl->body   = old->body;
@@ -1544 +1544 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1560 +1559 @@
                         GET_ACCEPT_1(init, Type)
                 };
+                cache.emplace( old, decl );
                 decl->assertions = GET_ACCEPT_V(assertions, DeclWithType);
                 decl->params     = GET_ACCEPT_V(parameters, TypeDecl);
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
-                cache.emplace( old, decl );
 
                 this->node = decl;
@@ -1912 +1911 @@
         ast::TypeSubstitution * convertTypeSubstitution(const TypeSubstitution * old) {
 
+                if (!old) return nullptr;
+
                 ast::TypeSubstitution *rslt = new ast::TypeSubstitution();
 
@@ -2703 +2704 @@
                 d->accept( c );
                 decls.emplace_back( c.decl() );
-                delete d;
-        }
+        }
+        deleteAll(translationUnit);
         return decls;
 }

src/AST/Expr.cpp

@@ -157 +157 @@
         assert( aggregate->result );
 
-        assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
+//      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
 }
 

src/AST/Node.hpp

@@ -115 +115 @@
         template<typename o_node_t>
         ptr_base & operator=( const o_node_t * node ) {
-                assign(strict_dynamic_cast<const node_t *>(node));
+                assign( node ? strict_dynamic_cast<const node_t *>(node) : nullptr );
                 return *this;
         }

src/Common/utility.h

@@ -74 +74 @@
 
 template< typename Container >
-void deleteAll( Container &container ) {
-        for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
-                delete *i;
+void deleteAll( const Container &container ) {
+        for ( const auto &i : container ) {
+                delete i;
         } // for
 }

src/include/cassert

@@ -44 +44 @@
 
 template<typename T, typename U>
-static inline T strict_dynamic_cast( const U & src ) {
+static inline __attribute__((nonnull)) T strict_dynamic_cast( const U & src ) {
+        assert(src);
         T ret = dynamic_cast<T>(src);
         assertf(ret, "%s", toString(src).c_str());