Changeset 7dc09294

Timestamp:

Sep 13, 2017, 7:27:12 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

982832e

Parents:

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

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• Common/PassVisitor.h (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (1 diff)
• Common/utility.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (22 diffs)
• Parser/DeclarationNode.cc (modified) (1 diff)
• ResolvExpr/CastCost.cc (modified) (1 diff)
• ResolvExpr/ConversionCost.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (8 diffs)
• SymTab/Validate.cc (modified) (10 diffs)
• SynTree/Declaration.h (modified) (2 diffs)
• SynTree/Mutator.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/ObjectDecl.cc (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)
• tests/.expect/64/literals.txt (added)

src/CodeGen/CodeGenerator.cc

@@ -258 +258 @@
 
         void CodeGenerator::visit( TraitDecl * traitDecl ) {
-                assertf( ! genC, "TraitDecl nodes should not reach code generation." );
+                assertf( ! genC, "TraitDecls should not reach code generation." );
                 extension( traitDecl );
                 handleAggregate( traitDecl, "trait " );
@@ -271 +271 @@
 
         void CodeGenerator::visit( TypeDecl * typeDecl ) {
-                if ( genC ) {
-                        // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
-                        // still to be done
-                        extension( typeDecl );
-                        output << "extern unsigned long " << typeDecl->get_name();
-                        if ( typeDecl->get_base() ) {
-                                output << " = sizeof( " << genType( typeDecl->get_base(), "", pretty, genC ) << " )";
-                        } // if
-                } else {
-                        output << typeDecl->genTypeString() << " " << typeDecl->get_name();
-                        if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
-                                output << " | sized(" << typeDecl->get_name() << ")";
-                        }
-                        if ( ! typeDecl->get_assertions().empty() ) {
-                                output << " | { ";
-                                genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
-                                output << " }";
-                        }
+                assertf( ! genC, "TypeDecls should not reach code generation." );
+                output << typeDecl->genTypeString() << " " << typeDecl->get_name();
+                if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
+                        output << " | sized(" << typeDecl->get_name() << ")";
+                }
+                if ( ! typeDecl->get_assertions().empty() ) {
+                        output << " | { ";
+                        genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
+                        output << " }";
                 }
         }

src/Common/PassVisitor.h

@@ -145 +145 @@
         virtual Declaration* mutate( EnumDecl *aggregateDecl ) override final;
         virtual Declaration* mutate( TraitDecl *aggregateDecl ) override final;
-        virtual TypeDecl* mutate( TypeDecl *typeDecl ) override final;
+        virtual Declaration* mutate( TypeDecl *typeDecl ) override final;
         virtual Declaration* mutate( TypedefDecl *typeDecl ) override final;
         virtual AsmDecl* mutate( AsmDecl *asmDecl ) override final;

src/Common/PassVisitor.impl.h

@@ -976 +976 @@
 
 template< typename pass_type >
-TypeDecl * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
-        MUTATE_BODY( TypeDecl, node );
+Declaration * PassVisitor< pass_type >::mutate( TypeDecl * node ) {
+        MUTATE_BODY( Declaration, node );
 }
 

src/Common/utility.h

@@ -370 +370 @@
 }
 
+// -----------------------------------------------------------------------------
+// Helper struct and function to support
+// for ( val : lazy_map( container1, f ) ) {}
+// syntax to have a for each that iterates a container, mapping each element by applying f
+template< typename T, typename Func >
+struct lambda_iterate_t {
+        const T & ref;
+        std::function<Func> f;
+
+        struct iterator {
+                typedef decltype(begin(ref)) Iter;
+                Iter it;
+                std::function<Func> f;
+                iterator( Iter it, std::function<Func> f ) : it(it), f(f) {}
+                iterator & operator++() {
+                        ++it; return *this;
+                }
+                bool operator!=( const iterator &other ) const { return it != other.it; }
+                auto operator*() const -> decltype(f(*it)) { return f(*it); }
+        };
+
+        lambda_iterate_t( const T & ref, std::function<Func> f ) : ref(ref), f(f) {}
+
+        auto begin() const -> decltype(iterator(std::begin(ref), f)) { return iterator(std::begin(ref), f); }
+        auto end() const   -> decltype(iterator(std::end(ref), f)) { return iterator(std::end(ref), f); }
+};
+
+template< typename... Args >
+lambda_iterate_t<Args...> lazy_map( const Args &... args ) {
+        return lambda_iterate_t<Args...>( args...);
+}
+
+
+
 // Local Variables: //
 // tab-width: 4 //

