Changes in / [d06010a:66999e7]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/CodeGenerator.h (modified) (2 diffs)
• ControlStruct/LabelFixer.cc (modified) (4 diffs)
• ControlStruct/LabelFixer.h (modified) (3 diffs)
• ControlStruct/LabelGenerator.cc (modified) (3 diffs)
• ControlStruct/MLEMutator.cc (modified) (17 diffs)
• ControlStruct/MLEMutator.h (modified) (6 diffs)
• ControlStruct/Mutate.cc (modified) (3 diffs)
• GenPoly/Specialize.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (3 diffs)
• InitTweak/InitTweak.cc (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• Parser/ExpressionNode.cc (modified) (6 diffs)
• Parser/ParseNode.h (modified) (3 diffs)
• Parser/StatementNode.cc (modified) (10 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/Autogen.cc (modified) (1 diff)
• SymTab/Autogen.h (modified) (1 diff)
• SymTab/Indexer.h (modified) (6 diffs)
• SynTree/AddStmtVisitor.cc (deleted)
• SynTree/AddStmtVisitor.h (deleted)
• SynTree/Label.h (deleted)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)
• SynTree/SynTree.h (modified) (1 diff)
• SynTree/Visitor.cc (modified) (5 diffs)
• SynTree/Visitor.h (modified) (1 diff)
• SynTree/module.mk (modified) (1 diff)
• tests/.expect/dtor-early-exit-ERR1.txt (deleted)
• tests/.expect/dtor-early-exit-ERR2.txt (deleted)
• tests/.expect/dtor-early-exit.txt (deleted)
• tests/.expect/init_once.txt (deleted)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/dtor-early-exit.c (deleted)
• tests/init_once.c (deleted)

src/CodeGen/CodeGenerator.cc

@@ -48 +48 @@
         }
 
-        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
+        ostream & CodeGenerator::Indenter::operator()( ostream & output ) {
           return output << string( cg.cur_indent, ' ' );
         }
 
-        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
+        ostream & operator<<( ostream & output, CodeGenerator::Indenter &indent ) {
                 return indent( output );
         }
 
-        CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
-                labels = &l;
-                return *this;
-        }
-
-        ostream & operator<<( ostream & output, CodeGenerator::LabelPrinter &printLabels ) {
-                std::list< Label > & labs = *printLabels.labels;
-                // l.unique(); // assumes a sorted list. Why not use set? Does order matter?
-                for ( Label & l : labs ) {
-                        output << l.get_name() + ": ";
-                        printLabels.cg.genAttributes( l.get_attributes() );
-                }
-                return output;
-        }
-
-        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) { }
+        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ) { }
 
         CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
-                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
+                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
 
         CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indentation, bool infunp )
-                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
+                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
@@ -750 +735 @@
         void CodeGenerator::visit( ReturnStmt *returnStmt ) {
                 output << "return ";
-                maybeAccept( returnStmt->get_expr(), *this );
+
+                // xxx -- check for null expression;
+                if ( returnStmt->get_expr() ) {
+                        returnStmt->get_expr()->accept( *this );
+                } // if
                 output << ";";
         }
@@ -812 +801 @@
         }
 
