Changeset 3403534

Timestamp:

Sep 4, 2016, 10:34:35 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

f04a8b81

Parents:

28307be (diff), b16898e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src

Files:

• ArgTweak/FunctionFixer.cc (deleted)
• ArgTweak/FunctionFixer.h (deleted)
• ArgTweak/Mutate.cc (deleted)
• ArgTweak/Mutate.h (deleted)
• ArgTweak/module.mk (deleted)
• Common/SemanticError.cc (modified) (2 diffs)
• Common/SemanticError.h (modified) (3 diffs)
• Common/utility.h (modified) (1 diff)
• Designators/Processor.cc (deleted)
• Designators/Processor.h (deleted)
• Designators/module.mk (deleted)
• GenPoly/Box.cc (modified) (8 diffs)
• GenPoly/PolyMutator.h (modified) (5 diffs)
• InitTweak/Association.cc (deleted)
• InitTweak/Association.h (deleted)
• InitTweak/BasicInit.cc (deleted)
• InitTweak/BasicInit.h (deleted)
• InitTweak/DeclarationHoister.cc (deleted)
• InitTweak/DeclarationHoister.h (deleted)
• InitTweak/FixInit.cc (modified) (15 diffs)
• InitTweak/GenInit.cc (modified) (9 diffs)
• InitTweak/InitExpander.cc (deleted)
• InitTweak/InitExpander.h (deleted)
• InitTweak/InitModel.cc (deleted)
• InitTweak/InitModel.h (deleted)
• InitTweak/InitTweak.cc (modified) (6 diffs)
• InitTweak/InitTweak.h (modified) (1 diff)
• InitTweak/Mutate.cc (deleted)
• InitTweak/Mutate.h (deleted)
• InitTweak/diet_map.h (deleted)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (21 diffs)
• Parser/ParseNode.cc (modified) (3 diffs)
• Parser/ParseNode.h (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (6 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SymTab/Autogen.cc (modified) (3 diffs)
• SymTab/Autogen.h (modified) (1 diff)
• SymTab/Indexer.cc (modified) (4 diffs)
• SymTab/Indexer.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (7 diffs)
• SynTree/Declaration.cc (modified) (1 diff)
• SynTree/Declaration.h (modified) (1 diff)
• SynTree/Expression.cc (modified) (2 diffs)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/FunctionDecl.cc (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (2 diffs)
• SynTree/Type.cc (modified) (1 diff)
• SynTree/Type.h (modified) (1 diff)
• Tuples/AssignExpand.cc (deleted)
• Tuples/AssignExpand.h (deleted)
• Tuples/FlattenTuple.cc (deleted)
• Tuples/FlattenTuple.h (deleted)
• Tuples/FunctionChecker.cc (deleted)
• Tuples/FunctionChecker.h (deleted)
• Tuples/FunctionFixer.cc (deleted)
• Tuples/FunctionFixer.h (deleted)
• Tuples/MultRet.cc (deleted)
• Tuples/MultRet.h (deleted)
• Tuples/Mutate.cc (deleted)
• Tuples/Mutate.h (deleted)
• Tuples/module.mk (modified) (1 diff)
• tests/.expect/64/declarationSpecifier.txt (modified) (1 diff)
• tests/.expect/64/extension.txt (modified) (1 diff)
• tests/.expect/64/gccExtensions.txt (modified) (5 diffs)
• tests/.expect/ctorWarnings.txt (deleted)
• tests/.expect/memberCtors-ERR1.txt (added)
• tests/.expect/memberCtors.txt (added)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/ctorWarnings.c (deleted)
• tests/memberCtors.c (added)
• tests/test.py (modified) (5 diffs)
• tests/typeof.c (modified) (1 diff)

src/Common/SemanticError.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.cc -- 
+// SemanticError.cc --
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
 
 SemanticError::SemanticError( std::string error ) {
-        errors.push_back( std::string( "Error: " ) + error );
+  append( error );
 }
 
 void SemanticError::append( SemanticError &other ) {
-        errors.splice( errors.end(), other.errors );
+  errors.splice( errors.end(), other.errors );
+}
+
+void SemanticError::append( const std::string & msg ) {
+  errors.push_back( std::string( "Error: ") + msg );
 }
 

src/Common/SemanticError.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.h -- 
+// SemanticError.h --
 //
 // Author           : Richard C. Bilson
@@ -31 +31 @@
 
         void append( SemanticError &other );
+        void append( const std::string & );
         bool isEmpty() const;
         void print( std::ostream &os );
@@ -42 +43 @@
 template< typename T >
 SemanticError::SemanticError( const std::string &error, const T *obj ) {
-        std::ostringstream os;
-        os << "Error: " << error;
-        obj->print( os );
-        errors.push_back( os.str() );
+        append( toString( error, obj ) );
 }
+
 
 #endif // SEMANTICERROR_H

src/Common/utility.h

@@ -246 +246 @@
 }
 
+// RAII object to regulate "save and restore" behaviour, e.g.
+// void Foo::bar() {
+//   ValueGuard<int> guard(var); // var is a member of type Foo
+//   var = ...;
+// } // var's original value is restored
+template< typename T >
+struct ValueGuard {
+        T old;
+        T& ref;
+
+        ValueGuard(T& inRef) : old(inRef), ref(inRef) {}
+        ~ValueGuard() { ref = old; }
+};
+
+template< typename T >
+struct reverseIterate_t {
+        T& ref;
+
+        reverseIterate_t( T & ref ) : ref(ref) {}
+
+        typedef typename T::reverse_iterator iterator;
+        iterator begin() { return ref.rbegin(); }
+        iterator end() { return ref.rend(); }
+};
+
+template< typename T >
+reverseIterate_t< T > reverseIterate( T & ref ) {
+        return reverseIterate_t< T >( ref );
+}
+
 #endif // _UTILITY_H
 

src/GenPoly/Box.cc

@@ -158 +158 @@
                 class PolyGenericCalculator : public PolyMutator {
                 public:
+                        typedef PolyMutator Parent;
+                        using Parent::mutate;
+
                         template< typename DeclClass >
                         DeclClass *handleDecl( DeclClass *decl, Type *type );
@@ -1675 +1678 @@
                 DeclClass * PolyGenericCalculator::handleDecl( DeclClass *decl, Type *type ) {
                         beginTypeScope( type );
+                        // knownLayouts.beginScope();
+                        // knownOffsets.beginScope();
+
+                        DeclClass *ret = static_cast< DeclClass *>( Parent::mutate( decl ) );
+
+                        // knownOffsets.endScope();
+                        // knownLayouts.endScope();
+                        endTypeScope();
+                        return ret;
+                }
+
+                ObjectDecl * PolyGenericCalculator::mutate( ObjectDecl *objectDecl ) {
+                        return handleDecl( objectDecl, objectDecl->get_type() );
+                }
+
+                DeclarationWithType * PolyGenericCalculator::mutate( FunctionDecl *functionDecl ) {
                         knownLayouts.beginScope();
                         knownOffsets.beginScope();
 
-                        DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
-
+                        DeclarationWithType * decl = handleDecl( functionDecl, functionDecl->get_functionType() );
                         knownOffsets.endScope();
                         knownLayouts.endScope();
-                        endTypeScope();
-                        return ret;
-                }
-
-                ObjectDecl * PolyGenericCalculator::mutate( ObjectDecl *objectDecl ) {
-                        return handleDecl( objectDecl, objectDecl->get_type() );
-                }
-
-                DeclarationWithType * PolyGenericCalculator::mutate( FunctionDecl *functionDecl ) {
-                        return handleDecl( functionDecl, functionDecl->get_functionType() );
+                        return decl;
                 }
 
@@ -1700 +1709 @@
                 TypeDecl * PolyGenericCalculator::mutate( TypeDecl *typeDecl ) {
                         scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
-                        return Mutator::mutate( typeDecl );
+                        return Parent::mutate( typeDecl );
                 }
 
@@ -1706 +1715 @@
                         beginTypeScope( pointerType );
 
-                        Type *ret = Mutator::mutate( pointerType );
+                        Type *ret = Parent::mutate( pointerType );
 
                         endTypeScope();
@@ -1724 +1733 @@
                         }
 
-                        Type *ret = Mutator::mutate( funcType );
+                        Type *ret = Parent::mutate( funcType );
 
                         endTypeScope();
@@ -1745 +1754 @@
                                 }
                         }
-                        return Mutator::mutate( declStmt );
+                        return Parent::mutate( declStmt );
                 }
 
