Changeset 92a6e02

Timestamp:

Aug 15, 2019, 1:32:35 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a6f26ca

Parents:

ba417e2 (diff), c570806 (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 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

Location:

src

Files:

• AST/Pass.impl.hpp (modified) (1 diff)
• AST/Stmt.hpp (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)

src/AST/Pass.impl.hpp

@@ -953 +953 @@
         // For now this isn't visited, it is unclear if this causes problem
         // if all tests are known to pass, remove this code
-        // VISIT(
-        //      maybe_accept( node, &ImplicitCtorDtorStmt::callStmt );
-        // )
+        VISIT(
+                maybe_accept( node, &ImplicitCtorDtorStmt::callStmt );
+        )
 
         VISIT_END( Stmt, node );

src/AST/Stmt.hpp

@@ -399 +399 @@
 class ImplicitCtorDtorStmt final : public Stmt {
 public:
-        readonly<Stmt> callStmt;
+        ptr<Stmt> callStmt;
 
         ImplicitCtorDtorStmt( const CodeLocation & loc, const Stmt * callStmt,

src/SynTree/Statement.h

@@ -502 +502 @@
 class ImplicitCtorDtorStmt : public Statement {
   public:
-        // Non-owned pointer to the constructor/destructor statement
+        // the constructor/destructor call statement; owned here for a while, eventually transferred elsewhere
         Statement * callStmt;