Changes in src/SymTab/Autogen.cc [108f3cdb:be9288a]

File:

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

src/SymTab/Autogen.cc

@@ -13 +13 @@
 // Update Count     : 62
 //
-
 #include "Autogen.h"
 
@@ -25 +24 @@
 #include <vector>                  // for vector
 
-#include "AddVisit.h"              // for addVisit
-#include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
-#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 "SymTab/Mangler.h"        // for Mangler
-#include "SynTree/Attribute.h"     // For Attribute
-#include "SynTree/Mutator.h"       // for maybeMutate
-#include "SynTree/Statement.h"     // for CompoundStmt, ReturnStmt, ExprStmt
-#include "SynTree/Type.h"          // for FunctionType, Type, TypeInstType
-#include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
-
-class Attribute;
+#include "AddVisit.h"             // for addVisit
+#include "Common/ScopedMap.h"     // for ScopedMap
+#include "GenPoly/DeclMutator.h"  // for DeclMutator
+#include "GenPoly/ScopedSet.h"    // for ScopedSet
+#include "Parser/LinkageSpec.h"   // for AutoGen, Intrinsic, Spec
+#include "SymTab/Mangler.h"       // for mangleType
+#include "SynTree/Statement.h"    // for SwitchStmt (ptr only), CompoundStmt
+#include "SynTree/Type.h"         // for Type, ArrayType, Type::StorageClasses
+#include "SynTree/Visitor.h"      // for Visitor
 
 namespace SymTab {
@@ -136 +130 @@
         FunctionType * genDefaultType( Type * paramType ) {
                 FunctionType *ftype = new FunctionType( Type::Qualifiers(), false );
-                ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new ReferenceType( Type::Qualifiers(), paramType->clone() ), nullptr );
+                ObjectDecl *dstParam = new ObjectDecl( "_dst", Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new PointerType( Type::Qualifiers(), paramType->clone() ), nullptr );
                 ftype->get_parameters().push_back( dstParam );
 
@@ -158 +152 @@
         }
 
+        /// true if the aggregate's layout is dynamic
+        template< typename AggrDecl >
+        bool hasDynamicLayout( AggrDecl * aggregateDecl ) {
+                for ( TypeDecl * param : aggregateDecl->get_parameters() ) {
+                        if ( param->isComplete() ) return true;
+                }
+                return false;
+        }
+
         /// generate a function decl from a name and type. Nesting depth determines whether
         /// the declaration is static or not; optional paramter determines if declaration is intrinsic
@@ -163 +166 @@
                 // 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;
@@ -177 +181 @@
                         FunctionType * ftype = funcDecl->get_functionType();
                         assert( ! ftype->get_parameters().empty() );
-                        Type * t = InitTweak::getPointerBase( ftype->get_parameters().front()->get_type() );
-                        assert( t );
+                        Type * t = safe_dynamic_cast< PointerType * >( ftype->get_parameters().front()->get_type() )->get_base();
                         map.insert( Mangler::mangleType( t ), true );
                 }
@@ -185 +188 @@
         /// 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 +202 @@
 
         /// 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;
+        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;
+                        }
                 }
                 return true;
@@ -209 +213 @@
 
         /// data structure for abstracting the generation of special functions
-        template< typename OutputIterator, typename Container >
+        template< typename OutputIterator >
         struct FuncGenerator {
-                const Container & container;
-                Type *refType;
+                StructDecl *aggregateDecl;
+                StructInstType *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 ) {}
+                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 ) {}
 
                 /// 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;
+                        if ( ! shouldGenerate( data.map, aggregateDecl ) ) return;
                         FunctionType * ftype = data.genType( refType );
 
-                        if(concurrent_type && CodeGen::isDestructor( data.fname )) {
-                                ftype->parameters.front()->get_type()->set_mutex( true );
-                        }
-
-                        cloneAll( typeParams, ftype->forall );
+                        if(concurrent_type && InitTweak::isDestructor( data.fname )) {
+                                ftype->get_parameters().front()->get_type()->set_mutex( true );
+                        }
+
+                        cloneAll( typeParams, ftype->get_forall() );
                         *out++ = genFunc( data.fname, ftype, functionNesting );
                         data.map.insert( Mangler::mangleType( refType ), true );
@@ -233 +237 @@
         };
 
-        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 );
+        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 );
         }
 
@@ -275 +279 @@
                 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.
@@ -301 +301 @@
 
         /// 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 ) {