@@ -1787 +1796 @@
                 Expression *PolyGenericCalculator::mutate( MemberExpr *memberExpr ) {
                         // mutate, exiting early if no longer MemberExpr
-                        Expression *expr = Mutator::mutate( memberExpr );
+                        Expression *expr = Parent::mutate( memberExpr );
                         memberExpr = dynamic_cast< MemberExpr* >( expr );
                         if ( ! memberExpr ) return expr;
@@ -1972 +1981 @@
                 Expression *PolyGenericCalculator::mutate( OffsetofExpr *offsetofExpr ) {
                         // mutate, exiting early if no longer OffsetofExpr
-                        Expression *expr = Mutator::mutate( offsetofExpr );
+                        Expression *expr = Parent::mutate( offsetofExpr );
                         offsetofExpr = dynamic_cast< OffsetofExpr* >( expr );
                         if ( ! offsetofExpr ) return expr;

src/GenPoly/PolyMutator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PolyMutator.h -- 
+// PolyMutator.h --
 //
 // Author           : Richard C. Bilson
@@ -30 +30 @@
         class PolyMutator : public Mutator {
           public:
+                typedef Mutator Parent;
+                using Parent::mutate;
+
                 PolyMutator();
 
@@ -42 +45 @@
                 virtual Statement* mutate(ExprStmt *catchStmt);
                 virtual Statement* mutate(ReturnStmt *catchStmt);
-  
+
                 virtual Expression* mutate(UntypedExpr *untypedExpr);
 
@@ -54 +57 @@
                 Statement* mutateStatement( Statement *stmt );
                 Expression* mutateExpression( Expression *expr );
-  
+
                 TyVarMap scopeTyVars;
                 TypeSubstitution *env;
@@ -60 +63 @@
                 std::list< Statement* > stmtsToAddAfter;
         };
-} // namespace 
+} // namespace
 
 #endif // _POLYMUTATOR_H

src/InitTweak/FixInit.cc

@@ -31 +31 @@
 #include "SynTree/Mutator.h"
 #include "SymTab/Indexer.h"
+#include "SymTab/Autogen.h"
 #include "GenPoly/PolyMutator.h"
 #include "SynTree/AddStmtVisitor.h"
@@ -176 +177 @@
                 };
 
-                class WarnStructMembers : public Visitor {
+                class GenStructMemberCalls : public SymTab::Indexer {
                   public:
-                        typedef Visitor Parent;
-                        /// warn if a user-defined constructor or destructor is missing calls for
-                        /// a struct member or if a member is used before constructed
-                        static void warnings( std::list< Declaration * > & translationUnit );
+                        typedef Indexer Parent;
+                        /// generate default/copy ctor and dtor calls for user-defined struct ctor/dtors
+                        /// for any member that is missing a corresponding ctor/dtor call.
+                        /// error if a member is used before constructed
+                        static void generate( std::list< Declaration * > & translationUnit );
 
                         virtual void visit( FunctionDecl * funcDecl );
@@ -188 +190 @@
                         virtual void visit( ApplicationExpr * appExpr );
 
+                        SemanticError errors;
                   private:
                         void handleFirstParam( Expression * firstParam );
+                        template< typename... Params >
+                        void emit( const Params &... params );
 
                         FunctionDecl * function = 0;
-                        std::set< DeclarationWithType * > unhandled;
+                        std::set< DeclarationWithType * > unhandled, usedUninit;
                         ObjectDecl * thisParam = 0;
+                        bool isCtor = false; // true if current function is a constructor
+                        StructDecl * structDecl = 0;
+                };
+
+                // very simple resolver-like mutator class - used to
+                // resolve UntypedExprs that are found within newly
+                // generated constructor/destructor calls
+                class MutatingResolver : public Mutator {
+                  public:
+                        MutatingResolver( SymTab::Indexer & indexer ) : indexer( indexer ) {}
+
+                        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl );
+
+                        virtual Expression* mutate( UntypedExpr *untypedExpr );
+                        private:
+                        SymTab::Indexer & indexer;
                 };
         } // namespace
@@ -209 +230 @@
                 FixCopyCtors::fixCopyCtors( translationUnit );
 
-                WarnStructMembers::warnings( translationUnit );
+                GenStructMemberCalls::generate( translationUnit );
         }
 
@@ -254 +275 @@
                 }
 