src/GenPoly/Box.cc

@@ -27 +27 @@
 
 #include "CodeGen/OperatorTable.h"
+#include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/ScopedMap.h"            // for ScopedMap, ScopedMap<>::iter...
 #include "Common/SemanticError.h"        // for SemanticError
@@ -157 +158 @@
                 /// * Calculates polymorphic offsetof expressions from offset array
                 /// * Inserts dynamic calculation of polymorphic type layouts where needed
-                class PolyGenericCalculator final : public PolyMutator {
+                class PolyGenericCalculator final : public WithGuards, public WithVisitorRef<PolyGenericCalculator>, public WithStmtsToAdd, public WithDeclsToAdd, public WithTypeSubstitution {
                 public:
-                        typedef PolyMutator Parent;
-                        using Parent::mutate;
-
                         PolyGenericCalculator();
 
-                        template< typename DeclClass >
-                        DeclClass *handleDecl( DeclClass *decl, Type *type );
-                        virtual DeclarationWithType *mutate( FunctionDecl *functionDecl ) override;
-                        virtual ObjectDecl *mutate( ObjectDecl *objectDecl ) override;
-                        virtual TypedefDecl *mutate( TypedefDecl *objectDecl ) override;
-                        virtual TypeDecl *mutate( TypeDecl *objectDecl ) override;
-                        virtual Statement *mutate( DeclStmt *declStmt ) override;
-                        virtual Type *mutate( PointerType *pointerType ) override;
-                        virtual Type *mutate( FunctionType *funcType ) override;
-                        virtual Expression *mutate( MemberExpr *memberExpr ) override;
-                        virtual Expression *mutate( SizeofExpr *sizeofExpr ) override;
-                        virtual Expression *mutate( AlignofExpr *alignofExpr ) override;
-                        virtual Expression *mutate( OffsetofExpr *offsetofExpr ) override;
-                        virtual Expression *mutate( OffsetPackExpr *offsetPackExpr ) override;
-
-                        virtual void doBeginScope() override;
-                        virtual void doEndScope() override;
+                        void premutate( ObjectDecl *objectDecl );
+                        void premutate( FunctionDecl *functionDecl );
+                        void premutate( TypedefDecl *objectDecl );
+                        void premutate( TypeDecl *objectDecl );
+                        Declaration * postmutate( TypeDecl *TraitDecl );
+                        void premutate( PointerType *pointerType );
+                        void premutate( FunctionType *funcType );
+                        void premutate( DeclStmt *declStmt );
+                        Expression *postmutate( MemberExpr *memberExpr );
+                        Expression *postmutate( SizeofExpr *sizeofExpr );
+                        Expression *postmutate( AlignofExpr *alignofExpr );
+                        Expression *postmutate( OffsetofExpr *offsetofExpr );
+                        Expression *postmutate( OffsetPackExpr *offsetPackExpr );
+
+                        void beginScope();
+                        void endScope();
 
                 private:
@@ -194 +191 @@
                         /// Exits the type-variable scope
                         void endTypeScope();
+                        /// Enters a new scope for knowLayouts and knownOffsets and queues exit calls
+                        void beginGenericScope();
 
                         ScopedSet< std::string > knownLayouts;          ///< Set of generic type layouts known in the current scope, indexed by sizeofName
                         ScopedSet< std::string > knownOffsets;          ///< Set of non-generic types for which the offset array exists in the current scope, indexed by offsetofName
                         UniqueName bufNamer;                           ///< Namer for VLA buffers
+                        TyVarMap scopeTyVars;
                 };
 
@@ -250 +250 @@
                 Pass1 pass1;
                 Pass2 pass2;
-                PolyGenericCalculator polyCalculator;
+                PassVisitor<PolyGenericCalculator> polyCalculator;
                 Pass3 pass3;
 
@@ -256 +256 @@
                 mutateTranslationUnit/*All*/( translationUnit, pass1 );
                 mutateTranslationUnit/*All*/( translationUnit, pass2 );
-                mutateTranslationUnit/*All*/( translationUnit, polyCalculator );
+                mutateAll( translationUnit, polyCalculator );
                 mutateTranslationUnit/*All*/( translationUnit, pass3 );
         }
@@ -555 +555 @@
                 TypeDecl *Pass1::mutate( TypeDecl *typeDecl ) {
                         addToTyVarMap( typeDecl, scopeTyVars );
-                        return Mutator::mutate( typeDecl );
+                        return dynamic_cast<TypeDecl*>( Mutator::mutate( typeDecl ) );
                 }
 