+        std::string CodeGenerator::printLabels( std::list< Label > &l ) {
+                std::string str( "" );
+                l.unique(); // assumes a sorted list. Why not use set?
+
+                for ( std::list< Label >::iterator i = l.begin(); i != l.end(); i++ )
+                        str += *i + ": ";
+
+                return str;
+        }
+
         void CodeGenerator::handleStorageClass( Declaration *decl ) {
                 switch ( decl->get_storageClass() ) {

src/CodeGen/CodeGenerator.h

@@ -94 +94 @@
                         Indenter(CodeGenerator &cg) : cg(cg) {}
                         CodeGenerator & cg;
-                        std::ostream& operator()(std::ostream & os) const;
-                };
-
-                struct LabelPrinter {
-                        LabelPrinter(CodeGenerator &cg) : cg(cg), labels( 0 ) {}
-                        LabelPrinter & operator()( std::list< Label > & l );
-                        CodeGenerator & cg;
-                        std::list< Label > * labels;
+                        std::ostream& operator()(std::ostream & os);
                 };
 
@@ -115 +108 @@
                 bool insideFunction;
                 std::ostream &output;
-                LabelPrinter printLabels;
 
                 void printDesignators( std::list< Expression * > & );
+                static std::string printLabels ( std::list < Label > & );
                 void handleStorageClass( Declaration *decl );
                 void handleAggregate( AggregateDecl *aggDecl );

src/ControlStruct/LabelFixer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.cc --
+// LabelFixer.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -86 +86 @@
 
 
-        // sets the definition of the labelTable entry to be the provided
+        // sets the definition of the labelTable entry to be the provided 
         // statement for every label in the list parameter. Happens for every kind of statement
         Label LabelFixer::setLabelsDef( std::list< Label > &llabel, Statement *definition ) {
@@ -95 +95 @@
 
                 for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
-                        Label & l = *i;
-                        l.set_statement( definition ); // attach statement to the label to be used later
-                        if ( labelTable.find( l ) == labelTable.end() ) {
+                        if ( labelTable.find( *i ) == labelTable.end() ) {
                                 // all labels on this statement need to use the same entry, so this should only be created once
                                 // undefined and unused until now, add an entry
-                                labelTable[ l ] =  e;
-                        } else if ( labelTable[ l ]->defined() ) {
+                                labelTable[ *i ] =  e;
+                        } else if ( labelTable[ *i ]->defined() ) {
                                 // defined twice, error
-                                throw SemanticError( "Duplicate definition of label: " + l.get_name() );
+                                throw SemanticError( "Duplicate definition of label: " + *i );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
-                                delete labelTable[ l ];
-                                labelTable[ l ] = e;
+                                delete labelTable[ *i ];
+                                labelTable[ *i ] = e;
                         } // if
                 } // for
 
-                // produce one of the labels attached to this statement to be
+                // produce one of the labels attached to this statement to be 
                 // temporarily used as the canonical label
                 return labelTable[ llabel.front() ]->get_label();
         }
 
-        // A label was used, add it to the table if it isn't already there
+        // A label was used, add it ot the table if it isn't already there
         template< typename UsageNode >
         void LabelFixer::setLabelsUsg( Label orgValue, UsageNode *use ) {
@@ -132 +130 @@
                 for ( std::map< Label, Entry * >::iterator i = labelTable.begin(); i != labelTable.end(); ++i ) {
                         if ( ! i->second->defined() ) {
-                                throw SemanticError( "Use of undefined label: " + i->first.get_name() );
+                                throw SemanticError( "Use of undefined label: " + i->first );
                         }
                         (*ret)[ i->first ] = i->second->get_definition();

src/ControlStruct/LabelFixer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelFixer.h --
+// LabelFixer.h -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -20 +20 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
-#include "SynTree/Label.h"
 #include "LabelGenerator.h"
+
 #include <map>
 
@@ -74 +74 @@
 
                   private:
-                        Label label;
+                        Label label;  
                         Statement *definition;
                 };
-
+                  
                 std::map < Label, Entry *> labelTable;
                 LabelGenerator *generator;

src/ControlStruct/LabelGenerator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelGenerator.cc --
+// LabelGenerator.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -18 +18 @@
 
 #include "LabelGenerator.h"
-#include "SynTree/Label.h"
-#include "SynTree/Attribute.h"
 
 namespace ControlStruct {
@@ -35 +33 @@
                 os << "__L" << current++ << "__" << suffix;
                 std::string ret = os.str();
-                Label l( ret );
-                l.get_attributes().push_back( new Attribute("unused") );
-                return l;
+                return Label( ret );
         }
 } // namespace ControlStruct

src/ControlStruct/MLEMutator.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MLEMutator.cc --
+// MLEMutator.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -14 +14 @@
 //
 
-// NOTE: There are two known subtle differences from the code that uC++
+// NOTE: There are two known subtle differences from the code that uC++ 
 // generates for the same input
 // -CFA puts the break label inside at the end of a switch, uC++ puts it after
@@ -27 +27 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Attribute.h"
 
 namespace ControlStruct {
@@ -34 +33 @@
                 targetTable = 0;
         }
-        namespace {
-                Statement * isLoop( Statement * stmt ) { return dynamic_cast< WhileStmt * >( stmt ) ? stmt : dynamic_cast< ForStmt * >( stmt ) ? stmt : 0; }
-        }
-
-        // break labels have to come after the statement they break out of,
+
+        // break labels have to come after the statement they break out of, 
         // so mutate a statement, then if they inform us through the breakLabel field
-        // tha they need a place to jump to on a break statement, add the break label
+        // tha they need a place to jump to on a break statement, add the break label 
         // to the body of statements
         void MLEMutator::fixBlock( std::list< Statement * > &kids ) {
@@ -48 +44 @@
                         if ( ! get_breakLabel().empty() ) {
                                 std::list< Statement * >::iterator next = k+1;
-                                std::list<Label> ls; ls.push_back( get_breakLabel() );
-                                kids.insert( next, new NullStmt( ls ) );
+                                if ( next == kids.end() ) {
+                                        std::list<Label> ls; ls.push_back( get_breakLabel() );
+                                        kids.push_back( new NullStmt( ls ) );
+                                } else {
+                                        (*next)->get_labels().push_back( get_breakLabel() );
+                                }
+
                                 set_breakLabel("");
                         } // if
@@ -59 +60 @@
                 if ( labeledBlock ) {
                         Label brkLabel = generator->newLabel("blockBreak");
-                        enclosingControlStructures.push_back( Entry( cmpndStmt, brkLabel ) );
+                        enclosingBlocks.push_back( Entry( cmpndStmt, brkLabel ) );
                 } // if
 
@@ -68 +69 @@
 
                 if ( labeledBlock ) {
-                        assert( ! enclosingControlStructures.empty() );
-                        if ( ! enclosingControlStructures.back().useBreakExit().empty() ) {
-                                set_breakLabel( enclosingControlStructures.back().useBreakExit() );
+                        assert( ! enclosingBlocks.empty() );
+                        if ( ! enclosingBlocks.back().useBreakExit().empty() ) {
+                                set_breakLabel( enclosingBlocks.back().useBreakExit() );
                         }
-                        enclosingControlStructures.pop_back();
+                        enclosingBlocks.pop_back();
                 } // if
 
@@ -80 +81 @@
         template< typename LoopClass >
         Statement *MLEMutator::handleLoopStmt( LoopClass *loopStmt ) {
-                // remember this as the most recent enclosing loop, then mutate
+                // remember this as the most recent enclosing loop, then mutate 
                 // the body of the loop -- this will determine whether brkLabel
                 // and contLabel are used with branch statements
@@ -86 +87 @@
                 Label brkLabel = generator->newLabel("loopBreak");
                 Label contLabel = generator->newLabel("loopContinue");
-                enclosingControlStructures.push_back( Entry( loopStmt, brkLabel, contLabel ) );
+                enclosingLoops.push_back( Entry( loopStmt, brkLabel, contLabel ) );
                 loopStmt->set_body ( loopStmt->get_body()->acceptMutator( *this ) );
 
                 // sanity check that the enclosing loops have been popped correctly
-                Entry &e = enclosingControlStructures.back();
+                Entry &e = enclosingLoops.back();
                 assert ( e == loopStmt );
 
@@ -96 +97 @@
                 // two labels, if they are used.
                 loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
-                enclosingControlStructures.pop_back();
+                enclosingLoops.pop_back();
 
                 return loopStmt;
@@ -110 +111 @@
         template< typename SwitchClass >
         Statement *MLEMutator::handleSwitchStmt( SwitchClass *switchStmt ) {
-                // generate a label for breaking out of a labeled switch
+                // generate a label for breaking out of a labeled switch 
                 Label brkLabel = generator->newLabel("switchBreak");
-                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
-                mutateAll( switchStmt->get_branches(), *this );
-
-                Entry &e = enclosingControlStructures.back();
+                enclosingSwitches.push_back( Entry(switchStmt, brkLabel) );
+                mutateAll( switchStmt->get_branches(), *this ); 
+
+                Entry &e = enclosingSwitches.back();
                 assert ( e == switchStmt );
 
                 // only generate break label if labeled break is used
                 if (e.isBreakUsed()) {
-                        // for the purposes of keeping switch statements uniform (i.e. all statements that are
-                        // direct children of a switch should be CastStmts), append the exit label + break to the
+                        // for the purposes of keeping switch statements uniform (i.e. all statements that are 
+                        // direct children of a switch should be CastStmts), append the exit label + break to the 
                         // last case statement; create a default case if there are no cases
                         std::list< Statement * > &branches = switchStmt->get_branches();
@@ -130 +131 @@
                         if ( CaseStmt * c = dynamic_cast< CaseStmt * >( branches.back() ) ) {
                                 std::list<Label> temp; temp.push_back( brkLabel );
-                                c->get_statements().push_back( new BranchStmt( temp, Label("brkLabel"), BranchStmt::Break ) );
+                                c->get_statements().push_back( new BranchStmt( temp, Label(""), BranchStmt::Break ) );
                         } else assert(0); // as of this point, all branches of a switch are still CaseStmts
                 }
 
-                assert ( enclosingControlStructures.back() == switchStmt );
-                enclosingControlStructures.pop_back();
+                assert ( enclosingSwitches.back() == switchStmt );
+                enclosingSwitches.pop_back();
                 return switchStmt;
         }
@@ -142 +143 @@
                 std::string originalTarget = branchStmt->get_originalTarget();
 
-                std::list< Entry >::reverse_iterator targetEntry;
-                if ( branchStmt->get_type() == BranchStmt::Goto ) {
+                if ( branchStmt->get_type() == BranchStmt::Goto )
                         return branchStmt;
-                } else if ( branchStmt->get_type() == BranchStmt::Continue) {
-                        // continue target must be a loop
-                        if ( branchStmt->get_target() == "" ) {
-                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), [](Entry &e) { return isLoop( e.get_controlStructure() ); } );
-                        } else {
-                                // labelled continue - lookup label in table ot find attached control structure
-                                targetEntry = std::find( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), (*targetTable)[branchStmt->get_target()] );
+
+                // test if continue target is a loop
+                if ( branchStmt->get_type() == BranchStmt::Continue) {
+                        if ( enclosingLoops.empty() ) {
+                                throw SemanticError( "'continue' outside a loop" );
+                        } else if ( branchStmt->get_target() != "" && std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) == enclosingLoops.end() ) {
+                                throw SemanticError( "'continue' target label must be an enclosing loop: " + originalTarget );
                         }
-                        if ( targetEntry == enclosingControlStructures.rend() || ! isLoop( targetEntry->get_controlStructure() ) ) {
-                                throw SemanticError( "'continue' target must be an enclosing loop: " + originalTarget );
-                        }
-                } else if ( branchStmt->get_type() == BranchStmt::Break ) {
-                        if ( enclosingControlStructures.empty() ) throw SemanticError( "'break' outside a loop, switch, or labelled block" );
-                        targetEntry = enclosingControlStructures.rbegin();
-                } else {
-                        assert( false );
-                }
-
-                if ( branchStmt->get_target() != "" && targetTable->find( branchStmt->get_target() ) == targetTable->end() ) {
+                }
+
+                if ( branchStmt->get_type() == BranchStmt::Break && (enclosingLoops.empty() && enclosingSwitches.empty() && enclosingBlocks.empty() ) )
+                        throw SemanticError( "'break' outside a loop or switch" );
+
+                if ( branchStmt->get_target() == "" ) return branchStmt;
+
+                if ( targetTable->find( branchStmt->get_target() ) == targetTable->end() )
                         throw SemanticError("The label defined in the exit loop statement does not exist: " + originalTarget );  // shouldn't happen (since that's already checked)
-                }
+
+                std::list< Entry >::iterator check;
+                if ( ( check = std::find( enclosingLoops.begin(), enclosingLoops.end(), (*targetTable)[branchStmt->get_target()] ) ) == enclosingLoops.end() )
+                        // not in loop, checking if in block
+                        if ( (check = std::find( enclosingBlocks.begin(), enclosingBlocks.end(), (*targetTable)[branchStmt->get_target()] )) == enclosingBlocks.end() )
+                                // neither in loop nor in block, checking if in switch/choose
+                                if ( (check = std::find( enclosingSwitches.begin(), enclosingSwitches.end(), (*targetTable)[branchStmt->get_target()] )) == enclosingSwitches.end() )
+                                        throw SemanticError("The target specified in the exit loop statement does not correspond to an enclosing control structure: " + originalTarget );
+
+                // what about exiting innermost block or switch???
+                if ( enclosingLoops.back() == (*check) )
+                        return branchStmt;                              // exit the innermost loop (labels unnecessary)
 
                 // branch error checks, get the appropriate label name and create a goto
@@ -171 +179 @@
                 switch ( branchStmt->get_type() ) {
                   case BranchStmt::Break:
-                                assert( targetEntry->useBreakExit() != "");
-                                exitLabel = targetEntry->useBreakExit();
+                                assert( check->useBreakExit() != "");
+                                exitLabel = check->useBreakExit();
                                 break;
                   case BranchStmt::Continue:
-                                assert( targetEntry->useContExit() != "");
-                                exitLabel = targetEntry->useContExit();
+                                assert( check->useContExit() != "");
+                                exitLabel = check->useContExit();
                                 break;
                   default:
@@ -182 +190 @@
                 } // switch
 
-                if ( branchStmt->get_target() == "" && branchStmt->get_type() != BranchStmt::Continue ) {
-                        // unlabelled break/continue - can keep branch as break/continue for extra semantic information, but add
-                        // exitLabel as its destination so that label passes can easily determine where the break/continue goes to
-                        branchStmt->set_target( exitLabel );
-                        return branchStmt;
-                } else {
-                        // labelled break/continue - can't easily emulate this with break and continue, so transform into a goto
-                        delete branchStmt;
-                        return new BranchStmt( std::list<Label>(), exitLabel, BranchStmt::Goto );
-                }
+                return new BranchStmt( std::list<Label>(), exitLabel, BranchStmt::Goto );
         }
 
@@ -207 +206 @@
                         // continue label goes in the body as the last statement
                         std::list< Label > labels; labels.push_back( e.useContExit() );
-                        newBody->get_kids().push_back( new NullStmt( labels ) );
+                        newBody->get_kids().push_back( new NullStmt( labels ) );                        
                 }
 
                 if ( e.isBreakUsed() ) {
-                        // break label goes after the loop -- it'll get set by the
+                        // break label goes after the loop -- it'll get set by the 
                         // outer mutator if we do this
-                        set_breakLabel( e.useBreakExit() );
+                        set_breakLabel( e.useBreakExit() );                     
                 }
 
@@ -232 +231 @@
 
         Statement *MLEMutator::mutate( ChooseStmt *switchStmt ) {
-                return handleSwitchStmt( switchStmt );
+                return handleSwitchStmt( switchStmt );          
         }
 

src/ControlStruct/MLEMutator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// MLEMutator.h --
+// MLEMutator.h -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -23 +23 @@
 #include "SynTree/SynTree.h"
 #include "SynTree/Mutator.h"
-#include "SynTree/Label.h"
 
 #include "LabelGenerator.h"
@@ -39 +38 @@
                 Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError );
 
-                Statement *mutate( CaseStmt *caseStmt );
+                Statement *mutate( CaseStmt *caseStmt ); 
                 Statement *mutate( SwitchStmt *switchStmt );
                 Statement *mutate( ChooseStmt *switchStmt );
@@ -56 +55 @@
                         bool operator!=( const Statement *stmt ) { return ( loop != stmt ); }
 
-                        bool operator==( const Entry &other ) { return ( loop == other.get_controlStructure() ); }
+                        bool operator==( const Entry &other ) { return ( loop == other.get_loop() ); }
 
-                        Statement *get_controlStructure() const { return loop; }
+                        Statement *get_loop() const { return loop; }
 
                         Label useContExit() { contUsed = true; return contExit; }
@@ -73 +72 @@
 
                 std::map< Label, Statement * > *targetTable;
-                std::list< Entry > enclosingControlStructures;
+                std::list< Entry > enclosingBlocks, enclosingLoops, enclosingSwitches;
                 Label breakLabel;
                 LabelGenerator *generator;
@@ -80 +79 @@
                 Statement *handleLoopStmt( LoopClass *loopStmt );
 
-                template< typename SwitchClass >
+                template< typename SwitchClass > 
                 Statement *handleSwitchStmt( SwitchClass *switchStmt );
 

src/ControlStruct/Mutate.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mutate.cc --
+// Mutate.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -39 +39 @@
                 ForExprMutator formut;
 
-                // transform choose statements into switch statements
-                ChooseMutator chmut;
-
                 // normalizes label definitions and generates multi-level
                 // exit labels
                 LabelFixer lfix;