-                void WarnStructMembers::warnings( std::list< Declaration * > & translationUnit ) {
-                        if ( true ) { // fix this condition to skip this pass if warnings aren't enabled
-                                WarnStructMembers warner;
-                                acceptAll( translationUnit, warner );
+                void GenStructMemberCalls::generate( std::list< Declaration * > & translationUnit ) {
+                        GenStructMemberCalls warner;
+                        acceptAll( translationUnit, warner );
+
+                        // visitor doesn't throw so that it can collect all errors
+                        if ( ! warner.errors.isEmpty() ) {
+                                throw warner.errors;
                         }
                 }
@@ -528 +552 @@
                                                         FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
                                                         dtorCaller->fixUniqueId();
-                                                        dtorCaller->get_statements()->get_kids().push_back( dtorStmt );
+                                                        dtorCaller->get_statements()->push_back( dtorStmt );
 
                                                         // atexit(dtor_atexit);
@@ -543 +567 @@
                                                         // at global scope and there could be multiple function-scoped
                                                         // static variables with the same name in different functions.
+                                                        // Note: it isn't sufficient to modify only the mangleName, because
+                                                        // then subsequent Indexer passes can choke on seeing the object's name
+                                                        // if another object has the same name and type. An unfortunate side-effect
+                                                        // of renaming the object is that subsequent NameExprs may fail to resolve,
+                                                        // but there shouldn't be any remaining past this point.
                                                         static UniqueName staticNamer( "_static_var" );
-                                                        objDecl->set_mangleName( objDecl->get_mangleName() + staticNamer.newName() );
+                                                        objDecl->set_name( objDecl->get_name() + staticNamer.newName() );
+                                                        objDecl->set_mangleName( SymTab::Mangler::mangle( objDecl ) );
 
                                                         objDecl->set_init( NULL );
@@ -709 +739 @@
                 }
 
-                void WarnStructMembers::visit( FunctionDecl * funcDecl ) {
-                        WarnStructMembers old = *this;
-                        *this = WarnStructMembers();
+                void GenStructMemberCalls::visit( FunctionDecl * funcDecl ) {
+                        ValueGuard< FunctionDecl * > oldFunction( funcDecl );
+                        ValueGuard< std::set< DeclarationWithType * > > oldUnhandled( unhandled );
+                        ValueGuard< std::set< DeclarationWithType * > > oldUsedUninit( usedUninit );
+                        ValueGuard< ObjectDecl * > oldThisParam( thisParam );
+                        ValueGuard< bool > oldIsCtor( isCtor );
+                        ValueGuard< StructDecl * > oldStructDecl( structDecl );
+
+                        // need to start with fresh sets
+                        unhandled.clear();
+                        usedUninit.clear();
 
                         function = funcDecl;
-                        if ( checkWarnings( funcDecl ) ) {
-                                FunctionType * type = funcDecl->get_functionType();
+                        isCtor = isConstructor( function->get_name() );
+                        if ( checkWarnings( function ) ) {
+                                FunctionType * type = function->get_functionType();
                                 assert( ! type->get_parameters().empty() );
                                 thisParam = safe_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
@@ -721 +760 @@
                                 StructInstType * structType = dynamic_cast< StructInstType * >( ptrType->get_base() );
                                 if ( structType ) {
-                                        StructDecl * structDecl = structType->get_baseStruct();
+                                        structDecl = structType->get_baseStruct();
                                         for ( Declaration * member : structDecl->get_members() ) {
                                                 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
@@ -731 +770 @@
                                 }
                         }
-                        Parent::visit( funcDecl );
-
-                        for ( DeclarationWithType * member : unhandled ) {
-                                // emit a warning for each unhandled member
-                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" );
+                        Parent::visit( function );
+
+                        // remove the unhandled objects from usedUninit, because a call is inserted
+                        // to handle them - only objects that are later constructed are used uninitialized.
+                        std::set< DeclarationWithType * > diff;
+                        std::set_difference( usedUninit.begin(), usedUninit.end(), unhandled.begin(), unhandled.end(), std::inserter( diff, diff.begin() ) );
+                        for ( DeclarationWithType * member : diff ) {
+                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", member->get_name(), " used before being constructed" );
                         }
 
-                        *this = old;
-                }
-
-                void WarnStructMembers::visit( ApplicationExpr * appExpr ) {
+                        if ( ! unhandled.empty() ) {
+                                // need to explicitly re-add function parameters in order to resolve copy constructors
+                                enterScope();
+                                maybeAccept( function->get_functionType(), *this );
+
+                                // need to iterate through members in reverse in order for
+                                // ctor/dtor statements to come out in the right order
+                                for ( Declaration * member : reverseIterate( structDecl->get_members() ) ) {
+                                        DeclarationWithType * field = dynamic_cast< DeclarationWithType * >( member );
+                                        // skip non-DWT members
+                                        if ( ! field ) continue;
+                                        // skip handled members
+                                        if ( ! unhandled.count( field ) ) continue;
+
+                                        // insert and resolve default/copy constructor call for each field that's unhandled
+                                        std::list< Statement * > stmt;
+                                        UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
+                                        deref->get_args().push_back( new VariableExpr( thisParam ) );
+
+                                        Expression * arg2 = 0;
+                                        if ( isCopyConstructor( function ) ) {
+                                                // if copy ctor, need to pass second-param-of-this-function.field
+                                                std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
+                                                assert( params.size() == 2 );
+                                                arg2 = new MemberExpr( field, new VariableExpr( params.back() ) );
+                                        }
+                                        InitExpander srcParam( arg2 );
+                                        SymTab::genImplicitCall( srcParam, new MemberExpr( field, deref ), function->get_name(), back_inserter( stmt ), field, isCtor );
+
+                                        assert( stmt.size() <= 1 );
+                                        if ( stmt.size() == 1 ) {
+                                                Statement * callStmt = stmt.front();
+
+                                                MutatingResolver resolver( *this );
+                                                try {
+                                                        callStmt->acceptMutator( resolver );
+                                                        if ( isCtor ) {
+                                                                function->get_statements()->push_front( callStmt );
+                                                        } else {
+                                                                // destructor statements should be added at the end
+                                                                function->get_statements()->push_back( callStmt );
+                                                        }
+                                                } catch ( SemanticError & error ) {
+                                                        emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
+                                                }
+                                        }
+                                }
+                                leaveScope();
+                        }
+                }
+
+                void GenStructMemberCalls::visit( ApplicationExpr * appExpr ) {
                         if ( ! checkWarnings( function ) ) return;
 
@@ -760 +850 @@
                                         handleFirstParam( firstParam );
                                 }
-                        } else if ( fname == "?=?" && isIntrinsicCallExpr( appExpr ) ) {
-                                // forgive use of intrinsic assignment to construct, since instrinsic constructors
-                                // codegen as assignment anyway.
-                                assert( appExpr->get_args().size() == 2 );
-                                handleFirstParam( appExpr->get_args().front() );
                         }
 
@@ -770 +855 @@
                 }
 
-                void WarnStructMembers::handleFirstParam( Expression * firstParam ) {
+                void GenStructMemberCalls::handleFirstParam( Expression * firstParam ) {
                         using namespace std;
                         if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( firstParam ) ) {
@@ -787 +872 @@
                 }
 
-                void WarnStructMembers::visit( MemberExpr * memberExpr ) {
+                void GenStructMemberCalls::visit( MemberExpr * memberExpr ) {
                         if ( ! checkWarnings( function ) ) return;
-                        if ( ! isConstructor( function->get_name() ) ) return;
+                        if ( ! isCtor ) return;
 
                         if ( ApplicationExpr * deref = dynamic_cast< ApplicationExpr * >( memberExpr->get_aggregate() ) ) {
@@ -797 +882 @@
                                                         if ( unhandled.count( memberExpr->get_member() ) ) {
                                                                 // emit a warning because a member was used before it was constructed
-                                                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
+                                                                usedUninit.insert( memberExpr->get_member() );
                                                         }
                                                 }
@@ -805 +890 @@
                         Parent::visit( memberExpr );
                 }
+
+                template< typename Visitor, typename... Params >
+                void error( Visitor & v, const Params &... params ) {
+                        v.errors.append( toString( params... ) );
+                }
+
+                template< typename... Params >
+                void GenStructMemberCalls::emit( const Params &... params ) {
+                        // toggle warnings vs. errors here.
+                        // warn( params... );
+                        error( *this, params... );
+                }
+
+                DeclarationWithType * MutatingResolver::mutate( ObjectDecl *objectDecl ) {
+                        // add object to the indexer assumes that there will be no name collisions
+                        // in generated code. If this changes, add mutate methods for entities with
+                        // scope and call {enter,leave}Scope explicitly.
+                        objectDecl->accept( indexer );
+                        return objectDecl;
+                }
+
+                Expression* MutatingResolver::mutate( UntypedExpr *untypedExpr ) {
+                        return safe_dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untypedExpr, indexer ) );
+                }
         } // namespace
 } // namespace InitTweak

src/InitTweak/GenInit.cc

@@ -25 +25 @@
 #include "SynTree/Mutator.h"
 #include "SymTab/Autogen.h"
+#include "SymTab/Mangler.h"
 #include "GenPoly/PolyMutator.h"
 #include "GenPoly/DeclMutator.h"
+#include "GenPoly/ScopedSet.h"
 
 namespace InitTweak {
@@ -55 +57 @@
         class CtorDtor : public GenPoly::PolyMutator {
           public:
+                typedef GenPoly::PolyMutator Parent;
+                using Parent::mutate;
                 /// create constructor and destructor statements for object declarations.
                 /// the actual call statements will be added in after the resolver has run
@@ -65 +69 @@
                 // should not traverse into any of these declarations to find objects
                 // that need to be constructed or destructed
-                virtual Declaration* mutate( StructDecl *aggregateDecl ) { return aggregateDecl; }
+                virtual Declaration* mutate( StructDecl *aggregateDecl );
                 virtual Declaration* mutate( UnionDecl *aggregateDecl ) { return aggregateDecl; }
                 virtual Declaration* mutate( EnumDecl *aggregateDecl ) { return aggregateDecl; }
@@ -74 +78 @@
                 virtual Type * mutate( FunctionType *funcType ) { return funcType; }
 
-          protected:
+                virtual CompoundStmt * mutate( CompoundStmt * compoundStmt );
+
+          private:
+                // set of mangled type names for which a constructor or destructor exists in the current scope.
+                // these types require a ConstructorInit node to be generated, anything else is a POD type and thus
+                // should not have a ConstructorInit generated.
+
+                bool isManaged( ObjectDecl * objDecl ) const ; // determine if object is managed
+                void handleDWT( DeclarationWithType * dwt ); // add type to managed if ctor/dtor
+                GenPoly::ScopedSet< std::string > managedTypes;
+                bool inFunction = false;
         };
 
@@ -142 +156 @@
 
         DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
-                std::list<DeclarationWithType*> oldReturnVals = returnVals;
-                std::string oldFuncName = funcName;
+                ValueGuard< std::list<DeclarationWithType*> > oldReturnVals( returnVals );
+                ValueGuard< std::string > oldFuncName( funcName );
 
                 FunctionType * type = functionDecl->get_functionType();
@@ -149 +163 @@
                 funcName = functionDecl->get_name();
                 DeclarationWithType * decl = Mutator::mutate( functionDecl );
-                returnVals = oldReturnVals;
-                funcName = oldFuncName;
                 return decl;
         }
@@ -197 +209 @@
 
         DeclarationWithType * HoistArrayDimension::mutate( FunctionDecl *functionDecl ) {
-                bool oldInFunc = inFunction;
+                ValueGuard< bool > oldInFunc( inFunction );
                 inFunction = true;
                 DeclarationWithType * decl = Parent::mutate( functionDecl );
-                inFunction = oldInFunc;
                 return decl;
         }
@@ -209 +220 @@
         }
 
+        bool CtorDtor::isManaged( ObjectDecl * objDecl ) const {
+                Type * type = objDecl->get_type();
+                while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+                        type = at->get_base();
+                }
+                return managedTypes.find( SymTab::Mangler::mangle( type ) ) != managedTypes.end();
+        }
+
+        void CtorDtor::handleDWT( DeclarationWithType * dwt ) {
+                // if this function is a user-defined constructor or destructor, mark down the type as "managed"
+                if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && isCtorDtor( dwt->get_name() ) ) {
+                        std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
+                        assert( ! params.empty() );
+                        PointerType * type = safe_dynamic_cast< PointerType * >( params.front()->get_type() );
+                        managedTypes.insert( SymTab::Mangler::mangle( type->get_base() ) );
+                }
+        }
+
         DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
-                // hands off if designated, if @=, or if extern
-                if ( tryConstruct( objDecl ) ) {
+                handleDWT( objDecl );
+                // hands off if @=, extern, builtin, etc.
+                // if global but initializer is not constexpr, always try to construct, since this is not legal C
+                if ( ( tryConstruct( objDecl ) && isManaged( objDecl ) ) || (! inFunction && ! isConstExpr( objDecl->get_init() ) ) ) {
+                        // constructed objects cannot be designated
+                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.", objDecl );
+                        // xxx - constructed objects should not have initializers nested too deeply
+
                         // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor
                         // for each constructable object
@@ -241 +276 @@
                         }
                 }
-                return Mutator::mutate( objDecl );
+                return Parent::mutate( objDecl );
         }
 
         DeclarationWithType * CtorDtor::mutate( FunctionDecl *functionDecl ) {
+                ValueGuard< bool > oldInFunc = inFunction;
+                inFunction = true;
+
+                handleDWT( functionDecl );
+
+                managedTypes.beginScope();
+                // go through assertions and recursively add seen ctor/dtors
+                for ( TypeDecl * tyDecl : functionDecl->get_functionType()->get_forall() ) {
+                        for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) {
+                                assertion = assertion->acceptMutator( *this );
+                        }
+                }
                 // parameters should not be constructed and destructed, so don't mutate FunctionType
                 mutateAll( functionDecl->get_oldDecls(), *this );
                 functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