@@ -762 +762 @@
                                 } else if ( arg->get_result()->get_lvalue() ) {
                                         // argument expression may be CFA lvalue, but not C lvalue -- apply generalizedLvalue transformations.
+                                        // if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( arg ) ) {
+                                        //      if ( dynamic_cast<ArrayType *>( varExpr->var->get_type() ) ){
+                                        //              // temporary hack - don't box arrays, because &arr is not the same as &arr[0]
+                                        //              return;
+                                        //      }
+                                        // }
                                         arg =  generalizedLvalue( new AddressExpr( arg ) );
                                         if ( ! ResolvExpr::typesCompatible( param, arg->get_result(), SymTab::Indexer() ) ) {
@@ -1353 +1359 @@
                                 return handleDecl( typeDecl );
                         } else {
-                                return Parent::mutate( typeDecl );
+                                return dynamic_cast<TypeDecl*>( Parent::mutate( typeDecl ) );
                         }
                 }
@@ -1466 +1472 @@
 
                 PolyGenericCalculator::PolyGenericCalculator()
-                        : Parent(), knownLayouts(), knownOffsets(), bufNamer( "_buf" ) {}
+                        : knownLayouts(), knownOffsets(), bufNamer( "_buf" ), scopeTyVars( TypeDecl::Data{} ) {}
 
                 void PolyGenericCalculator::beginTypeScope( Type *ty ) {
-                        scopeTyVars.beginScope();
+                        GuardScope( scopeTyVars );
                         makeTyVarMap( ty, scopeTyVars );
                 }
 
-                void PolyGenericCalculator::endTypeScope() {
-                        scopeTyVars.endScope();
-                }
-
-                template< typename DeclClass >
-                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();
-
-                        DeclarationWithType * decl = handleDecl( functionDecl, functionDecl->get_functionType() );
-                        knownOffsets.endScope();
-                        knownLayouts.endScope();
-                        return decl;
-                }
-
-                TypedefDecl * PolyGenericCalculator::mutate( TypedefDecl *typedefDecl ) {
-                        return handleDecl( typedefDecl, typedefDecl->get_base() );
-                }
-
-                TypeDecl * PolyGenericCalculator::mutate( TypeDecl *typeDecl ) {
+                void PolyGenericCalculator::beginGenericScope() {
+                        GuardScope( *this );
+                }
+
+                void PolyGenericCalculator::premutate( ObjectDecl *objectDecl ) {
+                        beginTypeScope( objectDecl->get_type() );
+                }
+
+                void PolyGenericCalculator::premutate( FunctionDecl *functionDecl ) {
+                        beginGenericScope();
+
+                        beginTypeScope( functionDecl->get_functionType() );
+                }
+
+                void PolyGenericCalculator::premutate( TypedefDecl *typedefDecl ) {
+                        beginTypeScope( typedefDecl->get_base() );
+                }
+
+                void PolyGenericCalculator::premutate( TypeDecl * typeDecl ) {
                         addToTyVarMap( typeDecl, scopeTyVars );
-                        return Parent::mutate( typeDecl );
-                }
-
-                Type * PolyGenericCalculator::mutate( PointerType *pointerType ) {
+                }
+
+                Declaration * PolyGenericCalculator::postmutate( TypeDecl *typeDecl ) {
+                        if ( Type * base = typeDecl->base ) {
+                                // add size/align variables for opaque type declarations
+                                TypeInstType inst( Type::Qualifiers(), typeDecl->name, typeDecl );
+                                std::string typeName = mangleType( &inst );
+                                Type *layoutType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+
+                                ObjectDecl * sizeDecl = ObjectDecl::newObject( sizeofName( typeName ), layoutType, new SingleInit( new SizeofExpr( base->clone() ) ) );
+                                ObjectDecl * alignDecl = ObjectDecl::newObject( alignofName( typeName ), layoutType->clone(), new SingleInit( new AlignofExpr( base->clone() ) ) );
+
+                                // ensure that the initializing sizeof/alignof exprs are properly mutated
+                                sizeDecl->acceptMutator( *visitor );
+                                alignDecl->acceptMutator( *visitor );
+
+                                // can't use makeVar, because it inserts into stmtsToAdd and TypeDecls can occur at global scope
+                                declsToAddAfter.push_back( alignDecl );
+                                // replace with sizeDecl
+                                return sizeDecl;
+                        }
+                        return typeDecl;
+                }
+
+                void PolyGenericCalculator::premutate( PointerType *pointerType ) {
                         beginTypeScope( pointerType );
-
-                        Type *ret = Parent::mutate( pointerType );
-
-                        endTypeScope();
-                        return ret;
-                }
-
-                Type * PolyGenericCalculator::mutate( FunctionType *funcType ) {
+                }
+
+                void PolyGenericCalculator::premutate( FunctionType *funcType ) {
                         beginTypeScope( funcType );
 
@@ -1534 +1538 @@
                                 }
                         }
