Changes in src/SymTab/Autogen.cc [4e8949f:f0ecf9b]

File:

• src/SymTab/Autogen.cc (modified) (16 diffs)

src/SymTab/Autogen.cc

@@ -16 +16 @@
 #include "Autogen.h"
 
-#include <cstddef>                 // for NULL
 #include <algorithm>               // for count_if
 #include <cassert>                 // for strict_dynamic_cast, assert, assertf
@@ -27 +26 @@
 #include "AddVisit.h"              // for addVisit
 #include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
+#include "Common/PassVisitor.h"    // for PassVisitor
 #include "Common/ScopedMap.h"      // for ScopedMap<>::const_iterator, Scope...
 #include "Common/utility.h"        // for cloneAll, operator+
-#include "GenPoly/DeclMutator.h"   // for DeclMutator
 #include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::iterator
+#include "InitTweak/GenInit.h"     // for fixReturnStatements
+#include "ResolvExpr/Resolver.h"   // for resolveDecl
 #include "SymTab/Mangler.h"        // for Mangler
 #include "SynTree/Attribute.h"     // For Attribute
@@ -42 +43 @@
 namespace SymTab {
         Type * SizeType = 0;
-        typedef ScopedMap< std::string, bool > TypeMap;
-
-        /// Data used to generate functions generically. Specifically, the name of the generated function, a function which generates the routine protoype, and a map which contains data to determine whether a function should be generated.
+
+        /// Data used to generate functions generically. Specifically, the name of the generated function and a function which generates the routine protoype
         struct FuncData {
                 typedef FunctionType * (*TypeGen)( Type * );
-                FuncData( const std::string & fname, const TypeGen & genType, TypeMap & map ) : fname( fname ), genType( genType ), map( map ) {}
+                FuncData( const std::string & fname, const TypeGen & genType ) : fname( fname ), genType( genType ) {}
                 std::string fname;
                 TypeGen genType;
-                TypeMap & map;
-        };
-
-        class AutogenerateRoutines final : public Visitor {
-            template< typename Visitor >
-            friend void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
-            template< typename Visitor >
-            friend void addVisitStatementList( std::list< Statement* > &stmts, Visitor &visitor );
-          public:
-                std::list< Declaration * > &get_declsToAdd() { return declsToAdd; }
-
-                typedef Visitor Parent;
-                using Parent::visit;
-
+        };
+
+        struct AutogenerateRoutines final : public WithDeclsToAdd, public WithVisitorRef<AutogenerateRoutines>, public WithGuards, public WithShortCircuiting, public WithIndexer {
                 AutogenerateRoutines();
 
-                virtual void visit( EnumDecl *enumDecl );
-                virtual void visit( StructDecl *structDecl );
-                virtual void visit( UnionDecl *structDecl );
-                virtual void visit( TypeDecl *typeDecl );
-                virtual void visit( TraitDecl *ctxDecl );
-                virtual void visit( FunctionDecl *functionDecl );
-
-                virtual void visit( FunctionType *ftype );
-                virtual void visit( PointerType *ftype );
-
-                virtual void visit( CompoundStmt *compoundStmt );
-                virtual void visit( SwitchStmt *switchStmt );
+                void previsit( EnumDecl * enumDecl );
+                void previsit( StructDecl * structDecl );
+                void previsit( UnionDecl * structDecl );
+                void previsit( TypeDecl * typeDecl );
+                void previsit( TraitDecl * traitDecl );
+                void previsit( FunctionDecl * functionDecl );
+
+                void previsit( FunctionType * ftype );
+                void previsit( PointerType * ptype );
+
+                void previsit( CompoundStmt * compoundStmt );
 
           private:
-                template< typename StmtClass > void visitStatement( StmtClass *stmt );
-
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
-                std::set< std::string > structsDone;
+
+                GenPoly::ScopedSet< std::string > structsDone;
                 unsigned int functionNesting = 0;     // current level of nested functions
-                /// Note: the following maps could be ScopedSets, but it should be easier to work
-                /// deleted functions in if they are maps, since the value false can be inserted
-                /// at the current scope without affecting outer scopes or requiring copies.
-                TypeMap copyable, assignable, constructable, destructable;
+
+                InitTweak::ManagedTypes managedTypes;
                 std::vector< FuncData > data;
         };
 
         /// generates routines for tuple types.
-        /// Doesn't really need to be a mutator, but it's easier to reuse DeclMutator than it is to use AddVisit
-        /// or anything we currently have that supports adding new declarations for visitors
-        class AutogenTupleRoutines : public GenPoly::DeclMutator {
-          public:
-                typedef GenPoly::DeclMutator Parent;
-                using Parent::mutate;
-
-                virtual DeclarationWithType * mutate( FunctionDecl *functionDecl );
-
-                virtual Type * mutate( TupleType *tupleType );
-
-                virtual CompoundStmt * mutate( CompoundStmt *compoundStmt );
+        struct AutogenTupleRoutines : public WithDeclsToAdd, public WithVisitorRef<AutogenTupleRoutines>, public WithGuards, public WithShortCircuiting {
+                void previsit( FunctionDecl * functionDecl );
+
+                void postvisit( TupleType * tupleType );
+
+                void previsit( CompoundStmt * compoundStmt );
 
           private:
@@ -112 +90 @@
 
         void autogenerateRoutines( std::list< Declaration * > &translationUnit ) {
-                AutogenerateRoutines generator;
-                acceptAndAdd( translationUnit, generator );
+                PassVisitor<AutogenerateRoutines> generator;
+                acceptAll( translationUnit, generator );
 
                 // needs to be done separately because AutogenerateRoutines skips types that appear as function arguments, etc.
                 // AutogenTupleRoutines tupleGenerator;
-                // tupleGenerator.mutateDeclarationList( translationUnit );
+                // acceptAll( translationUnit, tupleGenerator );
+        }
+
+        //=============================================================================================
+        // FuncGenerator definitions
+        //=============================================================================================
+        class FuncGenerator {
+        public:
+                std::list< Declaration * > definitions, forwards;
+
+                FuncGenerator( Type * type, const std::vector< FuncData > & data, unsigned int functionNesting, SymTab::Indexer & indexer ) : type( type ), data( data ), functionNesting( functionNesting ), indexer( indexer ) {}
+
+                virtual bool shouldAutogen() const = 0;
+                void genStandardFuncs();
+                virtual void genFieldCtors() = 0;
+        protected:
+                Type * type;
+                const std::vector< FuncData > & data;
+                unsigned int functionNesting;
+                SymTab::Indexer & indexer;
+
+                virtual void genFuncBody( FunctionDecl * dcl ) = 0;
+                virtual bool isConcurrentType() const = 0;
+
+                void resolve( FunctionDecl * dcl );
+                void generatePrototypes( std::list< FunctionDecl * > & newFuncs );
+        };
+
+        class StructFuncGenerator : public FuncGenerator {
+                StructDecl * aggregateDecl;
+        public:
+                StructFuncGenerator( StructDecl * aggregateDecl, StructInstType * refType, const std::vector< FuncData > & data,  unsigned int functionNesting, SymTab::Indexer & indexer ) : FuncGenerator( refType, data, functionNesting, indexer ), aggregateDecl( aggregateDecl) {}
+
+                virtual bool shouldAutogen() const override;
+                virtual bool isConcurrentType() const override;
+
+                virtual void genFuncBody( FunctionDecl * dcl ) override;
+                virtual void genFieldCtors() override;
+
+        private:
+                /// generates a single struct member operation (constructor call, destructor call, assignment call)
+                void makeMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool forward = true );
+
+                /// generates the body of a struct function by iterating the struct members (via parameters) - generates default ctor, copy ctor, assignment, and dtor bodies, but NOT field ctor bodies
+                template<typename Iterator>
+                void makeFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool forward = true );
+
+                /// generate the body of a constructor which takes parameters that match fields, e.g.
+                /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields.
+                template<typename Iterator>
+                void makeFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func );
+        };
+
+        class UnionFuncGenerator : public FuncGenerator {
+                UnionDecl * aggregateDecl;
+        public:
+                UnionFuncGenerator( UnionDecl * aggregateDecl, UnionInstType * refType, const std::vector< FuncData > & data,  unsigned int functionNesting, SymTab::Indexer & indexer ) : FuncGenerator( refType, data, functionNesting, indexer ), aggregateDecl( aggregateDecl) {}
+
+                virtual bool shouldAutogen() const override;
+                virtual bool isConcurrentType() const override;
+
+                virtual void genFuncBody( FunctionDecl * dcl ) override;
+                virtual void genFieldCtors() override;
+
+        private:
+                /// generates a single struct member operation (constructor call, destructor call, assignment call)
+                template<typename OutputIterator>
+                void makeMemberOp( ObjectDecl * srcParam, ObjectDecl * dstParam, OutputIterator out );
+
+                /// generates the body of a struct function by iterating the struct members (via parameters) - generates default ctor, copy ctor, assignment, and dtor bodies, but NOT field ctor bodies
+                template<typename Iterator>
+                void makeFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool forward = true );
+
+                /// generate the body of a constructor which takes parameters that match fields, e.g.
+                /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields.
+                template<typename Iterator>
+                void makeFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func );
+        };
+
+        class EnumFuncGenerator : public FuncGenerator {
+        public:
+                EnumFuncGenerator( EnumInstType * refType, const std::vector< FuncData > & data,  unsigned int functionNesting, SymTab::Indexer & indexer ) : FuncGenerator( refType, data, functionNesting, indexer ) {}
+
+                virtual bool shouldAutogen() const override;
+                virtual bool isConcurrentType() const override;
+
+                virtual void genFuncBody( FunctionDecl * dcl ) override;
+                virtual void genFieldCtors() override;
+
+        private:
+        };
+
+        class TypeFuncGenerator : public FuncGenerator {
+                TypeDecl * typeDecl;
+        public:
+                TypeFuncGenerator( TypeDecl * typeDecl, TypeInstType * refType, const std::vector<FuncData> & data, unsigned int functionNesting, SymTab::Indexer & indexer ) : FuncGenerator( refType, data, functionNesting, indexer ), typeDecl( typeDecl ) {}
+
+                virtual bool shouldAutogen() const override;
+                virtual void genFuncBody( FunctionDecl * dcl ) override;
+                virtual bool isConcurrentType() const override;
+                virtual void genFieldCtors() override;
+        };
+
+        //=============================================================================================
+        // helper functions
+        //=============================================================================================
+        void generateFunctions( FuncGenerator & gen, std::list< Declaration * > & declsToAdd ) {
+                if ( ! gen.shouldAutogen() ) return;
+
+                // generate each of the functions based on the supplied FuncData objects
+                gen.genStandardFuncs();
+                gen.genFieldCtors();
+
+                declsToAdd.splice( declsToAdd.end(), gen.forwards );
+                declsToAdd.splice( declsToAdd.end(), gen.definitions );
         }
 
         bool isUnnamedBitfield( ObjectDecl * obj ) {
-                return obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL;
+                return obj != nullptr && obj->name == "" && obj->bitfieldWidth != nullptr;
         }
 