+        void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, bool isDynamicLayout, bool forward = true ) {
+                ObjectDecl * returnVal = NULL;
+                if ( ! func->get_functionType()->get_returnVals().empty() ) {
+                        returnVal = dynamic_cast<ObjectDecl*>( func->get_functionType()->get_returnVals().front() );
+                }
+
                 InitTweak::InitExpander srcParam( src );
 
-                // assign to destination
-                Expression *dstselect = new MemberExpr( field, new CastExpr( new VariableExpr( dstParam ), safe_dynamic_cast< ReferenceType* >( dstParam->get_type() )->get_base()->clone() ) );
+                // assign to destination (and return value if generic)
+                UntypedExpr *derefExpr = UntypedExpr::createDeref( new VariableExpr( dstParam ) );
+                Expression *dstselect = new MemberExpr( field, derefExpr );
                 genImplicitCall( srcParam, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
+
+                if ( isDynamicLayout && returnVal ) {
+                        // xxx - there used to be a dereference on returnVal, but this seems to have been wrong?
+                        Expression *retselect = new MemberExpr( field, new VariableExpr( returnVal ) );
+                        genImplicitCall( srcParam, retselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
+                } // if
         }
 
         /// 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 makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool forward = true ) {
+        void makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, bool isDynamicLayout, bool forward = true ) {
                 for ( ; member != end; ++member ) {
                         if ( DeclarationWithType *field = dynamic_cast< DeclarationWithType * >( *member ) ) { // otherwise some form of type declaration, e.g. Aggregate
@@ -347 +359 @@
 
                                 Expression *srcselect = srcParam ? new MemberExpr( field, new VariableExpr( srcParam ) ) : NULL;
-                                makeStructMemberOp( dstParam, srcselect, field, func, forward );
+                                makeStructMemberOp( dstParam, srcselect, field, func, isDynamicLayout, forward );
                         } // if
                 } // for
@@ -355 +367 @@
         /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields.
         template<typename Iterator>
-        void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func ) {
+        void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func, bool isDynamicLayout ) {
                 FunctionType * ftype = func->get_functionType();
                 std::list<DeclarationWithType*> & params = ftype->get_parameters();
@@ -381 +393 @@
                                         // matching parameter, initialize field with copy ctor
                                         Expression *srcselect = new VariableExpr(*parameter);
-                                        makeStructMemberOp( dstParam, srcselect, field, func );
+                                        makeStructMemberOp( dstParam, srcselect, field, func, isDynamicLayout );
                                         ++parameter;
                                 } else {
                                         // no matching parameter, initialize field with default ctor
-                                        makeStructMemberOp( dstParam, NULL, field, func );
+                                        makeStructMemberOp( dstParam, NULL, field, func, isDynamicLayout );
                                 }
                         }
                 }
-        }
-
-        Type * declToType( Declaration * decl ) {
-                if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                        return dwt->get_type();
-                }
-                return nullptr;
         }
 
@@ -408 +413 @@
                 // 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
+                bool isDynamicLayout = hasDynamicLayout( aggregateDecl );  // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for union)
 
                 // 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 ) );
+                auto generator = makeFuncGenerator( aggregateDecl, refType, functionNesting, typeParams, back_inserter( newFuncs ) );
                 for ( const FuncData & d : data ) {
                         generator.gen( d, aggregateDecl->is_thread() || aggregateDecl->is_monitor() );
@@ -418 +423 @@
 
                 // 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() ); } );
+                unsigned numCtors = std::count_if( newFuncs.begin(), newFuncs.end(), [](FunctionDecl * dcl) { return InitTweak::isConstructor( dcl->get_name() ); } );
 
                 if ( functionNesting == 0 ) {
@@ -433 +438 @@
                         // 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 );
+                        if ( ! InitTweak::isDestructor( dcl->get_name() ) ) {
+                                makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), dcl, isDynamicLayout );
                         } else {
-                                makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dcl, false );
-                        }
-                        if ( CodeGen::isAssignment( dcl->get_name() ) ) {
+                                makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dcl, isDynamicLayout, false );
+                        }
+                        if ( InitTweak::isAssignment( dcl->get_name() ) ) {
                                 // assignment needs to return a value
                                 FunctionType * assignType = dcl->get_functionType();
@@ -467 +472 @@
                                         // 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
+                                        // 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;
                                 }
                                 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 );
+                                makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor, isDynamicLayout );
                                 declsToAdd.push_back( ctor );
                         }
@@ -483 +490 @@
         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 VariableExpr( dstParam ) );
                 copy->get_args().push_back( new AddressExpr( new VariableExpr( srcParam ) ) );
                 copy->get_args().push_back( new SizeofExpr( srcParam->get_type()->clone() ) );
@@ -495 +502 @@
                 ObjectDecl * dstParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().front() );
                 ObjectDecl * srcParam = safe_dynamic_cast< ObjectDecl * >( ftype->get_parameters().back() );
+                ObjectDecl * returnVal = nullptr;
+                if ( ! ftype->get_returnVals().empty() ) {
+                        returnVal = safe_dynamic_cast< ObjectDecl * >( ftype->get_returnVals().front() );
+                }
 
                 makeUnionFieldsAssignment( srcParam, dstParam, back_inserter( funcDecl->get_statements()->get_kids() ) );
-                if ( CodeGen::isAssignment( funcDecl->get_name() ) ) {
-                        // also generate return statement in assignment
+                if ( returnVal ) {
                         funcDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
                 }
@@ -525 +535 @@
                 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
@@ -611 +617 @@
         }
 
-        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 ) {
-                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 );
-                }
+                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 );
         }