-
-                        Type *ret = Parent::mutate( funcType );
-
-                        endTypeScope();
-                        return ret;
-                }
-
-                Statement *PolyGenericCalculator::mutate( DeclStmt *declStmt ) {
+                }
+
+                void PolyGenericCalculator::premutate( DeclStmt *declStmt ) {
                         if ( ObjectDecl *objectDecl = dynamic_cast< ObjectDecl *>( declStmt->get_decl() ) ) {
                                 if ( findGeneric( objectDecl->get_type() ) ) {
@@ -1550 +1549 @@
                                                 new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ),
                                                 true, false, std::list<Attribute*>{ new Attribute( "aligned", std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
-                                        stmtsToAdd.push_back( new DeclStmt( noLabels, newBuf ) );
+                                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, newBuf ) );
 
                                         delete objectDecl->get_init();
@@ -1556 +1555 @@
                                 }
                         }
-                        return Parent::mutate( declStmt );
                 }
 
@@ -1583 +1581 @@
                 }
 
-                Expression *PolyGenericCalculator::mutate( MemberExpr *memberExpr ) {
-                        // mutate, exiting early if no longer MemberExpr
-                        Expression *expr = Parent::mutate( memberExpr );
-                        memberExpr = dynamic_cast< MemberExpr* >( expr );
-                        if ( ! memberExpr ) return expr;
-
+                Expression *PolyGenericCalculator::postmutate( MemberExpr *memberExpr ) {
                         // only mutate member expressions for polymorphic types
                         int tyDepth;
@@ -1635 +1628 @@
                 ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) {
                         ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, 0, type, init );
-                        stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
+                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) );
                         return newObj;
                 }
@@ -1714 +1707 @@
                                         addOtypeParamsToLayoutCall( layoutCall, otypeParams );
 
-                                        stmtsToAdd.push_back( new ExprStmt( noLabels, layoutCall ) );
+                                        stmtsToAddBefore.push_back( new ExprStmt( noLabels, layoutCall ) );
                                 }
 
@@ -1740 +1733 @@
                                 addOtypeParamsToLayoutCall( layoutCall, otypeParams );
 
-                                stmtsToAdd.push_back( new ExprStmt( noLabels, layoutCall ) );
+                                stmtsToAddBefore.push_back( new ExprStmt( noLabels, layoutCall ) );
 
                                 return true;
@@ -1748 +1741 @@
                 }
 