@@ -127 +219 @@
         void addForwardDecl( FunctionDecl * functionDecl, std::list< Declaration * > & declsToAdd ) {
                 FunctionDecl * decl = functionDecl->clone();
-                delete decl->get_statements();
-                decl->set_statements( NULL );
+                delete decl->statements;
+                decl->statements = nullptr;
                 declsToAdd.push_back( decl );
                 decl->fixUniqueId();
         }
 
+        const std::list< TypeDecl * > getGenericParams( Type * t ) {
+                std::list< TypeDecl * > * ret = nullptr;
+                if ( StructInstType * inst = dynamic_cast< StructInstType * > ( t ) ) {
+                        ret = inst->get_baseParameters();
+                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( t ) ) {
+                        ret = inst->get_baseParameters();
+                }
+                return ret ? *ret : std::list< TypeDecl * >();
+        }
+
         /// given type T, generate type of default ctor/dtor, i.e. function type void (*) (T *)
         FunctionType * genDefaultType( Type * paramType ) {
+                const auto & typeParams = getGenericParams( paramType );
                 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false );
+                cloneAll( typeParams, ftype->forall );
                 ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr );
-                ftype->get_parameters().push_back( dstParam );
-
+                ftype->parameters.push_back( dstParam );
                 return ftype;
         }
@@ -146 +249 @@
                 FunctionType *ftype = genDefaultType( paramType );
                 ObjectDecl *srcParam = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
-                ftype->get_parameters().push_back( srcParam );
+                ftype->parameters.push_back( srcParam );
                 return ftype;
         }
@@ -154 +257 @@
                 FunctionType *ftype = genCopyType( paramType );
                 ObjectDecl *returnVal = new ObjectDecl( "_ret", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType->clone(), nullptr );
-                ftype->get_returnVals().push_back( returnVal );
+                ftype->returnVals.push_back( returnVal );
                 return ftype;
         }
@@ -171 +274 @@
         }
 
