Changeset 620cb95 for src/InitTweak

Timestamp:

Mar 3, 2016, 4:50:48 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

972e6f7

Parents:

071a31a

Message:

separate Autogen from Validate, call default ctor/dtors on array elements

File:

• src/InitTweak/RemoveInit.cc (modified) (4 diffs)

src/InitTweak/RemoveInit.cc

@@ -23 +23 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
+#include "SymTab/Autogen.h"
 #include "GenPoly/PolyMutator.h"
 
@@ -194 +195 @@
                                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
                                         // call into makeArrayFunction from validate.cc to generate calls to ctor/dtor for each element of array
+                                        // TODO: walk initializer and generate appropriate copy ctor if element has initializer
+                                        SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "?{}", back_inserter( stmtsToAddAfter ) );
+                                        SymTab::makeArrayFunction( NULL, new VariableExpr( objDecl ), at, "^?{}", front_inserter( destructorStmts ), false );
                                 } else {
                                         // it's sufficient to attempt to call the ctor/dtor for the given object and its initializer
@@ -228 +232 @@
 
         CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
+                // don't want to dump all destructors when block is left,
+                // just the destructors associated with variables defined in this block
+                std::list< Statement * > oldDestructorStmts = destructorStmts;
+                destructorStmts = std::list<Statement *>();
+
                 CompoundStmt * ret = PolyMutator::mutate( compoundStmt );
                 std::list< Statement * > &statements = ret->get_kids();
@@ -235 +244 @@
                         statements.splice( statements.end(), destructorStmts );
                 } // if
+
+                destructorStmts = oldDestructorStmts;
                 return ret;
         }