-                Expression *PolyGenericCalculator::mutate( SizeofExpr *sizeofExpr ) {
+                Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
                         Type *ty = sizeofExpr->get_isType() ? sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
                         if ( findGeneric( ty ) ) {
@@ -1758 +1751 @@
                 }
 
-                Expression *PolyGenericCalculator::mutate( AlignofExpr *alignofExpr ) {
+                Expression *PolyGenericCalculator::postmutate( AlignofExpr *alignofExpr ) {
                         Type *ty = alignofExpr->get_isType() ? alignofExpr->get_type() : alignofExpr->get_expr()->get_result();
                         if ( findGeneric( ty ) ) {
@@ -1768 +1761 @@
                 }
 
-                Expression *PolyGenericCalculator::mutate( OffsetofExpr *offsetofExpr ) {
-                        // mutate, exiting early if no longer OffsetofExpr
-                        Expression *expr = Parent::mutate( offsetofExpr );
-                        offsetofExpr = dynamic_cast< OffsetofExpr* >( expr );
-                        if ( ! offsetofExpr ) return expr;
-
+                Expression *PolyGenericCalculator::postmutate( OffsetofExpr *offsetofExpr ) {
                         // only mutate expressions for polymorphic structs/unions
                         Type *ty = offsetofExpr->get_type();
@@ -1793 +1781 @@
                 }
 
-                Expression *PolyGenericCalculator::mutate( OffsetPackExpr *offsetPackExpr ) {
+                Expression *PolyGenericCalculator::postmutate( OffsetPackExpr *offsetPackExpr ) {
                         StructInstType *ty = offsetPackExpr->get_type();
 
@@ -1832 +1820 @@
                 }
 
-                void PolyGenericCalculator::doBeginScope() {
+                void PolyGenericCalculator::beginScope() {
                         knownLayouts.beginScope();
                         knownOffsets.beginScope();
                 }
 
-                void PolyGenericCalculator::doEndScope() {
+                void PolyGenericCalculator::endScope() {
                         knownLayouts.endScope();
                         knownOffsets.endScope();
@@ -1894 +1882 @@
 
                         addToTyVarMap( typeDecl, scopeTyVars );
-                        return Mutator::mutate( typeDecl );
+                        return dynamic_cast<TypeDecl*>( Mutator::mutate( typeDecl ) );
                 }
 

src/Parser/DeclarationNode.cc

@@ -333 +333 @@
 DeclarationNode * DeclarationNode::newTypeDecl( string * name, DeclarationNode * typeParams ) {
         DeclarationNode * newnode = new DeclarationNode;
+        newnode->name = name;
         newnode->type = new TypeData( TypeData::Symbolic );
         newnode->type->symbolic.isTypedef = false;
         newnode->type->symbolic.params = typeParams;
-        newnode->type->symbolic.name = name;
         return newnode;
 } // DeclarationNode::newTypeDecl

src/ResolvExpr/CastCost.cc

@@ -45 +45 @@
                                 }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
-                                TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
                                 // all typedefs should be gone by this point
-                                assert( type );
+                                TypeDecl *type = safe_dynamic_cast< TypeDecl* >( namedType );
                                 if ( type->get_base() ) {
                                         return castCost( src, type->get_base(), indexer, env ) + Cost::safe;

src/ResolvExpr/ConversionCost.cc

@@ -92 +92 @@
 
         Cost convertToReferenceCost( Type * src, Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
-                PRINT( std::cerr << "convert to reference cost..." << std::endl; )
+                PRINT( std::cerr << "convert to reference cost... diff " << diff << std::endl; )
                 if ( diff > 0 ) {
                         // TODO: document this
@@ -128 +128 @@
                         ReferenceType * destAsRef = dynamic_cast< ReferenceType * >( dest );
                         assert( diff == -1 && destAsRef );
+                        PRINT( std::cerr << "dest is: " << dest << " / src is: " << src << std::endl; )
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->get_base(), indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )

src/SymTab/Autogen.cc

@@ -163 +163 @@
                 // Routines at global scope marked "static" to prevent multiple definitions in separate translation units
                 // because each unit generates copies of the default routines for each aggregate.
-//              DeclarationNode::StorageClass sc = functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static;
                 Type::StorageClasses scs = functionNesting > 0 ? Type::StorageClasses() : Type::StorageClasses( Type::Static );
                 LinkageSpec::Spec spec = isIntrinsic ? LinkageSpec::Intrinsic : LinkageSpec::AutoGen;
@@ -186 +185 @@
         /// 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
@@ -200 +200 @@
 
         /// using map and aggr, examines each member to determine if constructor, etc. should be generated
-        template<typename AggrDecl>
-        bool shouldGenerate( const TypeMap & map, AggrDecl * aggr ) {
-                for ( Declaration * dcl : aggr->get_members() ) {
-                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( dcl ) ) {
-                                if ( ! lookup( map, dwt->get_type() ) ) return false;
-                        }
+        template<typename Container>
+        bool shouldGenerate( const TypeMap & map, const Container & container ) {
+                for ( Type * t : container ) {
+                        if ( ! lookup( map, t ) ) return false;
                 }
                 return true;
@@ -211 +209 @@
 
         /// data structure for abstracting the generation of special functions
-        template< typename OutputIterator >
+        template< typename OutputIterator, typename Container >
         struct FuncGenerator {
-                StructDecl *aggregateDecl;
-                StructInstType *refType;
+                const Container & container;
+                Type *refType;
                 unsigned int functionNesting;
                 const std::list< TypeDecl* > & typeParams;
                 OutputIterator out;
-                FuncGenerator( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, const std::list< TypeDecl* > & typeParams, OutputIterator out ) : aggregateDecl( aggregateDecl ), refType( refType ), functionNesting( functionNesting ), typeParams( typeParams ), out( 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, aggregateDecl ) ) return;
+                        if ( ! shouldGenerate( data.map, container ) ) return;
                         FunctionType * ftype = data.genType( refType );
 
                         if(concurrent_type && CodeGen::isDestructor( data.fname )) {
-                                ftype->get_parameters().front()->get_type()->set_mutex( true );
-                        }
-
-                        cloneAll( typeParams, ftype->get_forall() );
+                                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 );
@@ -235 +233 @@
         };
 
-        template< typename OutputIterator >
-        FuncGenerator<OutputIterator> makeFuncGenerator( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, const std::list< TypeDecl* > & typeParams, OutputIterator out ) {
-                return FuncGenerator<OutputIterator>( aggregateDecl, refType, functionNesting, typeParams, out );
+        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 );
         }
 
@@ -393 +391 @@
         }
 
+        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 ) {
@@ -406 +411 @@
                 // generate each of the functions based on the supplied FuncData objects
                 std::list< FunctionDecl * > newFuncs;
-                auto generator = makeFuncGenerator( aggregateDecl, refType, functionNesting, typeParams, back_inserter( 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() );
@@ -605 +611 @@
         }
 
+        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 ) {
-                TypeInstType *typeInst = new TypeInstType( Type::Qualifiers(), typeDecl->get_name(), false );
-                typeInst->set_baseType( typeDecl );
-                ObjectDecl *src = new ObjectDecl( "_src", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, typeInst->clone(), nullptr );
-                ObjectDecl *dst = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), typeInst->clone() ), nullptr );
-
-                std::list< Statement * > stmts;
-                if ( typeDecl->get_base() ) {
-                        // xxx - generate ctor/dtors for typedecls, e.g.
-                        // otype T = int *;
-                        UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                        assign->get_args().push_back( new CastExpr( new VariableExpr( dst ), new PointerType( Type::Qualifiers(), typeDecl->get_base()->clone() ) ) );
-                        assign->get_args().push_back( new CastExpr( new VariableExpr( src ), typeDecl->get_base()->clone() ) );
-                        stmts.push_back( new ReturnStmt( std::list< Label >(), assign ) );
-                } // if
-                FunctionType *type = new FunctionType( Type::Qualifiers(), false );
-                type->get_returnVals().push_back( new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, typeInst, 0 ) );
-                type->get_parameters().push_back( dst );
-                type->get_parameters().push_back( src );
-                FunctionDecl *func = genFunc( "?=?", type, functionNesting );
-                func->get_statements()->get_kids() = stmts;
-                declsToAddAfter.push_back( func );
+                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 = safe_dynamic_cast< ObjectDecl * >( assignType->parameters.back() );
+                                dcl->statements->kids.push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
+                        }
+                        declsToAddAfter.push_back( dcl );
+                }
         }
 