-        /// inserts base type of first argument into map if pred(funcDecl) is true
-        void insert( FunctionDecl *funcDecl, TypeMap & map, FunctionDecl * (*pred)(Declaration *) ) {
-                // insert type into constructable, etc. map if appropriate
-                if ( pred( funcDecl ) ) {
-                        FunctionType * ftype = funcDecl->get_functionType();
-                        assert( ! ftype->get_parameters().empty() );
-                        Type * t = InitTweak::getPointerBase( ftype->get_parameters().front()->get_type() );
-                        assert( t );
-                        map.insert( Mangler::mangleType( t ), true );
-                }
-        }
-
-        /// using map and t, determines if is constructable, etc.
-        bool lookup( const TypeMap & map, Type * t ) {
-                assertf( t, "Autogenerate lookup was given non-type: %s", toString( t ).c_str() );
-                if ( dynamic_cast< PointerType * >( t ) ) {
-                        // will need more complicated checking if we want this to work with pointer types, since currently
-                        return true;
-                } else if ( ArrayType * at = dynamic_cast< ArrayType * >( t ) ) {
-                        // an array's constructor, etc. is generated on the fly based on the base type's constructor, etc.
-                        return lookup( map, at->get_base() );
-                }
-                TypeMap::const_iterator it = map.find( Mangler::mangleType( t ) );
-                if ( it != map.end() ) return it->second;
-                // something that does not appear in the map is by default not constructable, etc.
-                return false;
-        }
-
-        /// using map and aggr, examines each member to determine if constructor, etc. should be generated
-        template<typename Container>
-        bool shouldGenerate( const TypeMap & map, const Container & container ) {
-                for ( Type * t : container ) {
-                        if ( ! lookup( map, t ) ) return false;
-                }
-                return true;
-        }
-
-        /// data structure for abstracting the generation of special functions
-        template< typename OutputIterator, typename Container >
-        struct FuncGenerator {
-                const Container & container;
-                Type *refType;
-                unsigned int functionNesting;
-                const std::list< TypeDecl* > & typeParams;
-                OutputIterator out;
-                FuncGenerator( const Container & container, Type *refType, unsigned int functionNesting, const std::list< TypeDecl* > & typeParams, OutputIterator out ) : container( container ), refType( refType ), functionNesting( functionNesting ), typeParams( typeParams ), out( out ) {}
-
-                /// generates a function (?{}, ?=?, ^?{}) based on the data argument and members. If function is generated, inserts the type into the map.
-                void gen( const FuncData & data, bool concurrent_type ) {
-                        if ( ! shouldGenerate( data.map, container ) ) return;
-                        FunctionType * ftype = data.genType( refType );
-
-                        if ( concurrent_type && CodeGen::isDestructor( data.fname ) ) {
+        Type * declToType( Declaration * decl ) {
+                if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                        return dwt->get_type();
+                }
+                return nullptr;
+        }
+
+        Type * declToTypeDeclBase( Declaration * decl ) {
+                if ( TypeDecl * td = dynamic_cast< TypeDecl * >( decl ) ) {
+                        return td->base;
+                }
+                return nullptr;
+        }
+
+        //=============================================================================================
+        // FuncGenerator member definitions
+        //=============================================================================================
+        void FuncGenerator::genStandardFuncs() {
+                std::list< FunctionDecl * > newFuncs;
+                generatePrototypes( newFuncs );
+
+                for ( FunctionDecl * dcl : newFuncs ) {
+                        genFuncBody( dcl );
+                        if ( CodeGen::isAssignment( dcl->name ) ) {
+                                // assignment needs to return a value
+                                FunctionType * assignType = dcl->type;
+                                assert( assignType->parameters.size() == 2 );
+                                assert( assignType->returnVals.size() == 1 );
+                                ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.front() );
+                                dcl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( dstParam ) ) );
+                        }
+                        resolve( dcl );
+                }
+        }
+
+        void FuncGenerator::generatePrototypes( std::list< FunctionDecl * > & newFuncs ) {
+                bool concurrent_type = isConcurrentType();
+                for ( const FuncData & d : data ) {
+                        // generate a function (?{}, ?=?, ^?{}) based on the current FuncData.
+                        FunctionType * ftype = d.genType( type );
+
+                        // destructor for concurrent type must be mutex
+                        if ( concurrent_type && CodeGen::isDestructor( d.fname ) ) {
                                 ftype->parameters.front()->get_type()->set_mutex( true );
                         }
 
-                        cloneAll( typeParams, ftype->forall );
-                        *out++ = genFunc( data.fname, ftype, functionNesting );
-                        data.map.insert( Mangler::mangleType( refType ), true );
-                }
-        };
-
-        template< typename OutputIterator, typename Container >
-        FuncGenerator<OutputIterator, Container> makeFuncGenerator( const Container & container, Type *refType, unsigned int functionNesting, const std::list< TypeDecl* > & typeParams, OutputIterator out ) {
-                return FuncGenerator<OutputIterator, Container>( container, refType, functionNesting, typeParams, out );
-        }
-
-        /// generates a single enumeration assignment expression
-        ApplicationExpr * genEnumAssign( FunctionType * ftype, FunctionDecl * assignDecl ) {
-                // enum copy construct and assignment is just C-style assignment.
-                // this looks like a bad recursive call, but code gen will turn it into
-                // a C-style assignment.
-                // This happens before function pointer type conversion, so need to do it manually here
-                // NOTE: ftype is not necessarily the functionType belonging to assignDecl - ftype is the
-                // type of the function that this expression is being generated for (so that the correct
-                // parameters) are using in the variable exprs
-                assert( ftype->get_parameters().size() == 2 );
-                ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
-                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
-
-                VariableExpr * assignVarExpr = new VariableExpr( assignDecl );
-                Type * assignVarExprType = assignVarExpr->get_result();
-                assignVarExprType = new PointerType( Type::Qualifiers(), assignVarExprType );
-                assignVarExpr->set_result( assignVarExprType );
-                ApplicationExpr * assignExpr = new ApplicationExpr( assignVarExpr );
-                assignExpr->get_args().push_back( new VariableExpr( dstParam ) );
-                assignExpr->get_args().push_back( new VariableExpr( srcParam ) );
-                return assignExpr;
-        }
-
-        // E ?=?(E volatile*, int),
-        //   ?=?(E _Atomic volatile*, int);
-        void makeEnumFunctions( EnumInstType *refType, unsigned int functionNesting, std::list< Declaration * > &declsToAdd ) {
-
-                // T ?=?(E *, E);
-                FunctionType *assignType = genAssignType( refType );
-
-                // void ?{}(E *); void ^?{}(E *);
-                FunctionType * ctorType = genDefaultType( refType->clone() );
-                FunctionType * dtorType = genDefaultType( refType->clone() );
-
-                // void ?{}(E *, E);
-                FunctionType *copyCtorType = genCopyType( refType->clone() );
-
-                // add unused attribute to parameters of default constructor and destructor
-                ctorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
-                dtorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
-
-                // xxx - should we also generate void ?{}(E *, int) and E ?{}(E *, E)?
-                // right now these cases work, but that might change.
-
-                // xxx - Temporary: make these functions intrinsic so they codegen as C assignment.
-                // Really they're something of a cross between instrinsic and autogen, so should
-                // probably make a new linkage type
-                FunctionDecl *assignDecl = genFunc( "?=?", assignType, functionNesting, true );
-                FunctionDecl *ctorDecl = genFunc( "?{}", ctorType, functionNesting, true );
-                FunctionDecl *copyCtorDecl = genFunc( "?{}", copyCtorType, functionNesting, true );
-                FunctionDecl *dtorDecl = genFunc( "^?{}", dtorType, functionNesting, true );
-
-                // body is either return stmt or expr stmt
-                assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, genEnumAssign( assignType, assignDecl ) ) );
-                copyCtorDecl->get_statements()->get_kids().push_back( new ExprStmt( noLabels, genEnumAssign( copyCtorType, assignDecl ) ) );
-
-                declsToAdd.push_back( ctorDecl );
-                declsToAdd.push_back( copyCtorDecl );
-                declsToAdd.push_back( dtorDecl );
-                declsToAdd.push_back( assignDecl ); // assignment should come last since it uses copy constructor in return
-        }
-
-        /// generates a single struct member operation (constructor call, destructor call, assignment call)
-        void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool forward = true ) {
+                        newFuncs.push_back( genFunc( d.fname, ftype, functionNesting ) );
+                }
+        }
+
+        void FuncGenerator::resolve( FunctionDecl * dcl ) {
+                try {
+                        ResolvExpr::resolveDecl( dcl, indexer );
+                        if ( functionNesting == 0 ) {
+                                // forward declare if top-level struct, so that
+                                // type is complete as soon as its body ends
+                                // Note: this is necessary if we want structs which contain
+                                // generic (otype) structs as members.
+                                addForwardDecl( dcl, forwards );
+                        }
+                        definitions.push_back( dcl );
+                        indexer.addId( dcl );
+                } catch ( SemanticError err ) {
+                        // okay if decl does not resolve - that means the function should not be generated
+                        delete dcl;
+                }
+        }
+
+        bool StructFuncGenerator::shouldAutogen() const {
+                // Builtins do not use autogeneration.
+                return ! aggregateDecl->linkage.is_builtin;
+        }
+        bool StructFuncGenerator::isConcurrentType() const { return aggregateDecl->is_thread() || aggregateDecl->is_monitor(); }
+
+        void StructFuncGenerator::genFuncBody( FunctionDecl * dcl ) {
+                // generate appropriate calls to member ctor, assignment
+                // destructor needs to do everything in reverse, so pass "forward" based on whether the function is a destructor
+                if ( ! CodeGen::isDestructor( dcl->name ) ) {
+                        makeFunctionBody( aggregateDecl->members.begin(), aggregateDecl->members.end(), dcl );
+                } else {
+                        makeFunctionBody( aggregateDecl->members.rbegin(), aggregateDecl->members.rend(), dcl, false );
+                }
+        }
+
+        void StructFuncGenerator::genFieldCtors() {
+                // field ctors are only generated if default constructor and copy constructor are both generated
+                unsigned numCtors = std::count_if( definitions.begin(), definitions.end(), [](Declaration * dcl) { return CodeGen::isConstructor( dcl->name ); } );
+
+                // Field constructors are only generated if default and copy constructor
+                // are generated, since they need access to both
+                if ( numCtors != 2 ) return;
+
+                // create constructors which take each member type as a parameter.
+                // for example, for struct A { int x, y; }; generate
+                //   void ?{}(A *, int) and void ?{}(A *, int, int)
+                FunctionType * memCtorType = genDefaultType( type );
+                for ( Declaration * member : aggregateDecl->members ) {
+                        DeclarationWithType * field = strict_dynamic_cast<DeclarationWithType *>( member );
+                        if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( field ) ) ) {
+                                // don't make a function whose parameter is an unnamed bitfield
+                                continue;
+                        }
+                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 ) );
+                        FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
+                        makeFieldCtorBody( aggregateDecl->members.begin(), aggregateDecl->members.end(), ctor );
+                        resolve( ctor );
+                }
+                delete memCtorType;
+        }
+
+        void StructFuncGenerator::makeMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool forward ) {
                 InitTweak::InitExpander srcParam( src );
 
                 // assign to destination
-                Expression *dstselect = new MemberExpr( field, new CastExpr( new VariableExpr( dstParam ), strict_dynamic_cast< ReferenceType* >( dstParam->get_type() )->get_base()->clone() ) );
-                genImplicitCall( srcParam, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
-        }
-
-        /// generates the body of a struct function by iterating the struct members (via parameters) - generates default ctor, copy ctor, assignment, and dtor bodies, but NOT field ctor bodies
+                Expression *dstselect = new MemberExpr( field, new CastExpr( new VariableExpr( dstParam ), strict_dynamic_cast< ReferenceType* >( dstParam->get_type() )->base->clone() ) );
+                genImplicitCall( srcParam, dstselect, func->name, back_inserter( func->statements->kids ), field, forward );
+        }
+
         template<typename Iterator>