+
+                managedTypes.endScope();
                 return functionDecl;
         }
+
+        Declaration* CtorDtor::mutate( StructDecl *aggregateDecl ) {
+                // don't construct members, but need to take note if there is a managed member,
+                // because that means that this type is also managed
+                for ( Declaration * member : aggregateDecl->get_members() ) {
+                        if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
+                                if ( isManaged( field ) ) {
+                                        managedTypes.insert( SymTab::Mangler::mangle( aggregateDecl ) );
+                                        break;
+                                }
+                        }
+                }
+                return aggregateDecl;
+        }
+
+        CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
+                managedTypes.beginScope();
+                CompoundStmt * stmt = Parent::mutate( compoundStmt );
+                managedTypes.endScope();
+                return stmt;
+        }
+
 } // namespace InitTweak
 

src/InitTweak/InitTweak.cc

@@ -7 +7 @@
 #include "SynTree/Attribute.h"
 #include "GenPoly/GenPoly.h"
+#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {
@@ -79 +80 @@
         public:
                 ExprImpl( Expression * expr ) : arg( expr ) {}
+
+                ~ExprImpl() { delete arg; }
 
                 virtual std::list< Expression * > next( std::list< Expression * > & indices ) {
@@ -122 +125 @@
 
         void InitExpander::clearArrayIndices() {
+                deleteAll( indices );
                 indices.clear();
         }
@@ -228 +232 @@
                 return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
                         (objDecl->get_init() == NULL ||
-                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() )) &&
-                        ! isDesignated( objDecl->get_init() )
+                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ))
                         && objDecl->get_storageClass() != DeclarationNode::Extern;
         }
@@ -387 +390 @@
                 virtual void visit( ApplicationExpr *applicationExpr ) { isConstExpr = false; }
                 virtual void visit( UntypedExpr *untypedExpr ) { isConstExpr = false; }
-                virtual void visit( NameExpr *nameExpr ) { isConstExpr = false; }
-                virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
+                virtual void visit( NameExpr *nameExpr ) {
+                        // xxx - temporary hack, because 0 and 1 really should be constexprs, even though they technically aren't in Cforall today
+                        if ( nameExpr->get_name() != "0" && nameExpr->get_name() != "1" ) isConstExpr = false;
+                }
+                // virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
+                virtual void visit( AddressExpr *addressExpr ) {
+                        // address of a variable or member expression is constexpr
+                        Expression * arg = addressExpr->get_arg();
+                        if ( ! dynamic_cast< NameExpr * >( arg) && ! dynamic_cast< VariableExpr * >( arg ) && ! dynamic_cast< MemberExpr * >( arg ) && ! dynamic_cast< UntypedMemberExpr * >( arg ) ) isConstExpr = false;
+                }
                 virtual void visit( LabelAddressExpr *labAddressExpr ) { isConstExpr = false; }
                 virtual void visit( UntypedMemberExpr *memberExpr ) { isConstExpr = false; }
                 virtual void visit( MemberExpr *memberExpr ) { isConstExpr = false; }
                 virtual void visit( VariableExpr *variableExpr ) { isConstExpr = false; }
-                virtual void visit( ConstantExpr *constantExpr ) { /* bottom out */ }
                 // these might be okay?
                 // virtual void visit( SizeofExpr *sizeofExpr );
@@ -436 +446 @@
         bool isDestructor( const std::string & str ) { return str == "^?{}"; }
         bool isCtorDtor( const std::string & str ) { return isConstructor( str ) || isDestructor( str ); }
+
+        FunctionDecl * isCopyConstructor( Declaration * decl ) {
+                FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl );
+                if ( ! function ) return 0;
+                if ( ! isConstructor( function->get_name() ) ) return 0;
+                FunctionType * ftype = function->get_functionType();
+                if ( ftype->get_parameters().size() != 2 ) return 0;
+
+                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() ) ) {
+                        return function;
+                } else {
+                        return 0;
+                }
+        }
 }

src/InitTweak/InitTweak.h

@@ -29 +29 @@
         bool isDestructor( const std::string & );
         bool isCtorDtor( const std::string & );
+
+        FunctionDecl * isCopyConstructor( Declaration * decl );
 
         /// transform Initializer into an argument list that can be passed to a call expression

src/Makefile.am

@@ -25 +25 @@
 # Is there a way to use a variable for the directory names?
 
-include ArgTweak/module.mk
 include CodeGen/module.mk
 include Common/module.mk
 include ControlStruct/module.mk
-include Designators/module.mk
 include GenPoly/module.mk
 include InitTweak/module.mk

src/Makefile.in

@@ -22 +22 @@
 ###############################################################################
 
-######################### -*- Mode: Makefile-Gmake -*- ########################
-###############################################################################
-
 #SRC +=  ArgTweak/Rewriter.cc \
 #       ArgTweak/Mutate.cc
-
-######################### -*- Mode: Makefile-Gmake -*- ########################
-###############################################################################
 
 ######################### -*- Mode: Makefile-Gmake -*- ########################
@@ -75 +69 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk \
-        $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk \
-        $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk \
+DIST_COMMON = $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk \
+        $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk \
         $(srcdir)/InitTweak/module.mk $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in $(srcdir)/Parser/module.mk \
@@ -112 +105 @@
         ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) \
         ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT) \
-        Designators/driver_cfa_cpp-Processor.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-Box.$(OBJEXT) \
         GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) \
@@ -196 +188 @@
         SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
         SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-Mutate.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT) \
         Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) \
-        Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT) \
         Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT)
 am_driver_cfa_cpp_OBJECTS = $(am__objects_1)
@@ -374 +362 @@
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
         ControlStruct/ForExprMutator.cc \
-        ControlStruct/LabelTypeChecker.cc Designators/Processor.cc \
-        GenPoly/Box.cc GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
+        ControlStruct/LabelTypeChecker.cc GenPoly/Box.cc \
+        GenPoly/GenPoly.cc GenPoly/PolyMutator.cc \
         GenPoly/ScrubTyVars.cc GenPoly/Lvalue.cc GenPoly/Specialize.cc \
         GenPoly/CopyParams.cc GenPoly/FindFunction.cc \
@@ -413 +401 @@
         SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \
         SynTree/AddStmtVisitor.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
+        SynTree/Attribute.cc Tuples/TupleAssignment.cc \
+        Tuples/NameMatcher.cc
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
@@ -433 +420 @@
 .SUFFIXES:
 .SUFFIXES: .cc .ll .o .obj .yy
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -454 +441 @@
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
-$(srcdir)/ArgTweak/module.mk $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
+$(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -553 +540 @@
         ControlStruct/$(am__dirstamp) \
         ControlStruct/$(DEPDIR)/$(am__dirstamp)
-Designators/$(am__dirstamp):
-        @$(MKDIR_P) Designators
-        @: > Designators/$(am__dirstamp)
-Designators/$(DEPDIR)/$(am__dirstamp):
-        @$(MKDIR_P) Designators/$(DEPDIR)
-        @: > Designators/$(DEPDIR)/$(am__dirstamp)
-Designators/driver_cfa_cpp-Processor.$(OBJEXT):  \
-        Designators/$(am__dirstamp) \
-        Designators/$(DEPDIR)/$(am__dirstamp)
 GenPoly/$(am__dirstamp):
         @$(MKDIR_P) GenPoly
@@ -789 +767 @@
         @$(MKDIR_P) Tuples/$(DEPDIR)
         @: > Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-Mutate.$(OBJEXT): Tuples/$(am__dirstamp) \
-        Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT): Tuples/$(am__dirstamp) \
-        Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT): Tuples/$(am__dirstamp) \
-        Tuples/$(DEPDIR)/$(am__dirstamp)
 Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT):  \
-        Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
-Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT):  \
         Tuples/$(am__dirstamp) Tuples/$(DEPDIR)/$(am__dirstamp)
 Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT): Tuples/$(am__dirstamp) \
@@ -824 +794 @@
         -rm -f ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT)
         -rm -f ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT)
-        -rm -f Designators/driver_cfa_cpp-Processor.$(OBJEXT)
         -rm -f GenPoly/driver_cfa_cpp-Box.$(OBJEXT)
         -rm -f GenPoly/driver_cfa_cpp-CopyParams.$(OBJEXT)
@@ -908 +877 @@
         -rm -f SynTree/driver_cfa_cpp-Visitor.$(OBJEXT)
         -rm -f SynTree/driver_cfa_cpp-VoidType.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT)
-        -rm -f Tuples/driver_cfa_cpp-Mutate.$(OBJEXT)
         -rm -f Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT)
         -rm -f Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT)