src/SymTab/Validate.cc

@@ -176 +176 @@
         };
 
-        class EliminateTypedef : public Mutator {
-          public:
+        struct EliminateTypedef final : public WithVisitorRef<EliminateTypedef>, public WithGuards {
                 EliminateTypedef() : scopeLevel( 0 ) {}
                 /// Replaces typedefs by forward declarations
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
+
+                Type * postmutate( TypeInstType * aggregateUseType );
+                Declaration * postmutate( TypedefDecl * typeDecl );
+                void premutate( TypeDecl * typeDecl );
+                void premutate( FunctionDecl * funcDecl );
+                void premutate( ObjectDecl * objDecl );
+                DeclarationWithType * postmutate( ObjectDecl * objDecl );
+
+                void premutate( CastExpr * castExpr );
+
+                void premutate( CompoundStmt * compoundStmt );
+                CompoundStmt * postmutate( CompoundStmt * compoundStmt );
+
+                void premutate( StructDecl * structDecl );
+                Declaration * postmutate( StructDecl * structDecl );
+                void premutate( UnionDecl * unionDecl );
+                Declaration * postmutate( UnionDecl * unionDecl );
+                void premutate( EnumDecl * enumDecl );
+                Declaration * postmutate( EnumDecl * enumDecl );
+                Declaration * postmutate( TraitDecl * contextDecl );
+
           private:
-                virtual Declaration *mutate( TypedefDecl *typeDecl );
-                virtual TypeDecl *mutate( TypeDecl *typeDecl );
-                virtual DeclarationWithType *mutate( FunctionDecl *funcDecl );
-                virtual DeclarationWithType *mutate( ObjectDecl *objDecl );
-                virtual CompoundStmt *mutate( CompoundStmt *compoundStmt );
-                virtual Type *mutate( TypeInstType *aggregateUseType );
-                virtual Expression *mutate( CastExpr *castExpr );
-
-                virtual Declaration *mutate( StructDecl * structDecl );
-                virtual Declaration *mutate( UnionDecl * unionDecl );
-                virtual Declaration *mutate( EnumDecl * enumDecl );
-                virtual Declaration *mutate( TraitDecl * contextDecl );
-
                 template<typename AggDecl>
                 AggDecl *handleAggregate( AggDecl * aggDecl );
@@ -667 +674 @@
 
         void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
-                EliminateTypedef eliminator;
+                PassVisitor<EliminateTypedef> eliminator;
                 mutateAll( translationUnit, eliminator );
-                if ( eliminator.typedefNames.count( "size_t" ) ) {
+                if ( eliminator.pass.typedefNames.count( "size_t" ) ) {
                         // grab and remember declaration of size_t
-                        SizeType = eliminator.typedefNames["size_t"].first->get_base()->clone();
+                        SizeType = eliminator.pass.typedefNames["size_t"].first->get_base()->clone();
                 } else {
                         // xxx - missing global typedef for size_t - default to long unsigned int, even though that may be wrong
@@ -681 +688 @@
         }
 
-        Type *EliminateTypedef::mutate( TypeInstType * typeInst ) {
+        Type * EliminateTypedef::postmutate( TypeInstType * typeInst ) {
                 // instances of typedef types will come here. If it is an instance
                 // of a typdef type, link the instance to its actual type.
@@ -696 +703 @@
                                 rtt->get_parameters().clear();
                                 cloneAll( typeInst->get_parameters(), rtt->get_parameters() );
-                                mutateAll( rtt->get_parameters(), *this );  // recursively fix typedefs on parameters
+                                mutateAll( rtt->get_parameters(), *visitor );  // recursively fix typedefs on parameters
                         } // if
                         delete typeInst;
@@ -708 +715 @@
         }
 
-        Declaration *EliminateTypedef::mutate( TypedefDecl * tyDecl ) {
-                Declaration *ret = Mutator::mutate( tyDecl );
-
+        Declaration *EliminateTypedef::postmutate( TypedefDecl * tyDecl ) {
                 if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
                         // typedef to the same name from the same scope
@@ -741 +746 @@
                         return new EnumDecl( enumDecl->get_name(), noAttributes, tyDecl->get_linkage() );
                 } else {
-                        return ret->clone();
-                } // if
-        }
-
-        TypeDecl *EliminateTypedef::mutate( TypeDecl * typeDecl ) {
+                        return tyDecl->clone();
+                } // if
+        }
+
+        void EliminateTypedef::premutate( TypeDecl * typeDecl ) {
                 TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
                 if ( i != typedefNames.end() ) {
@@ -752 +757 @@
 
                 typedeclNames[ typeDecl->get_name() ] = typeDecl;
-                return Mutator::mutate( typeDecl );
-        }
-
-        DeclarationWithType *EliminateTypedef::mutate( FunctionDecl * funcDecl ) {
-                typedefNames.beginScope();
-                DeclarationWithType *ret = Mutator::mutate( funcDecl );
-                typedefNames.endScope();
-                return ret;
-        }
-
-        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
-                typedefNames.beginScope();
-                DeclarationWithType *ret = Mutator::mutate( objDecl );
-                typedefNames.endScope();
-
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) { // function type?
+        }
+
+        void EliminateTypedef::premutate( FunctionDecl * ) {
+                GuardScope( typedefNames );
+        }
+
+        void EliminateTypedef::premutate( ObjectDecl * ) {
+                GuardScope( typedefNames );
+        }
+
+        DeclarationWithType *EliminateTypedef::postmutate( ObjectDecl * objDecl ) {
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( objDecl->get_type() ) ) { // function type?
                         // replace the current object declaration with a function declaration
-                        FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClasses(), ret->get_linkage(), funtype, 0, objDecl->get_attributes(), ret->get_funcSpec() );
+                        FunctionDecl * newDecl = new FunctionDecl( objDecl->get_name(), objDecl->get_storageClasses(), objDecl->get_linkage(), funtype, 0, objDecl->get_attributes(), objDecl->get_funcSpec() );
                         objDecl->get_attributes().clear();
                         objDecl->set_type( nullptr );
@@ -775 +776 @@
                         return newDecl;
                 } // if
-                return ret;
-        }
-
-        Expression *EliminateTypedef::mutate( CastExpr * castExpr ) {
-                typedefNames.beginScope();
-                Expression *ret = Mutator::mutate( castExpr );
-                typedefNames.endScope();
-                return ret;
-        }
-
-        CompoundStmt *EliminateTypedef::mutate( CompoundStmt * compoundStmt ) {
-                typedefNames.beginScope();
+                return objDecl;
+        }
+
+        void EliminateTypedef::premutate( CastExpr * ) {
+                GuardScope( typedefNames );
+        }
+
+        void EliminateTypedef::premutate( CompoundStmt * ) {
+                GuardScope( typedefNames );
                 scopeLevel += 1;
-                CompoundStmt *ret = Mutator::mutate( compoundStmt );
-                scopeLevel -= 1;
+                GuardAction( [this](){ scopeLevel -= 1; } );
+        }
+
+        CompoundStmt *EliminateTypedef::postmutate( CompoundStmt * compoundStmt ) {
                 // remove and delete decl stmts
                 filter( compoundStmt->kids, [](Statement * stmt) {
@@ -799 +799 @@
                         return false;
                 }, true);
-                typedefNames.endScope();
-                return ret;
+                return compoundStmt;
         }
 