-        void makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool forward = true ) {
+        void StructFuncGenerator::makeFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool forward ) {
                 for ( ; member != end; ++member ) {
                         if ( DeclarationWithType *field = dynamic_cast< DeclarationWithType * >( *member ) ) { // otherwise some form of type declaration, e.g. Aggregate
@@ -321 +403 @@
                                 }
 
-                                if ( type->get_const() && func->get_name() == "?=?" ) {
+                                if ( type->get_const() && CodeGen::isAssignment( func->name ) ) {
                                         // don't assign const members, but do construct/destruct
                                         continue;
                                 }
 
-                                if ( field->get_name() == "" ) {
-                                        // don't assign to anonymous members
-                                        // xxx - this is a temporary fix. Anonymous members tie into
-                                        // our inheritance model. I think the correct way to handle this is to
-                                        // cast the structure to the type of the member and let the resolver
-                                        // figure out whether it's valid and have a pass afterwards that fixes
-                                        // the assignment to use pointer arithmetic with the offset of the
-                                        // member, much like how generic type members are handled.
-                                        continue;
-                                }
-
                                 assert( ! func->get_functionType()->get_parameters().empty() );
                                 ObjectDecl * dstParam = dynamic_cast<ObjectDecl*>( func->get_functionType()->get_parameters().front() );
-                                ObjectDecl * srcParam = NULL;
+                                ObjectDecl * srcParam = nullptr;
                                 if ( func->get_functionType()->get_parameters().size() == 2 ) {
                                         srcParam = dynamic_cast<ObjectDecl*>( func->get_functionType()->get_parameters().back() );
                                 }
+
                                 // srcParam may be NULL, in which case we have default ctor/dtor
                                 assert( dstParam );
 
-                                Expression *srcselect = srcParam ? new MemberExpr( field, new VariableExpr( srcParam ) ) : NULL;
-                                makeStructMemberOp( dstParam, srcselect, field, func, forward );
+                                Expression *srcselect = srcParam ? new MemberExpr( field, new VariableExpr( srcParam ) ) : nullptr;
+                                makeMemberOp( dstParam, srcselect, field, func, forward );
                         } // if
                 } // for
-        } // makeStructFunctionBody
-
-        /// generate the body of a constructor which takes parameters that match fields, e.g.
-        /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields.
+        } // makeFunctionBody
+
         template<typename Iterator>