@@ -934 +899 @@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-MLEMutator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ControlStruct/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@GenPoly/$(DEPDIR)/driver_cfa_cpp-CopyParams.Po@am__quote@
@@ -1018 +982 @@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-VoidType.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-NameMatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Po@am__quote@
@@ -1265 +1225 @@
 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -c -o ControlStruct/driver_cfa_cpp-LabelTypeChecker.obj `if test -f 'ControlStruct/LabelTypeChecker.cc'; then $(CYGPATH_W) 'ControlStruct/LabelTypeChecker.cc'; else $(CYGPATH_W) '$(srcdir)/ControlStruct/LabelTypeChecker.cc'; fi`
 
-Designators/driver_cfa_cpp-Processor.o: Designators/Processor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Designators/driver_cfa_cpp-Processor.o -MD -MP -MF Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo -c -o Designators/driver_cfa_cpp-Processor.o `test -f 'Designators/Processor.cc' || echo '$(srcdir)/'`Designators/Processor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Designators/Processor.cc' object='Designators/driver_cfa_cpp-Processor.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 Designators/driver_cfa_cpp-Processor.o `test -f 'Designators/Processor.cc' || echo '$(srcdir)/'`Designators/Processor.cc
-
-Designators/driver_cfa_cpp-Processor.obj: Designators/Processor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Designators/driver_cfa_cpp-Processor.obj -MD -MP -MF Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo -c -o Designators/driver_cfa_cpp-Processor.obj `if test -f 'Designators/Processor.cc'; then $(CYGPATH_W) 'Designators/Processor.cc'; else $(CYGPATH_W) '$(srcdir)/Designators/Processor.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Tpo Designators/$(DEPDIR)/driver_cfa_cpp-Processor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Designators/Processor.cc' object='Designators/driver_cfa_cpp-Processor.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 Designators/driver_cfa_cpp-Processor.obj `if test -f 'Designators/Processor.cc'; then $(CYGPATH_W) 'Designators/Processor.cc'; else $(CYGPATH_W) '$(srcdir)/Designators/Processor.cc'; fi`
-
 GenPoly/driver_cfa_cpp-Box.o: GenPoly/Box.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT GenPoly/driver_cfa_cpp-Box.o -MD -MP -MF GenPoly/$(DEPDIR)/driver_cfa_cpp-Box.Tpo -c -o GenPoly/driver_cfa_cpp-Box.o `test -f 'GenPoly/Box.cc' || echo '$(srcdir)/'`GenPoly/Box.cc
@@ -2441 +2387 @@
 @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-Attribute.obj `if test -f 'SynTree/Attribute.cc'; then $(CYGPATH_W) 'SynTree/Attribute.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Attribute.cc'; fi`
 
-Tuples/driver_cfa_cpp-Mutate.o: Tuples/Mutate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-Mutate.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o Tuples/driver_cfa_cpp-Mutate.o `test -f 'Tuples/Mutate.cc' || echo '$(srcdir)/'`Tuples/Mutate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/Mutate.cc' object='Tuples/driver_cfa_cpp-Mutate.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 Tuples/driver_cfa_cpp-Mutate.o `test -f 'Tuples/Mutate.cc' || echo '$(srcdir)/'`Tuples/Mutate.cc
-
-Tuples/driver_cfa_cpp-Mutate.obj: Tuples/Mutate.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-Mutate.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo -c -o Tuples/driver_cfa_cpp-Mutate.obj `if test -f 'Tuples/Mutate.cc'; then $(CYGPATH_W) 'Tuples/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/Mutate.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-Mutate.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/Mutate.cc' object='Tuples/driver_cfa_cpp-Mutate.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 Tuples/driver_cfa_cpp-Mutate.obj `if test -f 'Tuples/Mutate.cc'; then $(CYGPATH_W) 'Tuples/Mutate.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/Mutate.cc'; fi`
-
-Tuples/driver_cfa_cpp-AssignExpand.o: Tuples/AssignExpand.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-AssignExpand.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo -c -o Tuples/driver_cfa_cpp-AssignExpand.o `test -f 'Tuples/AssignExpand.cc' || echo '$(srcdir)/'`Tuples/AssignExpand.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/AssignExpand.cc' object='Tuples/driver_cfa_cpp-AssignExpand.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 Tuples/driver_cfa_cpp-AssignExpand.o `test -f 'Tuples/AssignExpand.cc' || echo '$(srcdir)/'`Tuples/AssignExpand.cc
-
-Tuples/driver_cfa_cpp-AssignExpand.obj: Tuples/AssignExpand.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-AssignExpand.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo -c -o Tuples/driver_cfa_cpp-AssignExpand.obj `if test -f 'Tuples/AssignExpand.cc'; then $(CYGPATH_W) 'Tuples/AssignExpand.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/AssignExpand.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-AssignExpand.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/AssignExpand.cc' object='Tuples/driver_cfa_cpp-AssignExpand.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 Tuples/driver_cfa_cpp-AssignExpand.obj `if test -f 'Tuples/AssignExpand.cc'; then $(CYGPATH_W) 'Tuples/AssignExpand.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/AssignExpand.cc'; fi`
-
-Tuples/driver_cfa_cpp-FunctionFixer.o: Tuples/FunctionFixer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionFixer.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo -c -o Tuples/driver_cfa_cpp-FunctionFixer.o `test -f 'Tuples/FunctionFixer.cc' || echo '$(srcdir)/'`Tuples/FunctionFixer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionFixer.cc' object='Tuples/driver_cfa_cpp-FunctionFixer.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 Tuples/driver_cfa_cpp-FunctionFixer.o `test -f 'Tuples/FunctionFixer.cc' || echo '$(srcdir)/'`Tuples/FunctionFixer.cc
-
-Tuples/driver_cfa_cpp-FunctionFixer.obj: Tuples/FunctionFixer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionFixer.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo -c -o Tuples/driver_cfa_cpp-FunctionFixer.obj `if test -f 'Tuples/FunctionFixer.cc'; then $(CYGPATH_W) 'Tuples/FunctionFixer.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionFixer.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionFixer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionFixer.cc' object='Tuples/driver_cfa_cpp-FunctionFixer.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 Tuples/driver_cfa_cpp-FunctionFixer.obj `if test -f 'Tuples/FunctionFixer.cc'; then $(CYGPATH_W) 'Tuples/FunctionFixer.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionFixer.cc'; fi`
-
 Tuples/driver_cfa_cpp-TupleAssignment.o: Tuples/TupleAssignment.cc
 @am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-TupleAssignment.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-TupleAssignment.Tpo -c -o Tuples/driver_cfa_cpp-TupleAssignment.o `test -f 'Tuples/TupleAssignment.cc' || echo '$(srcdir)/'`Tuples/TupleAssignment.cc
@@ -2496 +2400 @@
 @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 Tuples/driver_cfa_cpp-TupleAssignment.obj `if test -f 'Tuples/TupleAssignment.cc'; then $(CYGPATH_W) 'Tuples/TupleAssignment.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/TupleAssignment.cc'; fi`