+
+                // transform choose statements into switch statements
+                ChooseMutator chmut;
 
                 // expand case ranges and turn fallthru into a null statement
@@ -53 +53 @@
 
                 mutateAll( translationUnit, formut );
+                acceptAll( translationUnit, lfix );
                 mutateAll( translationUnit, chmut );
-                acceptAll( translationUnit, lfix );
                 mutateAll( translationUnit, ranges );
                 //mutateAll( translationUnit, exc );

src/GenPoly/Specialize.cc

@@ -99 +99 @@
                 } // if
                 // create new thunk with same signature as formal type (C linkage, empty body)
-                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( noLabels ), false, false );
+                FunctionDecl *thunkFunc = new FunctionDecl( thunkNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, newType, new CompoundStmt( std::list< std::string >() ), false, false );
                 thunkFunc->fixUniqueId();
 

src/InitTweak/FixInit.cc

@@ -16 +16 @@
 #include <stack>
 #include <list>
-#include <iterator>
-#include <algorithm>
 #include "FixInit.h"
 #include "InitTweak.h"
@@ -30 +28 @@
 #include "SymTab/Indexer.h"
 #include "GenPoly/PolyMutator.h"
-#include "SynTree/AddStmtVisitor.h"
 
 bool ctordtorp = false;
-bool ctorp = false;
-bool cpctorp = false;
-bool dtorp = false;
 #define PRINT( text ) if ( ctordtorp ) { text }