-        void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func ) {
-                FunctionType * ftype = func->get_functionType();
-                std::list<DeclarationWithType*> & params = ftype->get_parameters();
+        void StructFuncGenerator::makeFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func ) {
+                FunctionType * ftype = func->type;
+                std::list<DeclarationWithType*> & params = ftype->parameters;
                 assert( params.size() >= 2 );  // should not call this function for default ctor, etc.
 
@@ -369 +439 @@
                                         // don't make a function whose parameter is an unnamed bitfield
                                         continue;
-                                } else if ( field->get_name() == "" ) {
-                                        // don't assign to anonymous members
-                                        // xxx - this is a temporary fix. Anonymous members tie into
-                                        // our inheritance model. I think the correct way to handle this is to
-                                        // cast the structure to the type of the member and let the resolver
-                                        // figure out whether it's valid and have a pass afterwards that fixes
-                                        // the assignment to use pointer arithmetic with the offset of the
-                                        // member, much like how generic type members are handled.
-                                        continue;
                                 } else if ( parameter != params.end() ) {
                                         // matching parameter, initialize field with copy ctor
                                         Expression *srcselect = new VariableExpr(*parameter);
-                                        makeStructMemberOp( dstParam, srcselect, field, func );
+                                        makeMemberOp( dstParam, srcselect, field, func );
                                         ++parameter;
                                 } else {
                                         // no matching parameter, initialize field with default ctor
-                                        makeStructMemberOp( dstParam, NULL, field, func );
+                                        makeMemberOp( dstParam, nullptr, field, func );
                                 }
                         }
@@ -391 +452 @@
         }
 
-        Type * declToType( Declaration * decl ) {
-                if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                        return dwt->get_type();
-                }
-                return nullptr;
-        }
-
-        /// generates struct constructors, destructor, and assignment functions
-        void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd, const std::vector< FuncData > & data ) {
+        bool UnionFuncGenerator::shouldAutogen() const {
                 // Builtins do not use autogeneration.
-                if ( aggregateDecl->get_linkage() == LinkageSpec::BuiltinCFA ||
-                         aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) {
-                        return;
-                }
-
-                // Make function polymorphic in same parameters as generic struct, if applicable
-                const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions
-
-                // generate each of the functions based on the supplied FuncData objects
-                std::list< FunctionDecl * > newFuncs;
-                // structure that iterates aggregate decl members, returning their types
-                auto generator = makeFuncGenerator( lazy_map( aggregateDecl->members, declToType ), refType, functionNesting, typeParams, back_inserter( newFuncs ) );
-                for ( const FuncData & d : data ) {
-                        generator.gen( d, aggregateDecl->is_thread() || aggregateDecl->is_monitor() );
-                }
-
+                return ! aggregateDecl->linkage.is_builtin;
+        }
+
+        // xxx - is this right?
+        bool UnionFuncGenerator::isConcurrentType() const { return false; };
+
+        /// generate a single union assignment expression (using memcpy)
+        template< typename OutputIterator >
+        void UnionFuncGenerator::makeMemberOp( ObjectDecl * srcParam, ObjectDecl * dstParam, OutputIterator out ) {
+                UntypedExpr *copy = new UntypedExpr( new NameExpr( "__builtin_memcpy" ) );
+                copy->args.push_back( new AddressExpr( new VariableExpr( dstParam ) ) );
+                copy->args.push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
+                copy->args.push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
+                *out++ = new ExprStmt( noLabels, copy );
+        }
+
+        /// generates the body of a union assignment/copy constructor/field constructor
+        void UnionFuncGenerator::genFuncBody( FunctionDecl * funcDecl ) {
+                FunctionType * ftype = funcDecl->type;
+                if ( InitTweak::isCopyConstructor( funcDecl ) || InitTweak::isAssignment( funcDecl ) ) {
+                        assert( ftype->parameters.size() == 2 );
+                        ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.front() );
+                        ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.back() );
+                        makeMemberOp( srcParam, dstParam, back_inserter( funcDecl->statements->kids ) );
+                } else {
+                        // default ctor/dtor body is empty - add unused attribute to parameter to silence warnings
+                        assert( ftype->parameters.size() == 1 );
+                        ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.front() );
+                        dstParam->attributes.push_back( new Attribute( "unused" ) );
+                }
+        }
+
+        /// generate the body of a constructor which takes parameters that match fields, e.g.
+        /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields.
+        void UnionFuncGenerator::genFieldCtors() {
                 // field ctors are only generated if default constructor and copy constructor are both generated
-                unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return CodeGen::isConstructor( dcl->get_name() ); } );
-
-                if ( functionNesting == 0 ) {
-                        // forward declare if top-level struct, so that
-                        // type is complete as soon as its body ends
-                        // Note: this is necessary if we want structs which contain
-                        // generic (otype) structs as members.
-                        for ( FunctionDecl * dcl : newFuncs ) {
-                                addForwardDecl( dcl, declsToAdd );
-                        }
-                }
-
-                for ( FunctionDecl * dcl : newFuncs ) {
-                        // generate appropriate calls to member ctor, assignment
-                        // destructor needs to do everything in reverse, so pass "forward" based on whether the function is a destructor
-                        if ( ! CodeGen::isDestructor( dcl->get_name() ) ) {
-                                makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), dcl );
-                        } else {
-                                makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dcl, false );
-                        }
-                        if ( CodeGen::isAssignment( dcl->get_name() ) ) {
-                                // assignment needs to return a value
-                                FunctionType * assignType = dcl->get_functionType();
-                                assert( assignType->get_parameters().size() == 2 );
-                                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( assignType->get_parameters().back() );
-                                dcl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
-                        }
-                        declsToAdd.push_back( dcl );
-                }
-
-                // create constructors which take each member type as a parameter.
-                // for example, for struct A { int x, y; }; generate
-                //   void ?{}(A *, int) and void ?{}(A *, int, int)
+                unsigned numCtors = std::count_if( definitions.begin(), definitions.end(), [](Declaration * dcl) { return CodeGen::isConstructor( dcl->get_name() ); } );
+
                 // Field constructors are only generated if default and copy constructor
                 // are generated, since they need access to both