-
-Tuples/driver_cfa_cpp-FunctionChecker.o: Tuples/FunctionChecker.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionChecker.o -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo -c -o Tuples/driver_cfa_cpp-FunctionChecker.o `test -f 'Tuples/FunctionChecker.cc' || echo '$(srcdir)/'`Tuples/FunctionChecker.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionChecker.cc' object='Tuples/driver_cfa_cpp-FunctionChecker.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 Tuples/driver_cfa_cpp-FunctionChecker.o `test -f 'Tuples/FunctionChecker.cc' || echo '$(srcdir)/'`Tuples/FunctionChecker.cc
-
-Tuples/driver_cfa_cpp-FunctionChecker.obj: Tuples/FunctionChecker.cc
-@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) -MT Tuples/driver_cfa_cpp-FunctionChecker.obj -MD -MP -MF Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo -c -o Tuples/driver_cfa_cpp-FunctionChecker.obj `if test -f 'Tuples/FunctionChecker.cc'; then $(CYGPATH_W) 'Tuples/FunctionChecker.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionChecker.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Tpo Tuples/$(DEPDIR)/driver_cfa_cpp-FunctionChecker.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='Tuples/FunctionChecker.cc' object='Tuples/driver_cfa_cpp-FunctionChecker.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 Tuples/driver_cfa_cpp-FunctionChecker.obj `if test -f 'Tuples/FunctionChecker.cc'; then $(CYGPATH_W) 'Tuples/FunctionChecker.cc'; else $(CYGPATH_W) '$(srcdir)/Tuples/FunctionChecker.cc'; fi`
 
 Tuples/driver_cfa_cpp-NameMatcher.o: Tuples/NameMatcher.cc
@@ -2654 +2544 @@
         -rm -f ControlStruct/$(DEPDIR)/$(am__dirstamp)
         -rm -f ControlStruct/$(am__dirstamp)
-        -rm -f Designators/$(DEPDIR)/$(am__dirstamp)
-        -rm -f Designators/$(am__dirstamp)
         -rm -f GenPoly/$(DEPDIR)/$(am__dirstamp)
         -rm -f GenPoly/$(am__dirstamp)
@@ -2685 +2573 @@
 
 distclean: distclean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) Designators/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -2731 +2619 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) Designators/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) Common/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -2766 +2654 @@
 
 
-#SRC +=  ArgTweak/Rewriter.cc \
-#       ArgTweak/Mutate.cc
-
-#       Tuples/MultipleAssign.cc \
-#       Tuples/FlattenTuple.cc \
-#       Tuples/MultRet.cc \
-#       Tuples/FixReturn.cc \
-#       Tuples/MassAssignment.cc \
-#       Tuples/TupleFixer.cc
-
 # 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.

src/Parser/ParseNode.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ParseNode.cc -- 
+// ParseNode.cc --
 //
 // Author           : Rodolfo G. Esteves
@@ -12 +12 @@
 // Last Modified On : Wed Aug 17 23:14:16 2016
 // Update Count     : 126
-// 
+//
 
 #include "ParseNode.h"
@@ -19 +19 @@
 int ParseNode::indent_by = 4;
 
+std::ostream & operator<<( std::ostream & out, const ParseNode * node ) {
+  node->print( out );
+  return out;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/ParseNode.h

@@ -431 +431 @@
 }
 
+// in ParseNode.cc
+std::ostream & operator<<( std::ostream & out, const ParseNode * node );
 
 #endif // PARSENODE_H

src/ResolvExpr/AlternativeFinder.cc

@@ -38 +38 @@
 #include "SynTree/TypeSubstitution.h"
 #include "SymTab/Validate.h"
-#include "Designators/Processor.h"
 #include "Tuples/TupleAssignment.h"
 #include "Tuples/NameMatcher.h"
 #include "Common/utility.h"
 #include "InitTweak/InitTweak.h"
+#include "ResolveTypeof.h"
 
 extern bool resolvep;
@@ -708 +708 @@
         void AlternativeFinder::visit( CastExpr *castExpr ) {
                 for ( std::list< Type* >::iterator i = castExpr->get_results().begin(); i != castExpr->get_results().end(); ++i ) {
+                        *i = resolveTypeof( *i, indexer );
                         SymTab::validateType( *i, &indexer );
                         adjustExprType( *i, env, indexer );
@@ -796 +797 @@
 
         void AlternativeFinder::visit( VariableExpr *variableExpr ) {
-                alternatives.push_back( Alternative( variableExpr->clone(), env, Cost::zero ) );
+                // not sufficient to clone here, because variable's type may have changed
+                // since the VariableExpr was originally created.
+                alternatives.push_back( Alternative( new VariableExpr( variableExpr->get_var() ), env, Cost::zero ) );
         }
 
@@ -805 +808 @@
         void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
                 if ( sizeofExpr->get_isType() ) {
+                        // xxx - resolveTypeof?
                         alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
                 } else {
@@ -824 +828 @@
         void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
                 if ( alignofExpr->get_isType() ) {
+                        // xxx - resolveTypeof?
                         alternatives.push_back( Alternative( alignofExpr->clone(), env, Cost::zero ) );
                 } else {
@@ -857 +862 @@
         void AlternativeFinder::visit( UntypedOffsetofExpr *offsetofExpr ) {
                 AlternativeFinder funcFinder( indexer, env );
+                // xxx - resolveTypeof?
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
                         addOffsetof( structInst, offsetofExpr->get_member() );

src/ResolvExpr/Resolver.cc

@@ -528 +528 @@
 
         void Resolver::visit( ConstructorInit *ctorInit ) {
-                try {
-                        maybeAccept( ctorInit->get_ctor(), *this );
-                        maybeAccept( ctorInit->get_dtor(), *this );
-                } catch ( SemanticError ) {
-                        // no alternatives for the constructor initializer - fallback on C-style initializer
-                        // xxx - not sure if this makes a ton of sense - should maybe never be able to have this situation?
-                        fallbackInit( ctorInit );
-                        return;
-                }
+                // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit
+                maybeAccept( ctorInit->get_ctor(), *this );
+                maybeAccept( ctorInit->get_dtor(), *this );
 
                 // found a constructor - can get rid of C-style initializer

src/SymTab/Autogen.cc

@@ -64 +64 @@
 
         template< typename OutputIterator >
-        void makeUnionFieldsAssignment( ObjectDecl *srcParam, ObjectDecl *dstParam, UnionInstType *unionType, OutputIterator out ) {
+        void makeUnionFieldsAssignment( ObjectDecl *srcParam, ObjectDecl *dstParam, OutputIterator out ) {
                 UntypedExpr *copy = new UntypedExpr( new NameExpr( "__builtin_memcpy" ) );
                 copy->get_args().push_back( new VariableExpr( dstParam ) );
@@ -413 +413 @@
                 dtorDecl->fixUniqueId();
 
-                makeUnionFieldsAssignment( srcParam, dstParam, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) );
-                if ( isDynamicLayout ) makeUnionFieldsAssignment( srcParam, returnVal, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) );
+                makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( assignDecl->get_statements()->get_kids() ) );
+                if ( isDynamicLayout ) makeUnionFieldsAssignment( srcParam, returnVal, back_inserter( assignDecl->get_statements()->get_kids() ) );
                 else assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
 
@@ -434 +434 @@
                                 ctor->fixUniqueId();
 
-                                makeUnionFieldsAssignment( srcParam, dstParam, cloneWithParams( refType, unionParams ), back_inserter( ctor->get_statements()->get_kids() ) );
+                                makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( ctor->get_statements()->get_kids() ) );
                                 memCtors.push_back( ctor );
                                 // only generate a ctor for the first field

src/SymTab/Autogen.h

@@ -102 +102 @@
                 }
 
-                ObjectDecl *index = new ObjectDecl( indexName.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), NULL );
-
-                UntypedExpr *init = new UntypedExpr( new NameExpr( "?=?" ) );
-                init->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
-                init->get_args().push_back( begin );
-                index->set_init( new SingleInit( init, std::list<Expression*>() ) );
+                ObjectDecl *index = new ObjectDecl( indexName.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), new SingleInit( begin, std::list<Expression*>() ) );
 
                 UntypedExpr *cond = new UntypedExpr( cmp );

src/SymTab/Indexer.cc

@@ -21 +21 @@
 #include <unordered_set>
 #include <utility>
+#include <algorithm>
 
 #include "Mangler.h"
@@ -33 +34 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Statement.h"
+
+#include "InitTweak/InitTweak.h"
 
 #define debugPrint(x) if ( doDebug ) { std::cout << x; }
@@ -99 +102 @@
 
                 if ( --toFree->refCount == 0 ) delete toFree;
+        }
+
+        void Indexer::removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const {
+                // only need to perform this step for constructors and destructors
+                if ( ! InitTweak::isCtorDtor( id ) ) return;
+
+                // helpful data structure
+                struct ValueType {
+                        struct DeclBall {
+                                FunctionDecl * decl;
+                                bool isUserDefinedFunc; // properties for this particular decl
+                                bool isDefaultFunc;
+                                bool isCopyFunc;
+                        };
+                        // properties for this type
+                        bool userDefinedFunc = false; // any user defined function found
+                        bool userDefinedDefaultFunc = false; // user defined default ctor found
+                        bool userDefinedCopyFunc = false; // user defined copy ctor found
+                        std::list< DeclBall > decls;
+
+                        // another FunctionDecl for the current type was found - determine
+                        // if it has special properties and update data structure accordingly
+                        ValueType & operator+=( FunctionDecl * function ) {
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
+                                bool isDefaultFunc = function->get_functionType()->get_parameters().size() == 1;
+                                bool isCopyFunc = InitTweak::isCopyConstructor( function );
+                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultFunc, isCopyFunc } );
+                                userDefinedFunc = userDefinedFunc || isUserDefinedFunc;
+                                userDefinedDefaultFunc = userDefinedDefaultFunc || (isUserDefinedFunc && isDefaultFunc);
+                                userDefinedCopyFunc = userDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
+                                return *this;
+                        }
+                }; // ValueType
+
+                std::list< DeclarationWithType * > copy;
+                copy.splice( copy.end(), out );
+
+                // organize discovered declarations by type
+                std::unordered_map< std::string, ValueType > funcMap;
+                for ( DeclarationWithType * decl : copy ) {
+                        if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl ) ) {
+                                std::list< DeclarationWithType * > params = function->get_functionType()->get_parameters();
+                                assert( ! params.empty() );
+                                funcMap[ Mangler::mangle( params.front()->get_type() ) ] += function;
+                        } else {
+                                out.push_back( decl );
+                        }
+                }
+
+                // if a type contains user defined ctor/dtors, then special rules trigger, which determine
+                // the set of ctor/dtors that are seen by the requester. In particular, if the user defines
+                // a default ctor, then the generated default ctor should never be seen, likewise for copy ctor
+                // and dtor. If the user defines any ctor/dtor, then no generated field ctors should be seen.
+                for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
+                        ValueType & val = pair.second;
+                        for ( ValueType::DeclBall ball : val.decls ) {
+                                if ( ! val.userDefinedFunc || ball.isUserDefinedFunc || (! val.userDefinedDefaultFunc && ball.isDefaultFunc) || (! val.userDefinedCopyFunc && ball.isCopyFunc) ) {
+                                        // decl conforms to the rules described above, so it should be seen by the requester
+                                        out.push_back( ball.decl );
+                                }
+                        }
+                }
         }
 
@@ -461 +526 @@
                         searchTables = searchTables->base.tables;
                 }
+
+                // some special functions, e.g. constructors and destructors
+                // remove autogenerated functions when they are defined so that
+                // they can never be matched
+                removeSpecialOverrides( id, out );
         }
 

src/SymTab/Indexer.h

@@ -128 +128 @@
                 static void deleteRef( Impl *toFree );
 
+                // Removes matching autogenerated constructors and destructors
+                // so that they will not be selected
+                // void removeSpecialOverrides( FunctionDecl *decl );
+                void removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const;
+
                 /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
                 void makeWritable();

src/SymTab/Validate.cc

@@ -86 +86 @@
 
         /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers.
-        class Pass1 : public Visitor {
+        class EnumAndPointerDecayPass : public Visitor {
                 typedef Visitor Parent;
                 virtual void visit( EnumDecl *aggregateDecl );
@@ -189 +189 @@
 
         void validate( std::list< Declaration * > &translationUnit, bool doDebug ) {
-                Pass1 pass1;
+                EnumAndPointerDecayPass epc;
                 Pass2 pass2( doDebug, 0 );
                 Pass3 pass3( 0 );
@@ -196 +196 @@
                 EliminateTypedef::eliminateTypedef( translationUnit );
                 HoistStruct::hoistStruct( translationUnit );
-                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs Pass1
-                acceptAll( translationUnit, pass1 );
+                autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
+                acceptAll( translationUnit, epc );
                 acceptAll( translationUnit, pass2 );
                 ReturnChecker::checkFunctionReturns( translationUnit );
@@ -206 +206 @@
 
         void validateType( Type *type, const Indexer *indexer ) {
-                Pass1 pass1;
+                EnumAndPointerDecayPass epc;
                 Pass2 pass2( false, indexer );
                 Pass3 pass3( indexer );
-                type->accept( pass1 );
+                type->accept( epc );
                 type->accept( pass2 );
                 type->accept( pass3 );
@@ -272 +272 @@
         }
 
-        void Pass1::visit( EnumDecl *enumDecl ) {
+        void EnumAndPointerDecayPass::visit( EnumDecl *enumDecl ) {
                 // Set the type of each member of the enumeration to be EnumConstant
                 for ( std::list< Declaration * >::iterator i = enumDecl->get_members().begin(); i != enumDecl->get_members().end(); ++i ) {
@@ -296 +296 @@
                                 DWTIterator j = i;
                                 ++i;
+                                delete *j;
                                 dwts.erase( j );
                                 if ( i != end ) {
@@ -313 +314 @@
         }
 
-        void Pass1::visit( FunctionType *func ) {
+        void EnumAndPointerDecayPass::visit( FunctionType *func ) {
                 // Fix up parameters and return types
                 fixFunctionList( func->get_parameters(), func );

src/SynTree/Declaration.cc

@@ -56 +56 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Declaration * decl ) {
+std::ostream & operator<<( std::ostream & out, const Declaration * decl ) {
         decl->print( out );
         return out;

src/SynTree/Declaration.h

@@ -279 +279 @@
 };
 
-std::ostream & operator<<( std::ostream & out, Declaration * decl );
+std::ostream & operator<<( std::ostream & out, const Declaration * decl );
 
 #endif // DECLARATION_H

src/SynTree/Expression.cc

@@ -358 +358 @@
         assert( member );
         os << std::string( indent + 2, ' ' );
-        os << (void*)member << " ";
         member->print( os, indent + 2 );
         os << std::endl;
@@ -541 +540 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Expression * expr ) {
+std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         expr->print( out );
         return out;

src/SynTree/Expression.h

@@ -653 +653 @@
 };
 
-std::ostream & operator<<( std::ostream & out, Expression * expr );
+std::ostream & operator<<( std::ostream & out, const Expression * expr );
 
 #endif // EXPRESSION_H

src/SynTree/FunctionDecl.cc

@@ -21 +21 @@
 #include "Attribute.h"
 #include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )

src/SynTree/Statement.cc

@@ -387 +387 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Statement * statement ) {
+std::ostream & operator<<( std::ostream & out, const Statement * statement ) {
         statement->print( out );
         return out;

src/SynTree/Statement.h

@@ -47 +47 @@
 
         std::list<Statement*>& get_kids() { return kids; }
+        void push_back( Statement * stmt ) { kids.push_back( stmt ); }
+        void push_front( Statement * stmt ) { kids.push_front( stmt ); }
 
         virtual CompoundStmt *clone() const { return new CompoundStmt( *this ); }
@@ -395 +397 @@
 
 
-std::ostream & operator<<( std::ostream & out, Statement * statement );
+std::ostream & operator<<( std::ostream & out, const Statement * statement );
 
 #endif // STATEMENT_H

src/SynTree/Type.cc

@@ -84 +84 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Type * type ) {
+std::ostream & operator<<( std::ostream & out, const Type * type ) {
         type->print( out );
         return out;

src/SynTree/Type.h

@@ -481 +481 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Type * type );
+std::ostream & operator<<( std::ostream & out, const Type * type );
 
 #endif // TYPE_H

src/Tuples/module.mk

@@ -15 +15 @@
 ###############################################################################
 
-SRC +=  Tuples/Mutate.cc \
-        Tuples/AssignExpand.cc \
-        Tuples/FunctionFixer.cc \
-        Tuples/TupleAssignment.cc \
-        Tuples/FunctionChecker.cc \
+SRC +=  Tuples/TupleAssignment.cc \
         Tuples/NameMatcher.cc
-
-#       Tuples/MultipleAssign.cc \
-#       Tuples/FlattenTuple.cc \
-#       Tuples/MultRet.cc \
-#       Tuples/FixReturn.cc \
-#       Tuples/MassAssignment.cc \
-#       Tuples/TupleFixer.cc

src/tests/.expect/64/declarationSpecifier.txt

@@ -530 +530 @@
     return ((int )_retVal0);
 }
-__attribute__ ((constructor(),)) static void _init_declarationSpecifier(void){
-    ((void)___constructor__F_P13s__anonymous0_autogen___1(((struct __anonymous0 *)(&__x10__CV13s__anonymous0_1))));
-    ((void)___constructor__F_P13s__anonymous1_autogen___1(((struct __anonymous1 *)(&__x11__CV13s__anonymous1_1))));
-    ((void)___constructor__F_P13s__anonymous2_autogen___1(((struct __anonymous2 *)(&__x12__CV13s__anonymous2_1))));
-    ((void)___constructor__F_P13s__anonymous3_autogen___1(((struct __anonymous3 *)(&__x13__CV13s__anonymous3_1))));
-    ((void)___constructor__F_P13s__anonymous4_autogen___1(((struct __anonymous4 *)(&__x14__CV13s__anonymous4_1))));
-    ((void)___constructor__F_P13s__anonymous5_autogen___1(((struct __anonymous5 *)(&__x15__CV13s__anonymous5_1))));
-    ((void)___constructor__F_P13s__anonymous6_autogen___1(((struct __anonymous6 *)(&__x16__CV13s__anonymous6_1))));
-    ((void)___constructor__F_P13s__anonymous7_autogen___1(((struct __anonymous7 *)(&__x17__CV13s__anonymous7_1))));
-    ((void)___constructor__F_P13s__anonymous8_autogen___1(((struct __anonymous8 *)(&__x29__CV13s__anonymous8_1))));
-    ((void)___constructor__F_P13s__anonymous9_autogen___1(((struct __anonymous9 *)(&__x30__CV13s__anonymous9_1))));
-    ((void)___constructor__F_P14s__anonymous10_autogen___1(((struct __anonymous10 *)(&__x31__CV14s__anonymous10_1))));
-    ((void)___constructor__F_P14s__anonymous11_autogen___1(((struct __anonymous11 *)(&__x32__CV14s__anonymous11_1))));
-    ((void)___constructor__F_P14s__anonymous12_autogen___1(((struct __anonymous12 *)(&__x33__CV14s__anonymous12_1))));
-    ((void)___constructor__F_P14s__anonymous13_autogen___1(((struct __anonymous13 *)(&__x34__CV14s__anonymous13_1))));
-    ((void)___constructor__F_P14s__anonymous14_autogen___1(((struct __anonymous14 *)(&__x35__CV14s__anonymous14_1))));
-    ((void)___constructor__F_P14s__anonymous15_autogen___1(((struct __anonymous15 *)(&__x36__CV14s__anonymous15_1))));
-}
-__attribute__ ((destructor(),)) static void _destroy_declarationSpecifier(void){
-    ((void)___destructor__F_P14s__anonymous15_autogen___1(((struct __anonymous15 *)(&__x36__CV14s__anonymous15_1))));
-    ((void)___destructor__F_P14s__anonymous14_autogen___1(((struct __anonymous14 *)(&__x35__CV14s__anonymous14_1))));
-    ((void)___destructor__F_P14s__anonymous13_autogen___1(((struct __anonymous13 *)(&__x34__CV14s__anonymous13_1))));
-    ((void)___destructor__F_P14s__anonymous12_autogen___1(((struct __anonymous12 *)(&__x33__CV14s__anonymous12_1))));
-    ((void)___destructor__F_P14s__anonymous11_autogen___1(((struct __anonymous11 *)(&__x32__CV14s__anonymous11_1))));
-    ((void)___destructor__F_P14s__anonymous10_autogen___1(((struct __anonymous10 *)(&__x31__CV14s__anonymous10_1))));
-    ((void)___destructor__F_P13s__anonymous9_autogen___1(((struct __anonymous9 *)(&__x30__CV13s__anonymous9_1))));
-    ((void)___destructor__F_P13s__anonymous8_autogen___1(((struct __anonymous8 *)(&__x29__CV13s__anonymous8_1))));
-    ((void)___destructor__F_P13s__anonymous7_autogen___1(((struct __anonymous7 *)(&__x17__CV13s__anonymous7_1))));
-    ((void)___destructor__F_P13s__anonymous6_autogen___1(((struct __anonymous6 *)(&__x16__CV13s__anonymous6_1))));
-    ((void)___destructor__F_P13s__anonymous5_autogen___1(((struct __anonymous5 *)(&__x15__CV13s__anonymous5_1))));
-    ((void)___destructor__F_P13s__anonymous4_autogen___1(((struct __anonymous4 *)(&__x14__CV13s__anonymous4_1))));
-    ((void)___destructor__F_P13s__anonymous3_autogen___1(((struct __anonymous3 *)(&__x13__CV13s__anonymous3_1))));
-    ((void)___destructor__F_P13s__anonymous2_autogen___1(((struct __anonymous2 *)(&__x12__CV13s__anonymous2_1))));
-    ((void)___destructor__F_P13s__anonymous1_autogen___1(((struct __anonymous1 *)(&__x11__CV13s__anonymous1_1))));
-    ((void)___destructor__F_P13s__anonymous0_autogen___1(((struct __anonymous0 *)(&__x10__CV13s__anonymous0_1))));
-}

src/tests/.expect/64/extension.txt

@@ -86 +86 @@
         __extension__ int __c__i_2;
     };
-    int __i__i_2;
-    ((void)((*((int *)(&__i__i_2)))=(__extension__ __a__i_1+__extension__ 3)) /* ?{} */);
+    int __i__i_2 = ((int )(__extension__ __a__i_1+__extension__ 3));
     ((void)__extension__ 3);
     ((void)__extension__ __a__i_1);

src/tests/.expect/64/gccExtensions.txt

@@ -76 +76 @@
         ((void)((*((int *)(&(*___dst__P2sS_2).__c__i_2)))=__c__i_2) /* ?{} */);
     }
-    int __i__i_2;
-    ((void)((*((int *)(&__i__i_2)))=__extension__ 3) /* ?{} */);
+    int __i__i_2 = ((int )__extension__ 3);
     __extension__ int __a__i_2;
     __extension__ int __b__i_2;
@@ -133 +132 @@
     }
     struct s3 __x1__3ss3_2;
-    ((void)___constructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
     struct s3 __y1__3ss3_2;
-    ((void)___constructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
     struct s4 {
         int __i__i_2;
@@ -141 +138 @@
     inline struct s4 ___operator_assign__F3ss4_P3ss43ss4_autogen___2(struct s4 *___dst__P3ss4_2, struct s4 ___src__3ss4_2){
         ((void)((*___dst__P3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2));
-        ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
-        ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
         return ((struct s4 )___src__3ss4_2);
     }
@@ -158 +153 @@
     }
     struct s4 __x2__3ss4_2;
-    ((void)___constructor__F_P3ss4_autogen___2(((struct s4 *)(&__x2__3ss4_2))));
     struct s4 __y2__3ss4_2;
-    ((void)___constructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
     int __m1__A0i_2[((long unsigned int )10)];
     int __m2__A0A0i_2[((long unsigned int )10)][((long unsigned int )10)];
@@ -166 +159 @@
     int _retVal0 = { 0 };
     ((void)(_retVal0=0) /* ?{} */);
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__x2__3ss4_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
     return ((int )_retVal0);
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__y2__3ss4_2))));
-    ((void)___destructor__F_P3ss4_autogen___2(((struct s4 *)(&__x2__3ss4_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__y1__3ss3_2))));
-    ((void)___destructor__F_P3ss3_autogen___2(((struct s3 *)(&__x1__3ss3_2))));
 }

src/tests/Makefile.am

@@ -62 +62 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
-ctorWarnings: ctorWarnings.c
-        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o /dev/null 2> ${@}
+memberCtors-ERR1: memberCtors.c
+        ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
 

src/tests/Makefile.in

@@ -670 +670 @@
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
-ctorWarnings: ctorWarnings.c
-        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o /dev/null 2> ${@}
+memberCtors-ERR1: memberCtors.c
+        ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/test.py

@@ -2 +2 @@
 from __future__ import print_function
 
+from functools import partial
+from multiprocessing import Pool
 from os import listdir, environ
 from os.path import isfile, join, splitext
@@ -102 +104 @@
 #               running test functions
 ################################################################################
-def run_test_instance(test, generate, dry_run):
+def run_single_test(test, generate, dry_run):
 
         # find the output file based on the test name and options flag
@@ -163 +165 @@
         return retcode, error
 
+def run_test_instance(t, generate, dry_run) :
+        # print formated name
+        name_txt = "%20s  " % t.name
+
+        #run the test instance and collect the result
+        test_failed, error = run_single_test(t, generate, dry_run)
+
+        # update output based on current action
+        if generate :
+                failed_txt = "ERROR"
+                success_txt = "Done"
+        else :
+                failed_txt = "FAILED"
+                success_txt = "PASSED"
+
+        #print result with error if needed
+        text = name_txt + (failed_txt if test_failed else success_txt)
+        out = sys.stdout
+        if error :
+                text = text + "\n" + error
+                out = sys.stderr
+
+        print(text, file = out);
+        sys.stdout.flush()
+        sys.stderr.flush()
+
+        return test_failed
+
 # run the given list of tests with the given parameters
 def run_tests(tests, generate, dry_run, jobs) :
@@ -174 +204 @@
                 print( "Regenerate tests for: " )
 
-        failed = False;
-        # for eeach test to run
-        for t in tests:
-                # print formated name
-                name_txt = "%20s  " % t.name
-
-                #run the test instance and collect the result
-                test_failed, error = run_test_instance(t, generate, dry_run)
-
-                # aggregate test suite result
-                failed = test_failed or failed
-
-                # update output based on current action
-                if generate :
-                        failed_txt = "ERROR"
-                        success_txt = "Done"
-                else :
-                        failed_txt = "FAILED"
-                        success_txt = "PASSED"
-
-                #print result with error if needed
-                text = name_txt + (failed_txt if test_failed else success_txt)
-                out = sys.stdout
-                if error :
-                        text = text + "\n" + error
-                        out = sys.stderr
-
-                print(text, file = out);
-                sys.stdout.flush()
-                sys.stderr.flush()
-
+        # for each test to run
+        pool = Pool(jobs)
+        try :
+                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run), tests ).get(99999999)
+        except KeyboardInterrupt:
+                pool.terminate()
+                print("Tests interrupted by user")
+                sys.exit(1)
 
         #clean the workspace
         sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
 
-        return 1 if failed else 0
+        for failed in results:
+                if failed :
+                        return 1
+
+        return 0
 
 ################################################################################
@@ -279 +290 @@
 
 # make sure we have a valid number of jobs that corresponds to user input
-options.jobs = int(make_max_jobs) if make_max_jobs else options.jobs
+options.jobs = int(make_max_jobs) if make_max_jobs else (options.jobs if options.jobs else 1)
 if options.jobs <= 0 :
         print('ERROR: Invalid number of jobs', file=sys.stderr)
         sys.exit(1)
 
+print('Running on %i cores' % options.jobs)
+
 # users may want to simply list the tests
 if options.list :

src/tests/typeof.c

@@ -8 +8 @@
     typeof( int ( int, int p ) ) *v7;
     typeof( [int] ( int, int p ) ) *v8;
+    (typeof(v1)) v2; // cast with typeof
 }