@@ -827 +826 @@
         }
 
-        Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
+        void EliminateTypedef::premutate( StructDecl * structDecl ) {
                 addImplicitTypedef( structDecl );
-                Mutator::mutate( structDecl );
+        }
+
+
+        Declaration *EliminateTypedef::postmutate( StructDecl * structDecl ) {
                 return handleAggregate( structDecl );
         }
 
-        Declaration *EliminateTypedef::mutate( UnionDecl * unionDecl ) {
+        void EliminateTypedef::premutate( UnionDecl * unionDecl ) {
                 addImplicitTypedef( unionDecl );
-                Mutator::mutate( unionDecl );
+        }
+
+        Declaration *EliminateTypedef::postmutate( UnionDecl * unionDecl ) {
                 return handleAggregate( unionDecl );
         }
 
-        Declaration *EliminateTypedef::mutate( EnumDecl * enumDecl ) {
+        void EliminateTypedef::premutate( EnumDecl * enumDecl ) {
                 addImplicitTypedef( enumDecl );
-                Mutator::mutate( enumDecl );
+        }
+
+        Declaration *EliminateTypedef::postmutate( EnumDecl * enumDecl ) {
                 return handleAggregate( enumDecl );
         }
 
-        Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
-                Mutator::mutate( contextDecl );
-                return handleAggregate( contextDecl );
+        Declaration *EliminateTypedef::postmutate( TraitDecl * traitDecl ) {
+                return handleAggregate( traitDecl );
         }
 

src/SynTree/Declaration.h

@@ -136 +136 @@
         Expression *get_bitfieldWidth() const { return bitfieldWidth; }
         void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }
+
+        static ObjectDecl * newObject( const std::string & name, Type * type, Initializer * init );
 
         virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
@@ -230 +232 @@
         virtual TypeDecl *clone() const { return new TypeDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
 

src/SynTree/Mutator.cc

@@ -78 +78 @@
 }
 
-TypeDecl * Mutator::mutate( TypeDecl *typeDecl ) {
+Declaration * Mutator::mutate( TypeDecl *typeDecl ) {
         handleNamedTypeDecl( typeDecl );
         typeDecl->set_init( maybeMutate( typeDecl->get_init(), *this ) );

src/SynTree/Mutator.h

@@ -31 +31 @@
         virtual Declaration* mutate( EnumDecl *aggregateDecl );
         virtual Declaration* mutate( TraitDecl *aggregateDecl );
-        virtual TypeDecl* mutate( TypeDecl *typeDecl );
+        virtual Declaration* mutate( TypeDecl *typeDecl );
         virtual Declaration* mutate( TypedefDecl *typeDecl );
         virtual AsmDecl* mutate( AsmDecl *asmDecl );

src/SynTree/ObjectDecl.cc

@@ -38 +38 @@
         delete init;
         delete bitfieldWidth;
+}
+
+ObjectDecl * ObjectDecl::newObject( const std::string & name, Type * type, Initializer * init ) {
+        return new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, 0, type, init );
 }
 

src/SynTree/Statement.cc

@@ -472 +472 @@
 }
 
-NullStmt::NullStmt( std::list<Label> labels ) : CompoundStmt( labels ) {}
-NullStmt::NullStmt() : CompoundStmt( std::list<Label>() ) {}
+NullStmt::NullStmt( std::list<Label> labels ) : Statement( labels ) {}
+NullStmt::NullStmt() : Statement( std::list<Label>() ) {}
 
 void NullStmt::print( std::ostream &os, __attribute__((unused)) int indent ) const {

src/SynTree/Statement.h

@@ -67 +67 @@
 };
 
-class NullStmt : public CompoundStmt {
+class NullStmt : public Statement {
   public:
         NullStmt();