-                if ( numCtors == 2 ) {
-                        FunctionType * memCtorType = genDefaultType( refType );
-                        cloneAll( typeParams, memCtorType->get_forall() );
-                        for ( std::list<Declaration *>::iterator i = aggregateDecl->get_members().begin(); i != aggregateDecl->get_members().end(); ++i ) {
-                                DeclarationWithType * member = dynamic_cast<DeclarationWithType *>( *i );
-                                assert( member );
-                                if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( member ) ) ) {
-                                        // don't make a function whose parameter is an unnamed bitfield
-                                        continue;
-                                } else if ( member->get_name() == "" ) {
-                                        // don't assign to anonymous members
-                                        // xxx - this is a temporary fix. Anonymous members tie into
-                                        // our inheritance model. I think the correct way to handle this is to
-                                        // cast the structure to the type of the member and let the resolver
-                                        // figure out whether it's valid/choose the correct unnamed member
-                                        continue;
-                                }
-                                memCtorType->get_parameters().push_back( new ObjectDecl( member->get_name(), Type::StorageClasses(), LinkageSpec::Cforall, 0, member->get_type()->clone(), 0 ) );
-                                FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
-                                makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor );
-                                declsToAdd.push_back( ctor );
-                        }
-                        delete memCtorType;
-                }
-        }
-
-        /// generate a single union assignment expression (using memcpy)
-        template< typename OutputIterator >
-        void makeUnionFieldsAssignment( ObjectDecl * srcParam, ObjectDecl * dstParam, OutputIterator out ) {
-                UntypedExpr *copy = new UntypedExpr( new NameExpr( "__builtin_memcpy" ) );
-                copy->get_args().push_back( new AddressExpr( new VariableExpr( dstParam ) ) );
-                copy->get_args().push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
-                copy->get_args().push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
-                *out++ = new ExprStmt( noLabels, copy );
-        }
-
-        /// generates the body of a union assignment/copy constructor/field constructor
-        void makeUnionAssignBody( FunctionDecl * funcDecl ) {
-                FunctionType * ftype = funcDecl->get_functionType();
-                assert( ftype->get_parameters().size() == 2 );
-                ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
-                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
-
-                makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
-                if ( CodeGen::isAssignment( funcDecl->get_name() ) ) {
-                        // also generate return statement in assignment
-                        funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
-                }
-        }
-
-        /// generates union constructors, destructors, and assignment operator
-        void makeUnionFunctions( UnionDecl *aggregateDecl, UnionInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd ) {
-                // Make function polymorphic in same parameters as generic union, if applicable
-                const std::list< TypeDecl* > & typeParams = aggregateDecl->get_parameters(); // List of type variables to be placed on the generated functions
-
-                // default ctor/dtor need only first parameter
-                // void ?{}(T *); void ^?{}(T *);
-                FunctionType *ctorType = genDefaultType( refType );
-                FunctionType *dtorType = genDefaultType( refType );
-
-                // copy ctor needs both parameters
-                // void ?{}(T *, T);
-                FunctionType *copyCtorType = genCopyType( refType );
-
-                // assignment needs both and return value
-                // T ?=?(T *, T);
-                FunctionType *assignType = genAssignType( refType );
-
-                cloneAll( typeParams, ctorType->get_forall() );
-                cloneAll( typeParams, dtorType->get_forall() );
-                cloneAll( typeParams, copyCtorType->get_forall() );
-                cloneAll( typeParams, assignType->get_forall() );
-
-                // add unused attribute to parameters of default constructor and destructor
-                ctorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
-                dtorType->get_parameters().front()->get_attributes().push_back( new Attribute( "unused" ) );
-
-                // Routines at global scope marked "static" to prevent multiple definitions is separate translation units
-                // because each unit generates copies of the default routines for each aggregate.
-                FunctionDecl *assignDecl = genFunc( "?=?", assignType, functionNesting );
-                FunctionDecl *ctorDecl = genFunc( "?{}",  ctorType, functionNesting );
-                FunctionDecl *copyCtorDecl = genFunc( "?{}", copyCtorType, functionNesting );
-                FunctionDecl *dtorDecl = genFunc( "^?{}", dtorType, functionNesting );
-
-                makeUnionAssignBody( assignDecl );
-
-                // body of assignment and copy ctor is the same
-                makeUnionAssignBody( copyCtorDecl );
+                if ( numCtors != 2 ) return;
 
                 // create a constructor which takes the first member type as a parameter.
@@ -546 +500 @@
                 // void ?{}(A *, int)
                 // This is to mimic C's behaviour which initializes the first member of the union.
-                std::list<Declaration *> memCtors;
-                for ( Declaration * member : aggregateDecl->get_members() ) {
-                        if ( DeclarationWithType * field = dynamic_cast< DeclarationWithType * >( member ) ) {
-                                ObjectDecl * srcParam = new ObjectDecl( "src", Type::StorageClasses(), LinkageSpec::Cforall, 0, field->get_type()->clone(), 0 );
-
-                                FunctionType * memCtorType = ctorType->clone();
-                                memCtorType->get_parameters().push_back( srcParam );
-                                FunctionDecl * ctor = genFunc( "?{}", memCtorType, functionNesting );
-
-                                makeUnionAssignBody( ctor );
-                                memCtors.push_back( ctor );
-                                // only generate a ctor for the first field
+                FunctionType * memCtorType = genDefaultType( type );
+                for ( Declaration * member : aggregateDecl->members ) {
+                        DeclarationWithType * field = strict_dynamic_cast<DeclarationWithType *>( member );
+                        if ( isUnnamedBitfield( dynamic_cast< ObjectDecl * > ( field ) ) ) {
+                                // don't make a function whose parameter is an unnamed bitfield
                                 break;
                         }
-                }
-
-                declsToAdd.push_back( ctorDecl );
-                declsToAdd.push_back( copyCtorDecl );
-                declsToAdd.push_back( dtorDecl );
-                declsToAdd.push_back( assignDecl ); // assignment should come last since it uses copy constructor in return
-                declsToAdd.splice( declsToAdd.end(), memCtors );
-        }
-
+                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, field->get_type()->clone(), nullptr ) );
+                        FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
+                        ObjectDecl * srcParam = strict_dynamic_cast<ObjectDecl *>( ctor->type->parameters.back() );
+                        srcParam->fixUniqueId();
+                        ObjectDecl * dstParam = InitTweak::getParamThis( ctor->type );
+                        makeMemberOp( srcParam, dstParam, back_inserter( ctor->statements->kids ) );
+                        resolve( ctor );
+                        // only generate one field ctor for unions
+                        break;
+                }
+                delete memCtorType;
+        }
+
+        void EnumFuncGenerator::genFuncBody( FunctionDecl * funcDecl ) {
+                // xxx - Temporary: make these functions intrinsic so they codegen as C assignment.
+                // Really they're something of a cross between instrinsic and autogen, so should
+                // probably make a new linkage type
+                funcDecl->linkage = LinkageSpec::Intrinsic;
+                FunctionType * ftype = funcDecl->type;
+                if ( InitTweak::isCopyConstructor( funcDecl ) || InitTweak::isAssignment( funcDecl ) ) {
+                        assert( ftype->parameters.size() == 2 );
+                        ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.front() );
+                        ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.back() );
+
+                        // enum copy construct and assignment is just C-style assignment.
+                        // this looks like a bad recursive call, but code gen will turn it into
+                        // a C-style assignment.
+                        // This happens before function pointer type conversion, so need to do it manually here
+                        ApplicationExpr * callExpr = new ApplicationExpr( VariableExpr::functionPointer( funcDecl ) );
+                        callExpr->get_args().push_back( new VariableExpr( dstParam ) );
+                        callExpr->get_args().push_back( new VariableExpr( srcParam ) );
+                        funcDecl->statements->push_back( new ExprStmt( noLabels, callExpr ) );
+                } else {
+                        // default ctor/dtor body is empty - add unused attribute to parameter to silence warnings
+                        assert( ftype->parameters.size() == 1 );
+                        ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.front() );
+                        dstParam->attributes.push_back( new Attribute( "unused" ) );
+                }
+        }
+
+        bool EnumFuncGenerator::shouldAutogen() const { return true; }
+        bool EnumFuncGenerator::isConcurrentType() const { return false; }
+        // enums do not have field constructors
+        void EnumFuncGenerator::genFieldCtors() {}
+
+        bool TypeFuncGenerator::shouldAutogen() const { return true; };
+
+        void TypeFuncGenerator::genFuncBody( FunctionDecl * dcl ) {
+                FunctionType * ftype = dcl->type;
+                assertf( ftype->parameters.size() == 1 || ftype->parameters.size() == 2, "Incorrect number of parameters in autogenerated typedecl function: %zd", ftype->parameters.size() );
+                DeclarationWithType * dst = ftype->parameters.front();
+                DeclarationWithType * src = ftype->parameters.size() == 2 ? ftype->parameters.back() : nullptr;
+                // generate appropriate calls to member ctor, assignment
+                UntypedExpr * expr = new UntypedExpr( new NameExpr( dcl->name ) );
+                expr->args.push_back( new CastExpr( new VariableExpr( dst ), new ReferenceType( Type::Qualifiers(), typeDecl->base->clone() ) ) );
+                if ( src ) expr->args.push_back( new CastExpr( new VariableExpr( src ), typeDecl->base->clone() ) );
+                dcl->statements->kids.push_back( new ExprStmt( noLabels, expr ) );
+        };
+
+        // xxx - should reach in and determine if base type is concurrent?
+        bool TypeFuncGenerator::isConcurrentType() const { return false; };
+
+        // opaque types do not have field constructors
+        void TypeFuncGenerator::genFieldCtors() {};
+
+        //=============================================================================================
+        // Visitor definitions
+        //=============================================================================================
         AutogenerateRoutines::AutogenerateRoutines() {
                 // the order here determines the order that these functions are generated.
                 // assignment should come last since it uses copy constructor in return.
-                data.push_back( FuncData( "?{}", genDefaultType, constructable ) );
-                data.push_back( FuncData( "?{}", genCopyType, copyable ) );
-                data.push_back( FuncData( "^?{}", genDefaultType, destructable ) );
-                data.push_back( FuncData( "?=?", genAssignType, assignable ) );
-        }
-
-        void AutogenerateRoutines::visit( EnumDecl *enumDecl ) {
-                if ( ! enumDecl->get_members().empty() ) {
-                        EnumInstType *enumInst = new EnumInstType( Type::Qualifiers(), enumDecl->get_name() );
-                        // enumInst->set_baseEnum( enumDecl );
-                        makeEnumFunctions( enumInst, functionNesting, declsToAddAfter );
-                }
-        }
-
-        void AutogenerateRoutines::visit( StructDecl *structDecl ) {
-                if ( structDecl->has_body() && structsDone.find( structDecl->get_name() ) == structsDone.end() ) {
-                        StructInstType structInst( Type::Qualifiers(), structDecl->get_name() );
-                        for ( TypeDecl * typeDecl : structDecl->get_parameters() ) {
-                                // need to visit assertions so that they are added to the appropriate maps
-                                acceptAll( typeDecl->get_assertions(), *this );
-                                structInst.get_parameters().push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeDecl->get_name(), typeDecl ) ) );
-                        }
+                data.emplace_back( "?{}", genDefaultType );
+                data.emplace_back( "?{}", genCopyType );
+                data.emplace_back( "^?{}", genDefaultType );
+                data.emplace_back( "?=?", genAssignType );
+        }
+
+        void AutogenerateRoutines::previsit( EnumDecl * enumDecl ) {
+                // must visit children (enum constants) to add them to the indexer
+                if ( enumDecl->has_body() ) {
+                        EnumInstType enumInst( Type::Qualifiers(), enumDecl->get_name() );
+                        enumInst.set_baseEnum( enumDecl );
+                        EnumFuncGenerator gen( &enumInst, data, functionNesting, indexer );
+                        generateFunctions( gen, declsToAddAfter );
+                }
+        }
+
+        void AutogenerateRoutines::previsit( StructDecl * structDecl ) {
+                visit_children = false;
+                if ( structDecl->has_body() ) {
+                        StructInstType structInst( Type::Qualifiers(), structDecl->name );
                         structInst.set_baseStruct( structDecl );
-                        makeStructFunctions( structDecl, &structInst, functionNesting, declsToAddAfter, data );
-                        structsDone.insert( structDecl->get_name() );
+                        for ( TypeDecl * typeDecl : structDecl->parameters ) {
+                                structInst.parameters.push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeDecl->name, typeDecl ) ) );
+                        }
+                        StructFuncGenerator gen( structDecl, &structInst, data, functionNesting, indexer );
+                        generateFunctions( gen, declsToAddAfter );
                 } // if
         }
 