-#define CP_CTOR_PRINT( text ) if ( ctordtorp || cpctorp ) { text }
-#define DTOR_PRINT( text ) if ( ctordtorp || dtorp ) { text }
 
 namespace InitTweak {
@@ -44 +36 @@
                 const std::list<Label> noLabels;
                 const std::list<Expression*> noDesignators;
-
-                class InsertImplicitCalls : public GenPoly::PolyMutator {
-                public:
-                        /// wrap function application expressions as ImplicitCopyCtorExpr nodes
-                        /// so that it is easy to identify which function calls need their parameters
-                        /// to be copy constructed
-                        static void insert( std::list< Declaration * > & translationUnit );
-
-                        virtual Expression * mutate( ApplicationExpr * appExpr );
-                };
-
-                class ResolveCopyCtors : public SymTab::Indexer {
-                public:
-                        /// generate temporary ObjectDecls for each argument and return value of each
-                        /// ImplicitCopyCtorExpr, generate/resolve copy construction expressions for each,
-                        /// and generate/resolve destructors for both arguments and return value temporaries
-                        static void resolveImplicitCalls( std::list< Declaration * > & translationUnit );
-
-                        virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
-
-                        /// create and resolve ctor/dtor expression: fname(var, [cpArg])
-                        ApplicationExpr * makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg = NULL );
-                        /// true if type does not need to be copy constructed to ensure correctness
-                        bool skipCopyConstruct( Type * );
-                private:
-                        TypeSubstitution * env;
-                };
-
-                /// collects constructed object decls - used as a base class
-                class ObjDeclCollector : public AddStmtVisitor {
-                  public:
-                        typedef AddStmtVisitor Parent;
-                        using Parent::visit;
-                        typedef std::set< ObjectDecl * > ObjectSet;
-                        virtual void visit( CompoundStmt *compoundStmt );
-                        virtual void visit( DeclStmt *stmt );
-                  protected:
-                        ObjectSet curVars;
-                };
-
-                struct printSet {
-                        typedef ObjDeclCollector::ObjectSet ObjectSet;
-                        printSet( const ObjectSet & objs ) : objs( objs ) {}
-                        const ObjectSet & objs;
-                };
-                std::ostream & operator<<( std::ostream & out, const printSet & set) {
-                        out << "{ ";
-                        for ( ObjectDecl * obj : set.objs ) {
-                                out << obj->get_name() << ", " ;
-                        }
-                        out << " }";
-                        return out;
-                }
-
-                class LabelFinder : public ObjDeclCollector {
-                  public:
-                        typedef ObjDeclCollector Parent;
-                        typedef std::map< Label, ObjectSet > LabelMap;
-                        // map of Label -> live variables at that label
-                        LabelMap vars;
-
-                        void handleStmt( Statement * stmt );
-
-                        // xxx - This needs to be done better.
-                        // allow some generalization among different kinds of nodes with
-                        // with similar parentage (e.g. all expressions, all statements, etc.)
-                        // important to have this to provide a single entry point so that as
-                        // new subclasses are added, there is only one place that the code has
-                        // to be updated, rather than ensure that every specialized class knows
-                        // about every new kind of statement that might be added.
-                        virtual void visit( CompoundStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( ExprStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( AsmStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( IfStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( WhileStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( ForStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( SwitchStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( ChooseStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( FallthruStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( CaseStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( BranchStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( ReturnStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( TryStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( CatchStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( FinallyStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( NullStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( DeclStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                        virtual void visit( ImplicitCtorDtorStmt *stmt ) { handleStmt( stmt ); return Parent::visit( stmt ); }
-                };
-
-                class InsertDtors : public ObjDeclCollector {
-                public:
-                        /// insert destructor calls at the appropriate places.
-                        /// must happen before CtorInit nodes are removed (currently by FixInit)
-                        static void insert( std::list< Declaration * > & translationUnit );
-
-                        typedef ObjDeclCollector Parent;
-                        typedef std::list< ObjectDecl * > OrderedDecls;
-                        typedef std::list< OrderedDecls > OrderedDeclsStack;
-
-                        InsertDtors( LabelFinder & finder ) : labelVars( finder.vars ) {}
-
-                        virtual void visit( ObjectDecl * objDecl );
-
-                        virtual void visit( CompoundStmt * compoundStmt );
-                        virtual void visit( ReturnStmt * returnStmt );
-                        virtual void visit( BranchStmt * stmt );
-                private:
-                        void handleGoto( BranchStmt * stmt );
-
-                        LabelFinder::LabelMap & labelVars;
-                        OrderedDeclsStack reverseDeclOrder;
-                };
-
-                class FixInit : public GenPoly::PolyMutator {
-                  public:
-                        /// expand each object declaration to use its constructor after it is declared.
-                        static void fixInitializers( std::list< Declaration * > &translationUnit );
-
-                        virtual DeclarationWithType * mutate( ObjectDecl *objDecl );
-                };
-
-                class FixCopyCtors : public GenPoly::PolyMutator {
-                  public:
-                        /// expand ImplicitCopyCtorExpr nodes into the temporary declarations, copy constructors,
-                        /// call expression, and destructors
-                        static void fixCopyCtors( std::list< Declaration * > &translationUnit );
-
-                        virtual Expression * mutate( ImplicitCopyCtorExpr * impCpCtorExpr );
-                };
-        } // namespace
+        }
+
+        class InsertImplicitCalls : public GenPoly::PolyMutator {
+        public:
+                /// wrap function application expressions as ImplicitCopyCtorExpr nodes
+                /// so that it is easy to identify which function calls need their parameters
+                /// to be copy constructed
+                static void insert( std::list< Declaration * > & translationUnit );
+
+                virtual Expression * mutate( ApplicationExpr * appExpr );
+        };
+
+        class ResolveCopyCtors : public SymTab::Indexer {
+        public:
+                /// generate temporary ObjectDecls for each argument and return value of each
+                /// ImplicitCopyCtorExpr, generate/resolve copy construction expressions for each,
+                /// and generate/resolve destructors for both arguments and return value temporaries
+                static void resolveImplicitCalls( std::list< Declaration * > & translationUnit );
+
+                virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
+
+                /// create and resolve ctor/dtor expression: fname(var, [cpArg])
+                ApplicationExpr * makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg = NULL );
+                /// true if type does not need to be copy constructed to ensure correctness
+                bool skipCopyConstruct( Type * );
+        private:
+                TypeSubstitution * env;
+        };
+
+        class FixInit : public GenPoly::PolyMutator {
+          public:
+                /// expand each object declaration to use its constructor after it is declared.
+                /// insert destructor calls at the appropriate places
+                static void fixInitializers( std::list< Declaration * > &translationUnit );
+
+                virtual DeclarationWithType * mutate( ObjectDecl *objDecl );
+
+                virtual CompoundStmt * mutate( CompoundStmt * compoundStmt );
+                virtual Statement * mutate( ReturnStmt * returnStmt );
+                virtual Statement * mutate( BranchStmt * branchStmt );
+
+          private:
+                // stack of list of statements - used to differentiate scopes
+                std::list< std::list< Statement * > > dtorStmts;
+        };
+
+        class FixCopyCtors : public GenPoly::PolyMutator {
+          public:
+                /// expand ImplicitCopyCtorExpr nodes into the temporary declarations, copy constructors,
+                /// call expression, and destructors
+                static void fixCopyCtors( std::list< Declaration * > &translationUnit );
+
+                virtual Expression * mutate( ImplicitCopyCtorExpr * impCpCtorExpr );
+
+          private:
+                // stack of list of statements - used to differentiate scopes
+                std::list< std::list< Statement * > > dtorStmts;
+        };
 
         void fix( std::list< Declaration * > & translationUnit ) {
                 InsertImplicitCalls::insert( translationUnit );
                 ResolveCopyCtors::resolveImplicitCalls( translationUnit );
-                InsertDtors::insert( translationUnit );
                 FixInit::fixInitializers( translationUnit );
-
                 // FixCopyCtors must happen after FixInit, so that destructors are placed correctly
                 FixCopyCtors::fixCopyCtors( translationUnit );
         }
 
-        namespace {
-                void InsertImplicitCalls::insert( std::list< Declaration * > & translationUnit ) {
-                        InsertImplicitCalls inserter;
-                        mutateAll( translationUnit, inserter );
-                }
-
-                void ResolveCopyCtors::resolveImplicitCalls( std::list< Declaration * > & translationUnit ) {
-                        ResolveCopyCtors resolver;
-                        acceptAll( translationUnit, resolver );
-                }
-
-                void FixInit::fixInitializers( std::list< Declaration * > & translationUnit ) {
-                        FixInit fixer;
-                        mutateAll( translationUnit, fixer );
-                }
-
-                void InsertDtors::insert( std::list< Declaration * > & translationUnit ) {
-                        LabelFinder finder;
-                        InsertDtors inserter( finder );
-                        acceptAll( translationUnit, finder );
-                        acceptAll( translationUnit, inserter );
-                }
-
-                void FixCopyCtors::fixCopyCtors( std::list< Declaration * > & translationUnit ) {
-                        FixCopyCtors fixer;
-                        mutateAll( translationUnit, fixer );
-                }
-
-                Expression * InsertImplicitCalls::mutate( ApplicationExpr * appExpr ) {
-                        appExpr = dynamic_cast< ApplicationExpr * >( Mutator::mutate( appExpr ) );
-                        assert( appExpr );
-
-                        if ( VariableExpr * function = dynamic_cast< VariableExpr * > ( appExpr->get_function() ) ) {
-                                if ( function->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
-                                        // optimization: don't need to copy construct in order to call intrinsic functions
-                                        return appExpr;
-                                } else if ( DeclarationWithType * funcDecl = dynamic_cast< DeclarationWithType * > ( function->get_var() ) ) {
-                                        FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
-                                        assert( ftype );
-                                        if ( (funcDecl->get_name() == "?{}" || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) {
-                                                Type * t1 = ftype->get_parameters().front()->get_type();
-                                                Type * t2 = ftype->get_parameters().back()->get_type();
-                                                PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
-                                                assert( ptrType );
-
-                                                if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
-                                                        // optimization: don't need to copy construct in order to call a copy constructor or
-                                                        // assignment operator
-                                                        return appExpr;
-                                                }
-                                        } else if ( funcDecl->get_name() == "^?{}" ) {
-                                                // correctness: never copy construct arguments to a destructor
+        void InsertImplicitCalls::insert( std::list< Declaration * > & translationUnit ) {
+                InsertImplicitCalls inserter;
+                mutateAll( translationUnit, inserter );
+        }
+
+        void ResolveCopyCtors::resolveImplicitCalls( std::list< Declaration * > & translationUnit ) {
+                ResolveCopyCtors resolver;
+                acceptAll( translationUnit, resolver );
+        }
+
+        void FixInit::fixInitializers( std::list< Declaration * > & translationUnit ) {
+                FixInit fixer;
+                mutateAll( translationUnit, fixer );
+        }
+
+        void FixCopyCtors::fixCopyCtors( std::list< Declaration * > & translationUnit ) {
+                FixCopyCtors fixer;
+                mutateAll( translationUnit, fixer );
+        }
+
+        Expression * InsertImplicitCalls::mutate( ApplicationExpr * appExpr ) {
+                appExpr = dynamic_cast< ApplicationExpr * >( Mutator::mutate( appExpr ) );
+                assert( appExpr );
+
+                if ( VariableExpr * function = dynamic_cast< VariableExpr * > ( appExpr->get_function() ) ) {
+                        if ( function->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
+                                // optimization: don't need to copy construct in order to call intrinsic functions
+                                return appExpr;
+                        } else if ( DeclarationWithType * funcDecl = dynamic_cast< DeclarationWithType * > ( function->get_var() ) ) {
+                                FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
+                                assert( ftype );
+                                if ( (funcDecl->get_name() == "?{}" || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) {
+                                        Type * t1 = ftype->get_parameters().front()->get_type();
+                                        Type * t2 = ftype->get_parameters().back()->get_type();
+                                        PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
+                                        assert( ptrType );
+
+                                        if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
+                                                // optimization: don't need to copy construct in order to call a copy constructor or
+                                                // assignment operator
                                                 return appExpr;
                                         }
+                                } else if ( funcDecl->get_name() == "^?{}" ) {
+                                        // correctness: never copy construct arguments to a destructor
+                                        return appExpr;
                                 }
                         }
-                        CP_CTOR_PRINT( std::cerr << "InsertImplicitCalls: adding a wrapper " << appExpr << std::endl; )
-
-                        // wrap each function call so that it is easy to identify nodes that have to be copy constructed
-                        ImplicitCopyCtorExpr * expr = new ImplicitCopyCtorExpr( appExpr );
-                        // save the type substitution onto the new node so that it is easy to find.
-                        // Ensure it is not deleted with the ImplicitCopyCtorExpr by removing it before deletion.
-                        // The substitution is needed to obtain the type of temporary variables so that copy constructor
-                        // calls can be resolved. Normally this is what PolyMutator is for, but the pass that resolves
-                        // copy constructor calls must be an Indexer. We could alternatively make a PolyIndexer which
-                        // saves the environment, or compute the types of temporaries here, but it's much simpler to
-                        // save the environment here, and more cohesive to compute temporary variables and resolve copy
-                        // constructor calls together.
-                        assert( env );
-                        expr->set_env( env );
-                        return expr;
-                }
-
-                bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
-                        return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type );
-                }
-
-                ApplicationExpr * ResolveCopyCtors::makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg ) {
-                        assert( var );
-                        UntypedExpr * untyped = new UntypedExpr( new NameExpr( fname ) );
-                        untyped->get_args().push_back( new AddressExpr( new VariableExpr( var ) ) );
-                        if (cpArg) untyped->get_args().push_back( cpArg );
-
-                        // resolve copy constructor
-                        // should only be one alternative for copy ctor and dtor expressions, since
-                        // all arguments are fixed (VariableExpr and already resolved expression)
-                        CP_CTOR_PRINT( std::cerr << "ResolvingCtorDtor " << untyped << std::endl; )
-                        ApplicationExpr * resolved = dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untyped, *this ) );
-                        if ( resolved->get_env() ) {
-                                env->add( *resolved->get_env() );
+                }
+                PRINT( std::cerr << "InsertImplicitCalls: adding a wrapper " << appExpr << std::endl; )
+
+                // wrap each function call so that it is easy to identify nodes that have to be copy constructed
+                ImplicitCopyCtorExpr * expr = new ImplicitCopyCtorExpr( appExpr );
+                // save the type substitution onto the new node so that it is easy to find.
+                // Ensure it is not deleted with the ImplicitCopyCtorExpr by removing it before deletion.
+                // The substitution is needed to obtain the type of temporary variables so that copy constructor
+                // calls can be resolved. Normally this is what PolyMutator is for, but the pass that resolves
+                // copy constructor calls must be an Indexer. We could alternatively make a PolyIndexer which
+                // saves the environment, or compute the types of temporaries here, but it's much simpler to
+                // save the environment here, and more cohesive to compute temporary variables and resolve copy
+                // constructor calls together.
+                assert( env );
+                expr->set_env( env );
+                return expr;
+        }
+
+        bool ResolveCopyCtors::skipCopyConstruct( Type * type ) {
+                return dynamic_cast< VarArgsType * >( type ) || GenPoly::getFunctionType( type );
+        }
+
+        ApplicationExpr * ResolveCopyCtors::makeCtorDtor( const std::string & fname, ObjectDecl * var, Expression * cpArg ) {
+                assert( var );
+                UntypedExpr * untyped = new UntypedExpr( new NameExpr( fname ) );
+                untyped->get_args().push_back( new AddressExpr( new VariableExpr( var ) ) );
+                if (cpArg) untyped->get_args().push_back( cpArg );
+
+                // resolve copy constructor
+                // should only be one alternative for copy ctor and dtor expressions, since
+                // all arguments are fixed (VariableExpr and already resolved expression)
+                PRINT( std::cerr << "ResolvingCtorDtor " << untyped << std::endl; )
+                ApplicationExpr * resolved = dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untyped, *this ) );
+                if ( resolved->get_env() ) {
+                        env->add( *resolved->get_env() );
+                }
+
+                assert( resolved );
+                delete untyped;
+                return resolved;
+        }
+
+        void ResolveCopyCtors::visit( ImplicitCopyCtorExpr *impCpCtorExpr ) {
+                static UniqueName tempNamer("_tmp_cp");
+                static UniqueName retNamer("_tmp_cp_ret");
+
+                PRINT( std::cerr << "ResolveCopyCtors: " << impCpCtorExpr << std::endl; )
+                Visitor::visit( impCpCtorExpr );
+                env = impCpCtorExpr->get_env(); // xxx - maybe we really should just have a PolyIndexer...
+
+                ApplicationExpr * appExpr = impCpCtorExpr->get_callExpr();
+
+                // take each argument and attempt to copy construct it.
+                for ( Expression * & arg : appExpr->get_args() ) {
+                        PRINT( std::cerr << "Type Substitution: " << *impCpCtorExpr->get_env() << std::endl; )
+                        // xxx - need to handle tuple arguments
+                        assert( ! arg->get_results().empty() );
+                        Type * result = arg->get_results().front();
+                        if ( skipCopyConstruct( result ) ) continue; // skip certain non-copyable types
+                        // type may involve type variables, so apply type substitution to get temporary variable's actual type
+                        result = result->clone();
+                        impCpCtorExpr->get_env()->apply( result );
+                        ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
+                        tmp->get_type()->set_isConst( false );
+
+                        // create and resolve copy constructor
+                        PRINT( std::cerr << "makeCtorDtor for an argument" << std::endl; )
+                        ApplicationExpr * cpCtor = makeCtorDtor( "?{}", tmp, arg );
+
+                        // if the chosen constructor is intrinsic, the copy is unnecessary, so
+                        // don't create the temporary and don't call the copy constructor
+                        VariableExpr * function = dynamic_cast< VariableExpr * >( cpCtor->get_function() );
+                        assert( function );
+                        if ( function->get_var()->get_linkage() != LinkageSpec::Intrinsic ) {
+                                // replace argument to function call with temporary
+                                arg = new CommaExpr( cpCtor, new VariableExpr( tmp ) );
+                                impCpCtorExpr->get_tempDecls().push_back( tmp );
+                                impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", tmp ) );
                         }
-
-                        assert( resolved );
-                        delete untyped;
-                        return resolved;
-                }
-
-                void ResolveCopyCtors::visit( ImplicitCopyCtorExpr *impCpCtorExpr ) {
-                        static UniqueName tempNamer("_tmp_cp");
-                        static UniqueName retNamer("_tmp_cp_ret");
-
-                        CP_CTOR_PRINT( std::cerr << "ResolveCopyCtors: " << impCpCtorExpr << std::endl; )
-                        Visitor::visit( impCpCtorExpr );
-                        env = impCpCtorExpr->get_env(); // xxx - maybe we really should just have a PolyIndexer...
-
-                        ApplicationExpr * appExpr = impCpCtorExpr->get_callExpr();
-
-                        // take each argument and attempt to copy construct it.
-                        for ( Expression * & arg : appExpr->get_args() ) {
-                                CP_CTOR_PRINT( std::cerr << "Type Substitution: " << *impCpCtorExpr->get_env() << std::endl; )
-                                // xxx - need to handle tuple arguments
-                                assert( ! arg->get_results().empty() );
-                                Type * result = arg->get_results().front();
-                                if ( skipCopyConstruct( result ) ) continue; // skip certain non-copyable types
-                                // type may involve type variables, so apply type substitution to get temporary variable's actual type
-                                result = result->clone();
-                                impCpCtorExpr->get_env()->apply( result );
-                                ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
-                                tmp->get_type()->set_isConst( false );
-
-                                // create and resolve copy constructor
-                                CP_CTOR_PRINT( std::cerr << "makeCtorDtor for an argument" << std::endl; )
-                                ApplicationExpr * cpCtor = makeCtorDtor( "?{}", tmp, arg );
-
-                                // if the chosen constructor is intrinsic, the copy is unnecessary, so
-                                // don't create the temporary and don't call the copy constructor
-                                VariableExpr * function = dynamic_cast< VariableExpr * >( cpCtor->get_function() );
-                                assert( function );
-                                if ( function->get_var()->get_linkage() != LinkageSpec::Intrinsic ) {
-                                        // replace argument to function call with temporary
-                                        arg = new CommaExpr( cpCtor, new VariableExpr( tmp ) );
-                                        impCpCtorExpr->get_tempDecls().push_back( tmp );
-                                        impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", tmp ) );
+                }
+
+                // each return value from the call needs to be connected with an ObjectDecl
+                // at the call site, which is initialized with the return value and is destructed
+                // later
+                // xxx - handle multiple return values
+                ApplicationExpr * callExpr = impCpCtorExpr->get_callExpr();
+                // xxx - is this right? callExpr may not have the right environment, because it was attached
+                // at a higher level. Trying to pass that environment along.
+                callExpr->set_env( impCpCtorExpr->get_env()->clone() );
+                for ( Type * result : appExpr->get_results() ) {
+                        result = result->clone();
+                        impCpCtorExpr->get_env()->apply( result );
+                        ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
+                        ret->get_type()->set_isConst( false );
+                        impCpCtorExpr->get_returnDecls().push_back( ret );
+                        PRINT( std::cerr << "makeCtorDtor for a return" << std::endl; )
+                        impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                }
+                PRINT( std::cerr << "after Resolving: " << impCpCtorExpr << std::endl; )
+        }
+
+
+        Expression * FixCopyCtors::mutate( ImplicitCopyCtorExpr * impCpCtorExpr ) {
+                PRINT( std::cerr << "FixCopyCtors: " << impCpCtorExpr << std::endl; )
+
+                impCpCtorExpr = dynamic_cast< ImplicitCopyCtorExpr * >( Mutator::mutate( impCpCtorExpr ) );
+                assert( impCpCtorExpr );
+
+                std::list< ObjectDecl * > & tempDecls = impCpCtorExpr->get_tempDecls();
+                std::list< ObjectDecl * > & returnDecls = impCpCtorExpr->get_returnDecls();
+                std::list< Expression * > & dtors = impCpCtorExpr->get_dtors();
+
+                // add all temporary declarations and their constructors
+                for ( ObjectDecl * obj : tempDecls ) {
+                        stmtsToAdd.push_back( new DeclStmt( noLabels, obj ) );
+                }
+                for ( ObjectDecl * obj : returnDecls ) {
+                        stmtsToAdd.push_back( new DeclStmt( noLabels, obj ) );
+                }
+
+                // add destructors after current statement
+                for ( Expression * dtor : dtors ) {
+                        stmtsToAddAfter.push_back( new ExprStmt( noLabels, dtor ) );
+                }
+
+                // xxx - update to work with multiple return values
+                ObjectDecl * returnDecl = returnDecls.empty() ? NULL : returnDecls.front();
+                Expression * callExpr = impCpCtorExpr->get_callExpr();
+
+                PRINT( std::cerr << "Coming out the back..." << impCpCtorExpr << std::endl; )
+
+                // xxx - some of these aren't necessary, and can be removed once this is stable
+                dtors.clear();
+                tempDecls.clear();
+                returnDecls.clear();
+                impCpCtorExpr->set_callExpr( NULL );
+                impCpCtorExpr->set_env( NULL );
+                delete impCpCtorExpr;
+
+                if ( returnDecl ) {
+                        UntypedExpr * assign = new UntypedExpr( new NameExpr( "?=?" ) );
+                        assign->get_args().push_back( new VariableExpr( returnDecl ) );
+                        assign->get_args().push_back( callExpr );
+                        // know the result type of the assignment is the type of the LHS (minus the pointer), so
+                        // add that onto the assignment expression so that later steps have the necessary information
+                        assign->add_result( returnDecl->get_type()->clone() );
+
+                        Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
+                        if ( callExpr->get_results().front()->get_isLvalue() ) {
+                                // lvalue returning functions are funny. Lvalue.cc inserts a *? in front of any
+                                // lvalue returning non-intrinsic function. Add an AddressExpr to the call to negate
+                                // the derefence and change the type of the return temporary from T to T* to properly
+                                // capture the return value. Then dereference the result of the comma expression, since
+                                // the lvalue returning call was originally wrapped with an AddressExpr.
+                                // Effectively, this turns
+                                //   lvalue T f();
+                                //   &*f()
+                                // into
+                                //   T * tmp_cp_retN;
+                                //   tmp_cp_ret_N = &*(tmp_cp_ret_N = &*f(), tmp_cp_ret);
+                                // which work out in terms of types, but is pretty messy. It would be nice to find a better way.
+                                assign->get_args().back() = new AddressExpr( assign->get_args().back() );
+
+                                Type * resultType = returnDecl->get_type()->clone();
+                                returnDecl->set_type( new PointerType( Type::Qualifiers(), returnDecl->get_type() ) );
+                                UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
+                                deref->get_args().push_back( retExpr );
+                                deref->add_result( resultType );
+                                retExpr = deref;
+                        }
+                        // xxx - might need to set env on retExpr...
+                        // retExpr->set_env( env->clone() );
+                        return retExpr;
+                } else {
+                        return callExpr;
+                }
+        }
+
+        DeclarationWithType *FixInit::mutate( ObjectDecl *objDecl ) {
+                // first recursively handle pieces of ObjectDecl so that they aren't missed by other visitors
+                // when the init is removed from the ObjectDecl
+                objDecl = dynamic_cast< ObjectDecl * >( Mutator::mutate( objDecl ) );
+
+                if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
+                        // a decision should have been made by the resolver, so ctor and init are not both non-NULL
+                        assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
+                        if ( Statement * ctor = ctorInit->get_ctor() ) {
+                                if ( objDecl->get_storageClass() == DeclarationNode::Static ) {
+                                        // generate:
+                                        // static bool __objName_uninitialized = true;
+                                        // if (__objName_uninitialized) {
+                                        //   __ctor(__objName);
+                                        //   void dtor_atexit() {
+                                        //     __dtor(__objName);
+                                        //   }
+                                        //   on_exit(dtorOnExit, &__objName);
+                                        //   __objName_uninitialized = false;
+                                        // }
+
+                                        // generate first line
+                                        BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
+                                        SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
+                                        ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::Static, LinkageSpec::Cforall, 0, boolType, boolInitExpr );
+                                        isUninitializedVar->fixUniqueId();
+
+                                        // void dtor_atexit(...) {...}
+                                        FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
+                                        dtorCaller->fixUniqueId();
+                                        dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor() );
+
+                                        // on_exit(dtor_atexit);
+                                        UntypedExpr * callAtexit = new UntypedExpr( new NameExpr( "atexit" ) );
+                                        callAtexit->get_args().push_back( new VariableExpr( dtorCaller ) );
+
+                                        // __objName_uninitialized = false;
+                                        UntypedExpr * setTrue = new UntypedExpr( new NameExpr( "?=?" ) );
+                                        setTrue->get_args().push_back( new VariableExpr( isUninitializedVar ) );
+                                        setTrue->get_args().push_back( new ConstantExpr( Constant( boolType->clone(), "0" ) ) );
+
+                                        // generate body of if
+                                        CompoundStmt * initStmts = new CompoundStmt( noLabels );
+                                        std::list< Statement * > & body = initStmts->get_kids();
+                                        body.push_back( ctor );
+                                        body.push_back( new DeclStmt( noLabels, dtorCaller ) );
+                                        body.push_back( new ExprStmt( noLabels, callAtexit ) );
+                                        body.push_back( new ExprStmt( noLabels, setTrue ) );
+
+                                        // put it all together
+                                        IfStmt * ifStmt = new IfStmt( noLabels, new VariableExpr( isUninitializedVar ), initStmts, 0 );
+                                        stmtsToAddAfter.push_back( new DeclStmt( noLabels, isUninitializedVar ) );
+                                        stmtsToAddAfter.push_back( ifStmt );
+                                } else {
+                                        stmtsToAddAfter.push_back( ctor );
+                                        dtorStmts.back().push_front( ctorInit->get_dtor() );
                                 }
+                                objDecl->set_init( NULL );
+                                ctorInit->set_ctor( NULL );
+                                ctorInit->set_dtor( NULL );  // xxx - only destruct when constructing? Probably not?
+                        } else if ( Initializer * init = ctorInit->get_init() ) {
+                                objDecl->set_init( init );
+                                ctorInit->set_init( NULL );
+                        } else {
+                                // no constructor and no initializer, which is okay
+                                objDecl->set_init( NULL );
                         }
-
-                        // each return value from the call needs to be connected with an ObjectDecl
-                        // at the call site, which is initialized with the return value and is destructed
-                        // later
-                        // xxx - handle multiple return values
-                        ApplicationExpr * callExpr = impCpCtorExpr->get_callExpr();
-                        // xxx - is this right? callExpr may not have the right environment, because it was attached
-                        // at a higher level. Trying to pass that environment along.
-                        callExpr->set_env( impCpCtorExpr->get_env()->clone() );
-                        for ( Type * result : appExpr->get_results() ) {
-                                result = result->clone();
-                                impCpCtorExpr->get_env()->apply( result );
-                                ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result, 0 );
-                                ret->get_type()->set_isConst( false );
-                                impCpCtorExpr->get_returnDecls().push_back( ret );
-                                CP_CTOR_PRINT( std::cerr << "makeCtorDtor for a return" << std::endl; )
-                                impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
-                        }
-                        CP_CTOR_PRINT( std::cerr << "after Resolving: " << impCpCtorExpr << std::endl; )
-                }
-
-
-                Expression * FixCopyCtors::mutate( ImplicitCopyCtorExpr * impCpCtorExpr ) {
-                        CP_CTOR_PRINT( std::cerr << "FixCopyCtors: " << impCpCtorExpr << std::endl; )
-
-                        impCpCtorExpr = dynamic_cast< ImplicitCopyCtorExpr * >( Mutator::mutate( impCpCtorExpr ) );
-                        assert( impCpCtorExpr );
-
-                        std::list< ObjectDecl * > & tempDecls = impCpCtorExpr->get_tempDecls();
-                        std::list< ObjectDecl * > & returnDecls = impCpCtorExpr->get_returnDecls();
-                        std::list< Expression * > & dtors = impCpCtorExpr->get_dtors();
-
-                        // add all temporary declarations and their constructors
-                        for ( ObjectDecl * obj : tempDecls ) {
-                                stmtsToAdd.push_back( new DeclStmt( noLabels, obj ) );
-                        }
-                        for ( ObjectDecl * obj : returnDecls ) {
-                                stmtsToAdd.push_back( new DeclStmt( noLabels, obj ) );
-                        }
-
-                        // add destructors after current statement
-                        for ( Expression * dtor : dtors ) {
-                                stmtsToAddAfter.push_back( new ExprStmt( noLabels, dtor ) );
-                        }
-
-                        // xxx - update to work with multiple return values
-                        ObjectDecl * returnDecl = returnDecls.empty() ? NULL : returnDecls.front();
-                        Expression * callExpr = impCpCtorExpr->get_callExpr();
-
-                        CP_CTOR_PRINT( std::cerr << "Coming out the back..." << impCpCtorExpr << std::endl; )
-
-                        // detach fields from wrapper node so that it can be deleted without deleting too much
-                        dtors.clear();
-                        tempDecls.clear();
-                        returnDecls.clear();
-                        impCpCtorExpr->set_callExpr( NULL );
-                        impCpCtorExpr->set_env( NULL );
-                        delete impCpCtorExpr;
-
-                        if ( returnDecl ) {
-                                UntypedExpr * assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                                assign->get_args().push_back( new VariableExpr( returnDecl ) );
-                                assign->get_args().push_back( callExpr );
-                                // know the result type of the assignment is the type of the LHS (minus the pointer), so
-                                // add that onto the assignment expression so that later steps have the necessary information
-                                assign->add_result( returnDecl->get_type()->clone() );
-
-                                Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
-                                if ( callExpr->get_results().front()->get_isLvalue() ) {
-                                        // lvalue returning functions are funny. Lvalue.cc inserts a *? in front of any
-                                        // lvalue returning non-intrinsic function. Add an AddressExpr to the call to negate
-                                        // the derefence and change the type of the return temporary from T to T* to properly
-                                        // capture the return value. Then dereference the result of the comma expression, since
-                                        // the lvalue returning call was originally wrapped with an AddressExpr.
-                                        // Effectively, this turns
-                                        //   lvalue T f();
-                                        //   &*f()
-                                        // into
-                                        //   T * tmp_cp_retN;
-                                        //   tmp_cp_ret_N = &*(tmp_cp_ret_N = &*f(), tmp_cp_ret);
-                                        // which work out in terms of types, but is pretty messy. It would be nice to find a better way.
-                                        assign->get_args().back() = new AddressExpr( assign->get_args().back() );
-
-                                        Type * resultType = returnDecl->get_type()->clone();
-                                        returnDecl->set_type( new PointerType( Type::Qualifiers(), returnDecl->get_type() ) );
-                                        UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                        deref->get_args().push_back( retExpr );
-                                        deref->add_result( resultType );
-                                        retExpr = deref;
-                                }
-                                // xxx - might need to set env on retExpr...
-                                // retExpr->set_env( env->clone() );
-                                return retExpr;
-                        } else {
-                                return callExpr;
-                        }
-                }
-
-                DeclarationWithType *FixInit::mutate( ObjectDecl *objDecl ) {
-                        // first recursively handle pieces of ObjectDecl so that they aren't missed by other visitors
-                        // when the init is removed from the ObjectDecl
-                        objDecl = dynamic_cast< ObjectDecl * >( Mutator::mutate( objDecl ) );
-
-                        if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
-                                // a decision should have been made by the resolver, so ctor and init are not both non-NULL
-                                assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
-                                if ( Statement * ctor = ctorInit->get_ctor() ) {
-                                        if ( objDecl->get_storageClass() == DeclarationNode::Static ) {
-                                                // generate:
-                                                // static bool __objName_uninitialized = true;
-                                                // if (__objName_uninitialized) {
-                                                //   __ctor(__objName);
-                                                //   void dtor_atexit() {
-                                                //     __dtor(__objName);
-                                                //   }
-                                                //   on_exit(dtorOnExit, &__objName);
-                                                //   __objName_uninitialized = false;
-                                                // }
-
-                                                // generate first line
-                                                BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
-                                                SingleInit * boolInitExpr = new SingleInit( new ConstantExpr( Constant( boolType->clone(), "1" ) ), noDesignators );
-                                                ObjectDecl * isUninitializedVar = new ObjectDecl( objDecl->get_mangleName() + "_uninitialized", DeclarationNode::Static, LinkageSpec::Cforall, 0, boolType, boolInitExpr );
-                                                isUninitializedVar->fixUniqueId();
-
-                                                // void dtor_atexit(...) {...}
-                                                FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
-                                                dtorCaller->fixUniqueId();
-                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor() );
-
-                                                // on_exit(dtor_atexit);
-                                                UntypedExpr * callAtexit = new UntypedExpr( new NameExpr( "atexit" ) );
-                                                callAtexit->get_args().push_back( new VariableExpr( dtorCaller ) );
-
-                                                // __objName_uninitialized = false;
-                                                UntypedExpr * setTrue = new UntypedExpr( new NameExpr( "?=?" ) );
-                                                setTrue->get_args().push_back( new VariableExpr( isUninitializedVar ) );
-                                                setTrue->get_args().push_back( new ConstantExpr( Constant( boolType->clone(), "0" ) ) );
-
-                                                // generate body of if
-                                                CompoundStmt * initStmts = new CompoundStmt( noLabels );
-                                                std::list< Statement * > & body = initStmts->get_kids();
-                                                body.push_back( ctor );
-                                                body.push_back( new DeclStmt( noLabels, dtorCaller ) );
-                                                body.push_back( new ExprStmt( noLabels, callAtexit ) );
-                                                body.push_back( new ExprStmt( noLabels, setTrue ) );
-
-                                                // put it all together
-                                                IfStmt * ifStmt = new IfStmt( noLabels, new VariableExpr( isUninitializedVar ), initStmts, 0 );
-                                                stmtsToAddAfter.push_back( new DeclStmt( noLabels, isUninitializedVar ) );
-                                                stmtsToAddAfter.push_back( ifStmt );
-                                        } else {
-                                                stmtsToAddAfter.push_back( ctor );
-                                        }
-                                        objDecl->set_init( NULL );
-                                        ctorInit->set_ctor( NULL );
-                                } else if ( Initializer * init = ctorInit->get_init() ) {
-                                        objDecl->set_init( init );
-                                        ctorInit->set_init( NULL );
-                                } else {
-                                        // no constructor and no initializer, which is okay
-                                        objDecl->set_init( NULL );
-                                }
-                                delete ctorInit;
-                        }
-                        return objDecl;
-                }
-
-                void ObjDeclCollector::visit( CompoundStmt *compoundStmt ) {
-                        std::set< ObjectDecl * > prevVars = curVars;
-                        Parent::visit( compoundStmt );
-                        curVars = prevVars;
-                }
-
-                void ObjDeclCollector::visit( DeclStmt *stmt ) {
-                        // keep track of all variables currently in scope
-                        if ( ObjectDecl * objDecl = dynamic_cast< ObjectDecl * > ( stmt->get_decl() ) ) {
-                                curVars.insert( objDecl );
-                        }
-                        Parent::visit( stmt );
-                }
-
-                void LabelFinder::handleStmt( Statement * stmt ) {
-                        // for each label, remember the variables in scope at that label.
-                        for ( Label l : stmt->get_labels() ) {
-                                vars[l] = curVars;
-                        }
-                }
-
+                        delete ctorInit;
+                }
+                return objDecl;
+        }
+
+        namespace {
                 template<typename Iterator, typename OutputIterator>
                 void insertDtors( Iterator begin, Iterator end, OutputIterator out ) {
                         for ( Iterator it = begin ; it != end ; ++it ) {
-                                // extract destructor statement from the object decl and
-                                // insert it into the output. Note that this is only called
-                                // on lists of non-static objects with implicit non-intrinsic
-                                // dtors, so if the user manually calls an intrinsic dtor
-                                // then the call must (and will) still be generated since
-                                // the argument may contain side effects.
-                                ObjectDecl * objDecl = *it;
-                                ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() );
-                                assert( ctorInit && ctorInit->get_dtor() );
-                                *out++ = ctorInit->get_dtor()->clone();
-                        }
-                }
-
-                void InsertDtors::visit( ObjectDecl * objDecl ) {
-                        // remember non-static destructed objects so that their destructors can be inserted later
-                        if ( objDecl->get_storageClass() != DeclarationNode::Static ) {
-                                if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
-                                        // a decision should have been made by the resolver, so ctor and init are not both non-NULL
-                                        assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
-                                        Statement * dtor = ctorInit->get_dtor();
-                                        if ( dtor && ! isInstrinsicSingleArgCallStmt( dtor ) ) {
-                                                // don't need to call intrinsic dtor, because it does nothing, but
-                                                // non-intrinsic dtors must be called
-                                                reverseDeclOrder.front().push_front( objDecl );
-                                        }
+                                // remove if instrinsic destructor statement. Note that this is only called
+                                // on lists of implicit dtors, so if the user manually calls an intrinsic
+                                // dtor then the call must (and will) still be generated since the argument
+                                // may contain side effects.
+                                if ( ! isInstrinsicSingleArgCallStmt( *it ) ) {
+                                        // don't need to call intrinsic dtor, because it does nothing, but
+                                        // non-intrinsic dtors must be called
+                                        *out++ = (*it)->clone();
                                 }
                         }
-                        Parent::visit( objDecl );
-                }
-
-                void InsertDtors::visit( CompoundStmt * compoundStmt ) {
-                        // visit statements - this will also populate reverseDeclOrder list.
-                        // don't want to dump all destructors when block is left,
-                        // just the destructors associated with variables defined in this block,
-                        // so push a new list to the top of the stack so that we can differentiate scopes
-                        reverseDeclOrder.push_front( OrderedDecls() );
-                        Parent::visit( compoundStmt );
-
-                        // add destructors for the current scope that we're exiting
-                        std::list< Statement * > & statements = compoundStmt->get_kids();
-                        insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
-                        reverseDeclOrder.pop_front();
-                }
-
-                void InsertDtors::visit( ReturnStmt * returnStmt ) {
-                        // return exits all scopes, so dump destructors for all scopes
-                        for ( OrderedDecls & od : reverseDeclOrder ) {
-                                insertDtors( od.begin(), od.end(), back_inserter( stmtsToAdd ) );
-                        }
-                }
-
-                // Handle break/continue/goto in the same manner as C++.
-                // Basic idea: any objects that are in scope at the BranchStmt
-                // but not at the labelled (target) statement must be destructed.
-                // If there are any objects in scope at the target location but
-                // not at the BranchStmt then those objects would be uninitialized
-                // so notify the user of the error.
-                // See C++ Reference 6.6 Jump Statements for details.
-                void InsertDtors::handleGoto( BranchStmt * stmt ) {
-                        assert( stmt->get_target() != "" && "BranchStmt missing a label" );
-                        // S_L = lvars = set of objects in scope at label definition
-                        // S_G = curVars = set of objects in scope at goto statement
-                        ObjectSet & lvars = labelVars[ stmt->get_target() ];
-
-                        DTOR_PRINT(
-                                std::cerr << "at goto label: " << stmt->get_target().get_name() << std::endl;
-                                std::cerr << "S_G = " << printSet( curVars ) << std::endl;
-                                std::cerr << "S_L = " << printSet( lvars ) << std::endl;
-                        )
-
-                        ObjectSet diff;
-                        // S_L-S_G results in set of objects whose construction is skipped - it's an error if this set is non-empty
-                        std::set_difference( lvars.begin(), lvars.end(), curVars.begin(), curVars.end(), std::inserter( diff, diff.begin() ) );
-                        DTOR_PRINT(
-                                std::cerr << "S_L-S_G = " << printSet( diff ) << std::endl;
-                        )
-                        if ( ! diff.empty() ) {
-                                throw SemanticError( std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " ", stmt );
-                        }
-                        // S_G-S_L results in set of objects that must be destructed
-                        diff.clear();
-                        std::set_difference( curVars.begin(), curVars.end(), lvars.begin(), lvars.end(), std::inserter( diff, diff.end() ) );
-                        DTOR_PRINT(
-                                std::cerr << "S_G-S_L = " << printSet( diff ) << std::endl;
-                        )
-                        if ( ! diff.empty() ) {
-                                // go through decl ordered list of objectdecl. for each element that occurs in diff, output destructor
-                                OrderedDecls ordered;
-                                for ( OrderedDecls & rdo : reverseDeclOrder ) {
-                                        // add elements from reverseDeclOrder into ordered if they occur in diff - it is key that this happens in reverse declaration order.
-                                        copy_if( rdo.begin(), rdo.end(), back_inserter( ordered ), [&]( ObjectDecl * objDecl ) { return diff.count( objDecl ); } );
-                                }
-                                insertDtors( ordered.begin(), ordered.end(), back_inserter( stmtsToAdd ) );
-                        }
-                }
-
-                void InsertDtors::visit( BranchStmt * stmt ) {
-                        switch( stmt->get_type() ) {
-                                case BranchStmt::Continue:
-                                case BranchStmt::Break:
-                                // could optimize the break/continue case, because the S_L-S_G check
-                                // is unnecessary (this set should always be empty), but it serves
-                                // as a small sanity check.
-                                case BranchStmt::Goto:
-                                        handleGoto( stmt );
-                                        break;
-                                default:
-                                        assert( false );
-                        }
-                }
-        } // namespace
+                }
+        }
+
+        CompoundStmt * FixInit::mutate( CompoundStmt * compoundStmt ) {
+                // mutate statements - this will also populate dtorStmts list.
+                // don't want to dump all destructors when block is left,
+                // just the destructors associated with variables defined in this block,
+                // so push a new list to the top of the stack so that we can differentiate scopes
+                dtorStmts.push_back( std::list<Statement *>() );
+
+                compoundStmt = PolyMutator::mutate( compoundStmt );
+                std::list< Statement * > & statements = compoundStmt->get_kids();
+
+                insertDtors( dtorStmts.back().begin(), dtorStmts.back().end(), back_inserter( statements ) );
+
+                deleteAll( dtorStmts.back() );
+                dtorStmts.pop_back();
+                return compoundStmt;
+        }
+
+        Statement * FixInit::mutate( ReturnStmt * returnStmt ) {
+                for ( std::list< std::list< Statement * > >::reverse_iterator list = dtorStmts.rbegin(); list != dtorStmts.rend(); ++list ) {
+                        insertDtors( list->begin(), list->end(), back_inserter( stmtsToAdd ) );
+                }
+                return Mutator::mutate( returnStmt );
+        }
+
+        Statement * FixInit::mutate( BranchStmt * branchStmt ) {
+                // TODO: adding to the end of a block isn't sufficient, since
+                // return/break/goto should trigger destructor when block is left.
+                switch( branchStmt->get_type() ) {
+                        case BranchStmt::Continue:
+                        case BranchStmt::Break:
+                                insertDtors( dtorStmts.back().begin(), dtorStmts.back().end(), back_inserter( stmtsToAdd ) );
+                                break;
+                        case BranchStmt::Goto:
+                                // xxx
+                                // if goto leaves a block, generate dtors for every block it leaves
+                                // if goto is in same block but earlier statement, destruct every object that was defined after the statement
+                                break;
+                        default:
+                                assert( false );
+                }
+                return Mutator::mutate( branchStmt );
+        }
+
+
 } // namespace InitTweak
 

src/InitTweak/InitTweak.cc

@@ -115 +115 @@
 
         namespace {
-                std::string funcName( Expression * func ) {
+                template<typename CallExpr>
+                std::string funcName( CallExpr * expr ) {
+                        Expression * func = expr->get_function();
                         if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( func ) ) {
                                 return nameExpr->get_name();
                         } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( func ) ) {
                                 return varExpr->get_var()->get_name();
-                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( func ) ) {
-                                return funcName( castExpr->get_arg() );
                         } else {
                                 assert( false && "Unexpected expression type being called as a function in call expression" );
@@ -130 +130 @@
         std::string getFunctionName( Expression * expr ) {
                 if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
-                        return funcName( appExpr->get_function() );
+                        return funcName( appExpr );
                 } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * > ( expr ) ) {
-                        return funcName( untypedExpr->get_function() );
+                        return funcName( untypedExpr );
                 } else {
-                        std::cerr << expr << std::endl;
                         assert( false && "Unexpected expression type passed to getFunctionName" );
                 }

src/Makefile.in

@@ -194 +194 @@
         SynTree/driver_cfa_cpp-Visitor.$(OBJEXT) \
         SynTree/driver_cfa_cpp-Mutator.$(OBJEXT) \
-        SynTree/driver_cfa_cpp-AddStmtVisitor.$(OBJEXT) \
         SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
         SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
@@ -413 +412 @@
         SynTree/NamedTypeDecl.cc SynTree/TypeDecl.cc \
         SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \
-        SynTree/AddStmtVisitor.cc SynTree/TypeSubstitution.cc \
-        SynTree/Attribute.cc Tuples/Mutate.cc Tuples/AssignExpand.cc \
+        SynTree/TypeSubstitution.cc SynTree/Attribute.cc \
+        Tuples/Mutate.cc Tuples/AssignExpand.cc \
         Tuples/FunctionFixer.cc Tuples/TupleAssignment.cc \
         Tuples/FunctionChecker.cc Tuples/NameMatcher.cc
@@ -783 +782 @@
 SynTree/driver_cfa_cpp-Mutator.$(OBJEXT): SynTree/$(am__dirstamp) \
         SynTree/$(DEPDIR)/$(am__dirstamp)
-SynTree/driver_cfa_cpp-AddStmtVisitor.$(OBJEXT):  \
-        SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
 SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT):  \
         SynTree/$(am__dirstamp) SynTree/$(DEPDIR)/$(am__dirstamp)
@@ -881 +878 @@
         -rm -f SymTab/driver_cfa_cpp-TypeEquality.$(OBJEXT)
         -rm -f SymTab/driver_cfa_cpp-Validate.$(OBJEXT)
-        -rm -f SynTree/driver_cfa_cpp-AddStmtVisitor.$(OBJEXT)
         -rm -f SynTree/driver_cfa_cpp-AddressExpr.$(OBJEXT)
         -rm -f SynTree/driver_cfa_cpp-AggregateDecl.$(OBJEXT)
@@ -992 +988 @@
 @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-TypeEquality.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SymTab/$(DEPDIR)/driver_cfa_cpp-Validate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AddressExpr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-AggregateDecl.Po@am__quote@
@@ -2420 +2415 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-Mutator.obj `if test -f 'SynTree/Mutator.cc'; then $(CYGPATH_W) 'SynTree/Mutator.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Mutator.cc'; fi`
-
-SynTree/driver_cfa_cpp-AddStmtVisitor.o: SynTree/AddStmtVisitor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AddStmtVisitor.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.o `test -f 'SynTree/AddStmtVisitor.cc' || echo '$(srcdir)/'`SynTree/AddStmtVisitor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AddStmtVisitor.cc' object='SynTree/driver_cfa_cpp-AddStmtVisitor.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.o `test -f 'SynTree/AddStmtVisitor.cc' || echo '$(srcdir)/'`SynTree/AddStmtVisitor.cc
-
-SynTree/driver_cfa_cpp-AddStmtVisitor.obj: SynTree/AddStmtVisitor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT SynTree/driver_cfa_cpp-AddStmtVisitor.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.obj `if test -f 'SynTree/AddStmtVisitor.cc'; then $(CYGPATH_W) 'SynTree/AddStmtVisitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AddStmtVisitor.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-AddStmtVisitor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/AddStmtVisitor.cc' object='SynTree/driver_cfa_cpp-AddStmtVisitor.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o SynTree/driver_cfa_cpp-AddStmtVisitor.obj `if test -f 'SynTree/AddStmtVisitor.cc'; then $(CYGPATH_W) 'SynTree/AddStmtVisitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/AddStmtVisitor.cc'; fi`
 
 SynTree/driver_cfa_cpp-TypeSubstitution.o: SynTree/TypeSubstitution.cc

src/Parser/ExpressionNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ExpressionNode.cc --
-//
+// ExpressionNode.cc -- 
+// 
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
@@ -12 +12 @@
 // Last Modified On : Mon Jun 13 14:46:17 2016
 // Update Count     : 307
-//
+// 
 
 #include <cassert>
@@ -231 +231 @@
         // "abc" "def" "ghi" => "abcdefghi", remove new text from quotes and insert before last quote in old string.
         value.insert( value.length() - 1, newValue->substr( 1, newValue->length() - 2 ) );
-
+        
         delete newValue;                                                                        // allocated by lexer
         return this;
@@ -347 +347 @@
 
         if ( isArrayIndex ) {
-                // need to traverse entire structure and change any instances of 0 or 1 to
+                // need to traverse entire structure and change any instances of 0 or 1 to 
                 // ConstantExpr
                 DesignatorFixer fixer;
@@ -440 +440 @@
 }
 
-CompositeExprNode::CompositeExprNode( const CompositeExprNode &other ) : ExpressionNode( other ), function( maybeClone( other.function ) ), arguments( 0 ) {
+CompositeExprNode::CompositeExprNode( const CompositeExprNode &other ) : ExpressionNode( other ), function( maybeClone( other.function ) ) {
         ParseNode *cur = other.arguments;
         while ( cur ) {
@@ -608 +608 @@
                 {
                         assert( args.size() == 2 );
-
+                        
                         if ( TypeValueNode * arg = dynamic_cast<TypeValueNode *>( get_args() ) ) {
                                 NameExpr *member = dynamic_cast<NameExpr *>( args.back() );

src/Parser/ParseNode.h

@@ -28 +28 @@
 //#include "SynTree/Declaration.h"
 #include "Common/UniqueName.h"
-#include "SynTree/Label.h"
 
 class ExpressionNode;
@@ -285 +284 @@
         virtual void printOneLine( std::ostream &, int indent = 0) const;
 
-        const std::list< Label > &get_labels() const { return labels; };
+        const std::list< std::string > &get_labels() const { return labels; };
         void append_label( std::string *label ) { labels.push_back( *label ); delete label; }
   private:
-        std::list< Label > labels;
+        std::list< std::string > labels;
 };
 
@@ -525 +524 @@
         ExpressionNode *output, *input;
         ConstantNode *clobber;
-        std::list< Label > gotolabels;
+        std::list<std::string> gotolabels;
 };
 

src/Parser/StatementNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// StatementNode.cc --
+// StatementNode.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -27 +27 @@
 
 const char *StatementNode::StType[] = {
-        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru",
-        "While", "Do",       "For",
+        "Exp",   "If",       "Switch", "Case",    "Default",  "Choose",   "Fallthru", 
+        "While", "Do",       "For", 
         "Goto",  "Continue", "Break",  "Return",  "Throw",
         "Try",   "Catch",    "Finally", "Asm",
@@ -62 +62 @@
 StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {
         this->control = ( t == Default ) ? 0 : control;
-}
+} 
 
 StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {}
@@ -74 +74 @@
 
 StatementNode * StatementNode::newCatchStmt( DeclarationNode *d, StatementNode *s, bool catchRestP ) {
-        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s );
+        StatementNode *ret = new StatementNode( StatementNode::Catch, 0, s ); 
         ret->addDeclaration( d );
         ret->setCatchRest( catchRestP );
@@ -101 +101 @@
 StatementNode *StatementNode::add_label( const std::string *l ) {
         if ( l != 0 ) {
-                labels.push_front( *l );
+                labels.push_front( *l ); 
                 delete l;
         } // if
@@ -156 +156 @@
                         control->print( os, indent );
                         os << endl;
-                } else
+                } else 
                         os << string( indent, ' ' ) << "Null Statement" << endl;
                 break;
@@ -177 +177 @@
                 if ( block ) {
                         os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
-                        block->printList( os, indent + 2 * ParseNode::indent_by );
+                        block->printList( os, indent + 2 * ParseNode::indent_by );  
                 } // if
                 if ( target ) {
@@ -258 +258 @@
           case Fallthru:
                 return new FallthruStmt( labs );
-          case Case:
+          case Case: 
                 return new CaseStmt( labs, maybeBuild<Expression>(get_control()), branches );
           case Default:
@@ -394 +394 @@
                 os << string( indent + ParseNode::indent_by, ' ' ) << "Goto Labels:" << endl;
                 os << string( indent + 2 * ParseNode::indent_by, ' ' );
-                for ( std::list<Label>::const_iterator i = gotolabels.begin();; ) {
+                for ( std::list<std::string>::const_iterator i = gotolabels.begin();; ) {
                         os << *i;
                         i++;
@@ -426 +426 @@
 }
 
-Statement *NullStmtNode::build() const {
+Statement *NullStmtNode::build() const { 
         return new NullStmt;
 }

src/ResolvExpr/Resolver.cc

@@ -503 +503 @@
                 delete ctorInit->get_ctor();
                 ctorInit->set_ctor( NULL );
-                delete ctorInit->get_dtor();
-                ctorInit->set_dtor( NULL );
                 maybeAccept( ctorInit->get_init(), *this );
         }

src/SymTab/Autogen.cc

@@ -482 +482 @@
                 ObjectDecl *dst = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), typeInst->clone() ), 0 );
                 if ( typeDecl->get_base() ) {
-                        // xxx - generate ctor/dtors for typedecls, e.g.
-                        // otype T = int *;
                         stmts = new CompoundStmt( std::list< Label >() );
                         UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );

src/SymTab/Autogen.h

@@ -24 +24 @@
 
 namespace SymTab {
+  static const std::list< std::string > noLabels;
+
   /// Generates assignment operators, constructors, and destructor for aggregate types as required
   void autogenerateRoutines( std::list< Declaration * > &translationUnit );

src/SymTab/Indexer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indexer.h --
+// Indexer.h -- 
 //
 // Author           : Richard C. Bilson
@@ -33 +33 @@
                 Indexer& operator= ( Indexer &&that );
 
-                using Visitor::visit;
+                //using Visitor::visit;
                 virtual void visit( ObjectDecl *objectDecl );
                 virtual void visit( FunctionDecl *functionDecl );
@@ -54 +54 @@
                 virtual void visit( MemberExpr *memberExpr );
                 virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr );
+                virtual void visit( ConstantExpr *constantExpr ); 
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
@@ -93 +93 @@
                 /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( const std::string &id ) const;
-
+  
                 void print( std::ostream &os, int indent = 0 ) const;
           private:
@@ -106 +106 @@
                 UnionDecl *lookupUnionAtScope( const std::string &id, unsigned long scope ) const;
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
-
+                
                 void addId( DeclarationWithType *decl );
                 void addType( NamedTypeDecl *decl );
@@ -115 +115 @@
                 void addUnion( UnionDecl *decl );
                 void addTrait( TraitDecl *decl );
-
+                
                 struct Impl;
                 Impl *tables;         ///< Copy-on-write instance of table data structure

src/SynTree/Statement.cc

@@ -87 +87 @@
         Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
         //actually this is a syntactic error signaled by the parser
-        if ( type == BranchStmt::Goto && target.empty() )
+        if ( type == BranchStmt::Goto && target.size() == 0 )
                 throw SemanticError("goto without target");
 }

src/SynTree/Statement.h

@@ -22 +22 @@
 #include "Common/SemanticError.h"
 #include "Type.h"
-#include "Label.h"
 
 class Statement {

src/SynTree/SynTree.h

@@ -113 +113 @@
 class Constant;
 
-// typedef std::string Label;
-class Label;
+typedef std::string Label;
 typedef unsigned int UniqueId;
 

src/SynTree/Visitor.cc

@@ -39 +39 @@
 }
 
-void Visitor::handleAggregateDecl( AggregateDecl *aggregateDecl ) {
+void Visitor::visit( AggregateDecl *aggregateDecl ) {
         acceptAll( aggregateDecl->get_parameters(), *this );
         acceptAll( aggregateDecl->get_members(), *this );
@@ -45 +45 @@
 
 void Visitor::visit( StructDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( UnionDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( EnumDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( TraitDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
-}
-
-void Visitor::handleNamedTypeDecl( NamedTypeDecl *typeDecl ) {
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+}
+
+void Visitor::visit( NamedTypeDecl *typeDecl ) {
         acceptAll( typeDecl->get_parameters(), *this );
         acceptAll( typeDecl->get_assertions(), *this );
@@ -67 +67 @@
 
 void Visitor::visit( TypeDecl *typeDecl ) {
-        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
+        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
 void Visitor::visit( TypedefDecl *typeDecl ) {
-        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
+        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
@@ -330 +330 @@
 }
 
-void Visitor::handleReferenceToType( ReferenceToType *aggregateUseType ) {
+void Visitor::visit( ReferenceToType *aggregateUseType ) {
         acceptAll( aggregateUseType->get_forall(), *this );
         acceptAll( aggregateUseType->get_parameters(), *this );
@@ -336 +336 @@
 
 void Visitor::visit( StructInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( UnionInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( EnumInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( TraitInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
         acceptAll( aggregateUseType->get_members(), *this );
 }
 
 void Visitor::visit( TypeInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 

src/SynTree/Visitor.h

@@ -104 +104 @@
         virtual void visit( Constant *constant );
   private:
-        virtual void handleAggregateDecl( AggregateDecl *aggregateDecl );
-        virtual void handleNamedTypeDecl( NamedTypeDecl *typeDecl );
-        virtual void handleReferenceToType( ReferenceToType *aggregateUseType );
+        virtual void visit( AggregateDecl *aggregateDecl );
+        virtual void visit( NamedTypeDecl *typeDecl );
+        virtual void visit( ReferenceToType *aggregateUseType );
 };
 

src/SynTree/module.mk

@@ -46 +46 @@
        SynTree/Visitor.cc \
        SynTree/Mutator.cc \
-       SynTree/AddStmtVisitor.cc \
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc

src/tests/Makefile.am

@@ -46 +46 @@
 constant0-1NDDP : constant0-1.c
         ${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
-
-dtor-early-exit-ERR1: dtor-early-exit.c
-        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-dtor-early-exit-ERR2: dtor-early-exit.c
-        ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
-

src/tests/Makefile.in

@@ -654 +654 @@
         ${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
 
-dtor-early-exit-ERR1: dtor-early-exit.c
-        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-dtor-early-exit-ERR2: dtor-early-exit.c
-        ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.