Changeset eba615c for src/AST/Convert.cpp

Timestamp:

May 28, 2019, 4:26:07 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

157a816, c786e1d, d76c588, ebc0a85

Parents:

c519942 (diff), 0d70e0d (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

File:

• src/AST/Convert.cpp (modified) (4 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 16:59:00 2019
-// Update Count     : 6
+// Last Modified On : Tue May 28 12:00:00 2019
+// Update Count     : 7
 //
 
@@ -1341 +1341 @@
                 if ( ! old ) return nullptr;
                 old->accept(*this);
-                return strict_dynamic_cast< NewT * >( node );
+                ast::Node * ret = node;
+                node = nullptr;
+                return strict_dynamic_cast< NewT * >( ret );
         }
 
@@ -1354 +1356 @@
                         a->accept( *this );
                         ret.emplace_back( strict_dynamic_cast< NewT * >(node) );
+                        node = nullptr;
                 }
                 return ret;
@@ -1877 +1880 @@
                         GET_LABELS_V(old->labels)
                 );
+                cache.emplace( old, stmt );
+                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
                 this->node = stmt;
-                cache.emplace( old, this->node );
-                stmt->callStmt = GET_ACCEPT_1(callStmt, Stmt);
         }