-        void AutogenerateRoutines::visit( UnionDecl *unionDecl ) {
-                if ( ! unionDecl->get_members().empty() ) {
+        void AutogenerateRoutines::previsit( UnionDecl * unionDecl ) {
+                visit_children = false;
+                if ( unionDecl->has_body()  ) {
                         UnionInstType unionInst( Type::Qualifiers(), unionDecl->get_name() );
                         unionInst.set_baseUnion( unionDecl );
@@ -607 +615 @@
                                 unionInst.get_parameters().push_back( new TypeExpr( new TypeInstType( Type::Qualifiers(), typeDecl->get_name(), typeDecl ) ) );
                         }
-                        makeUnionFunctions( unionDecl, &unionInst, functionNesting, declsToAddAfter );
+                        UnionFuncGenerator gen( unionDecl, &unionInst, data, functionNesting, indexer );
+                        generateFunctions( gen, declsToAddAfter );
                 } // if
         }
 
-        Type * declToTypeDeclBase( Declaration * decl ) {
-                if ( TypeDecl * td = dynamic_cast< TypeDecl * >( decl ) ) {
-                        return td->base;
-                }
-                return nullptr;
-        }
-
         // generate ctor/dtors/assign for typedecls, e.g., otype T = int *;
-        void AutogenerateRoutines::visit( TypeDecl *typeDecl ) {
+        void AutogenerateRoutines::previsit( TypeDecl * typeDecl ) {
+                visit_children = false;
                 if ( ! typeDecl->base ) return;
 
-                // generate each of the functions based on the supplied FuncData objects
-                std::list< FunctionDecl * > newFuncs;
-                std::list< Declaration * > tds { typeDecl };
-                std::list< TypeDecl * > typeParams;
                 TypeInstType refType( Type::Qualifiers(), typeDecl->name, typeDecl );
-                auto generator = makeFuncGenerator( lazy_map( tds, declToTypeDeclBase ), &refType, functionNesting, typeParams, back_inserter( newFuncs ) );
-                for ( const FuncData & d : data ) {
-                        generator.gen( d, false );
-                }
-
-                if ( functionNesting == 0 ) {
-                        // forward declare if top-level struct, so that
-                        // type is complete as soon as its body ends
-                        // Note: this is necessary if we want structs which contain
-                        // generic (otype) structs as members.
-                        for ( FunctionDecl * dcl : newFuncs ) {
-                                addForwardDecl( dcl, declsToAddAfter );
-                        }
-                }
-
-                for ( FunctionDecl * dcl : newFuncs ) {
-                        FunctionType * ftype = dcl->type;
-                        assertf( ftype->parameters.size() == 1 || ftype->parameters.size() == 2, "Incorrect number of parameters in autogenerated typedecl function: %zd", ftype->parameters.size() );
-                        DeclarationWithType * dst = ftype->parameters.front();
-                        DeclarationWithType * src = ftype->parameters.size() == 2 ? ftype->parameters.back() : nullptr;
-                        // generate appropriate calls to member ctor, assignment
-                        // destructor needs to do everything in reverse, so pass "forward" based on whether the function is a destructor
-                        UntypedExpr * expr = new UntypedExpr( new NameExpr( dcl->name ) );
-                        expr->args.push_back( new CastExpr( new VariableExpr( dst ), new ReferenceType( Type::Qualifiers(), typeDecl->base->clone() ) ) );
-                        if ( src ) expr->args.push_back( new CastExpr( new VariableExpr( src ), typeDecl->base->clone() ) );
-                        dcl->statements->kids.push_back( new ExprStmt( noLabels, expr ) );
-                        if ( CodeGen::isAssignment( dcl->get_name() ) ) {
-                                // assignment needs to return a value
-                                FunctionType * assignType = dcl->type;
-                                assert( assignType->parameters.size() == 2 );
-                                ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.back() );
-                                dcl->statements->kids.push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
-                        }
-                        declsToAddAfter.push_back( dcl );
-                }
-        }
-
-        void addDecls( std::list< Declaration * > &declsToAdd, std::list< Statement * > &statements, std::list< Statement * >::iterator i ) {
-                for ( std::list< Declaration * >::iterator decl = declsToAdd.begin(); decl != declsToAdd.end(); ++decl ) {
-                        statements.insert( i, new DeclStmt( noLabels, *decl ) );
-                } // for
-                declsToAdd.clear();
-        }
-
-        void AutogenerateRoutines::visit( FunctionType *) {
+                TypeFuncGenerator gen( typeDecl, &refType, data, functionNesting, indexer );
+                generateFunctions( gen, declsToAddAfter );
+        }
+
+        void AutogenerateRoutines::previsit( FunctionType *) {
                 // ensure that we don't add assignment ops for types defined as part of the function
-        }
-
-        void AutogenerateRoutines::visit( PointerType *) {
+                visit_children = false;
+        }
+
+        void AutogenerateRoutines::previsit( PointerType *) {
                 // ensure that we don't add assignment ops for types defined as part of the pointer
-        }
-
-        void AutogenerateRoutines::visit( TraitDecl *) {
+                visit_children = false;
+        }
+
+        void AutogenerateRoutines::previsit( TraitDecl * ) {
                 // ensure that we don't add assignment ops for types defined as part of the trait
-        }
-
-        template< typename StmtClass >
-        inline void AutogenerateRoutines::visitStatement( StmtClass *stmt ) {
-                std::set< std::string > oldStructs = structsDone;
-                addVisit( stmt, *this );
-                structsDone = oldStructs;
-        }
-
-        void AutogenerateRoutines::visit( FunctionDecl *functionDecl ) {
+                visit_children = false;
+        }
+
+        void AutogenerateRoutines::previsit( FunctionDecl * functionDecl ) {
+                visit_children = false;
                 // record the existence of this function as appropriate
-                insert( functionDecl, constructable, InitTweak::isDefaultConstructor );
-                insert( functionDecl, assignable, InitTweak::isAssignment );
-                insert( functionDecl, copyable, InitTweak::isCopyConstructor );
-                insert( functionDecl, destructable, InitTweak::isDestructor );
-
-                maybeAccept( functionDecl->get_functionType(), *this );
+                managedTypes.handleDWT( functionDecl );
+
+                maybeAccept( functionDecl->type, *visitor );
                 functionNesting += 1;
-                maybeAccept( functionDecl->get_statements(), *this );
+                maybeAccept( functionDecl->statements, *visitor );
                 functionNesting -= 1;
         }
 
-        void AutogenerateRoutines::visit( CompoundStmt *compoundStmt ) {
-                constructable.beginScope();
-                assignable.beginScope();
-                copyable.beginScope();
-                destructable.beginScope();
-                visitStatement( compoundStmt );
-                constructable.endScope();
-                assignable.endScope();
-                copyable.endScope();
-                destructable.endScope();
-        }
-
-        void AutogenerateRoutines::visit( SwitchStmt *switchStmt ) {
-                visitStatement( switchStmt );
+        void AutogenerateRoutines::previsit( CompoundStmt * ) {
+                GuardScope( managedTypes );
+                GuardScope( structsDone );
         }
 
@@ -734 +676 @@
         }
 
-        Type * AutogenTupleRoutines::mutate( TupleType * tupleType ) {
-                tupleType = strict_dynamic_cast< TupleType * >( Parent::mutate( tupleType ) );
+        void AutogenTupleRoutines::postvisit( TupleType * tupleType ) {
                 std::string mangleName = SymTab::Mangler::mangleType( tupleType );
-                if ( seenTuples.find( mangleName ) != seenTuples.end() ) return tupleType;
+                if ( seenTuples.find( mangleName ) != seenTuples.end() ) return;
                 seenTuples.insert( mangleName );
 
@@ -755 +696 @@
                         if ( TypeInstType * ty = dynamic_cast< TypeInstType * >( t ) ) {
                                 if ( ! done.count( ty->get_baseType() ) ) {
-                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Dtype, true );
                                         TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?=?", Type::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,
@@ -785 +726 @@
                 makeTupleFunctionBody( dtorDecl );
 
-                addDeclaration( ctorDecl );
-                addDeclaration( copyCtorDecl );
-                addDeclaration( dtorDecl );
-                addDeclaration( assignDecl ); // assignment should come last since it uses copy constructor in return
-
-                return tupleType;
-        }
-
-        DeclarationWithType * AutogenTupleRoutines::mutate( FunctionDecl *functionDecl ) {
-                functionDecl->set_functionType( maybeMutate( functionDecl->get_functionType(), *this ) );
+                declsToAddBefore.push_back( ctorDecl );
+                declsToAddBefore.push_back( copyCtorDecl );
+                declsToAddBefore.push_back( dtorDecl );
+                declsToAddBefore.push_back( assignDecl ); // assignment should come last since it uses copy constructor in return
+        }
+
+        void AutogenTupleRoutines::previsit( FunctionDecl *functionDecl ) {
+                visit_children = false;
+                maybeAccept( functionDecl->type, *visitor );
                 functionNesting += 1;
-                functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
+                maybeAccept( functionDecl->statements, *visitor );
                 functionNesting -= 1;
-                return functionDecl;
-        }
-
-        CompoundStmt * AutogenTupleRoutines::mutate( CompoundStmt *compoundStmt ) {
-                seenTuples.beginScope();
-                compoundStmt = strict_dynamic_cast< CompoundStmt * >( Parent::mutate( compoundStmt ) );
-                seenTuples.endScope();
-                return compoundStmt;
+        }
+
+        void AutogenTupleRoutines::previsit( CompoundStmt * ) {
+                GuardScope( seenTuples );
         }
 } // SymTab