Changeset 54dd994 for src/InitTweak/GenInit.cc

Timestamp:

Jun 24, 2019, 10:30:47 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (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/InitTweak/GenInit.cc (modified) (4 diffs)

src/InitTweak/GenInit.cc

@@ -18 +18 @@
 #include <algorithm>                   // for any_of
 #include <cassert>                     // for assert, strict_dynamic_cast, assertf
+#include <deque>
 #include <iterator>                    // for back_inserter, inserter, back_inse...
 #include <list>                        // for _List_iterator, list
 
+#include "AST/Decl.hpp"
+#include "AST/Init.hpp"
+#include "AST/Node.hpp"
+#include "AST/Stmt.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"        // for PassVisitor, WithGuards, WithShort...
@@ -274 +279 @@
                 assertf( objDecl, "genCtorDtor passed null objDecl" );
                 std::list< Statement * > stmts;
-                InitExpander srcParam( maybeClone( arg ) );
+                InitExpander_old srcParam( maybeClone( arg ) );
                 SymTab::genImplicitCall( srcParam, new VariableExpr( objDecl ), fname, back_inserter( stmts ), objDecl );
                 assert( stmts.size() <= 1 );
@@ -286 +291 @@
                 std::list< Statement * > dtor;
 
-                InitExpander srcParam( objDecl->get_init() );
-                InitExpander nullParam( (Initializer *)NULL );
+                InitExpander_old srcParam( objDecl->get_init() );
+                InitExpander_old nullParam( (Initializer *)NULL );
                 SymTab::genImplicitCall( srcParam, new VariableExpr( objDecl ), "?{}", back_inserter( ctor ), objDecl );
                 SymTab::genImplicitCall( nullParam, new VariableExpr( objDecl ), "^?{}", front_inserter( dtor ), objDecl, false );
@@ -353 +358 @@
                 GuardScope( managedTypes );
         }
+
+ast::ConstructorInit * genCtorInit( const CodeLocation & loc, const ast::ObjectDecl * objDecl ) {
+        // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor for each 
+        // constructable object
+        InitExpander_new srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
+        
+        ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall( 
+                srcParam, new ast::VariableExpr{ loc, objDecl }, loc, "?{}", objDecl );
+        ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall( 
+                nullParam, new ast::VariableExpr{ loc, objDecl }, loc, "^?{}", objDecl, 
+                SymTab::LoopBackward );
+        
+        // check that either both ctor and dtor are present, or neither
+        assert( (bool)ctor == (bool)dtor );
+
+        if ( ctor ) {
+                // need to remember init expression, in case no ctors exist. If ctor does exist, want to 
+                // use ctor expression instead of init.
+                ctor.strict_as< ast::ImplicitCtorDtorStmt >(); 
+                dtor.strict_as< ast::ImplicitCtorDtorStmt >();
+
+                return new ast::ConstructorInit{ loc, ctor, dtor, objDecl->init };
+        }
+
+        return nullptr;
+}
+
 } // namespace InitTweak