Index: src/SymTab/Autogen.cc =================================================================== --- src/SymTab/Autogen.cc (revision 31e46b8bbd52392f177414b305987b2c9f1bd311) +++ src/SymTab/Autogen.cc (revision 5070fe4b9ad7bec2681f51b6b650a12237ceefc1) @@ -203,5 +203,5 @@ } - void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, TypeSubstitution & genericSubs, bool isGeneric, bool forward = true ) { + void makeStructMemberOp( ObjectDecl * dstParam, Expression * src, DeclarationWithType * field, FunctionDecl * func, TypeSubstitution & genericSubs, bool isGeneric, bool isDynamicLayout, bool forward = true ) { if ( isGeneric ) { // rewrite member type in terms of the type variables on this operator @@ -226,5 +226,5 @@ makeArrayFunction( src, dstselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward ); - if ( isGeneric && returnVal ) { + if ( isDynamicLayout && returnVal ) { UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) ); derefRet->get_args().push_back( new VariableExpr( returnVal ) ); @@ -235,10 +235,10 @@ } else { makeScalarFunction( src, dstParam, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) ); - if ( isGeneric && returnVal ) makeScalarFunction( src, returnVal, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) ); + if ( isDynamicLayout && returnVal ) makeScalarFunction( src, returnVal, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) ); } // if } template - void makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, TypeSubstitution & genericSubs, bool isGeneric, bool forward = true ) { + void makeStructFunctionBody( Iterator member, Iterator end, FunctionDecl * func, TypeSubstitution & genericSubs, bool isGeneric, 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 @@ -276,5 +276,5 @@ Expression *srcselect = srcParam ? new MemberExpr( field, new VariableExpr( srcParam ) ) : NULL; - makeStructMemberOp( dstParam, srcselect, field, func, genericSubs, isGeneric, forward ); + makeStructMemberOp( dstParam, srcselect, field, func, genericSubs, isGeneric, isDynamicLayout, forward ); } // if } // for @@ -284,5 +284,5 @@ /// void ?{}(A *, int) and void?{}(A *, int, int) for a struct A which has two int fields. template - void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func, TypeSubstitution & genericSubs, bool isGeneric ) { + void makeStructFieldCtorBody( Iterator member, Iterator end, FunctionDecl * func, TypeSubstitution & genericSubs, bool isGeneric, bool isDynamicLayout ) { FunctionType * ftype = func->get_functionType(); std::list & params = ftype->get_parameters(); @@ -310,9 +310,9 @@ // matching parameter, initialize field with copy ctor Expression *srcselect = new VariableExpr(*parameter); - makeStructMemberOp( dstParam, srcselect, field, func, genericSubs, isGeneric ); + makeStructMemberOp( dstParam, srcselect, field, func, genericSubs, isGeneric, isDynamicLayout ); ++parameter; } else { // no matching parameter, initialize field with default ctor - makeStructMemberOp( dstParam, NULL, field, func, genericSubs, isGeneric ); + makeStructMemberOp( dstParam, NULL, field, func, genericSubs, isGeneric, isDynamicLayout ); } } @@ -325,4 +325,5 @@ // Make function polymorphic in same parameters as generic struct, if applicable bool isGeneric = false; // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for union) + bool isDynamicLayout = false; // NOTE see above re: kludge std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters(); std::list< Expression* > structParams; // List of matching parameters to put on types @@ -330,4 +331,5 @@ for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) { isGeneric = true; + if ( (*param)->get_kind() == TypeDecl::Any ) isDynamicLayout = true; TypeDecl *typeParam = cloneAndRename( *param, "_autoassign_" + aggregateDecl->get_name() + "_" + (*param)->get_name() ); assignType->get_forall().push_back( typeParam ); @@ -389,5 +391,5 @@ FunctionDecl * ctor = new FunctionDecl( "?{}", functionNesting > 0 ? DeclarationNode::NoStorageClass : DeclarationNode::Static, LinkageSpec::AutoGen, memCtorType->clone(), new CompoundStmt( noLabels ), true, false ); ctor->fixUniqueId(); - makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor, genericSubs, isGeneric ); + makeStructFieldCtorBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctor, genericSubs, isGeneric, isDynamicLayout ); memCtors.push_back( ctor ); } @@ -395,9 +397,9 @@ // generate appropriate calls to member ctor, assignment - makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), assignDecl, genericSubs, isGeneric ); - makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctorDecl, genericSubs, isGeneric ); - makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), copyCtorDecl, genericSubs, isGeneric ); + makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), assignDecl, genericSubs, isGeneric, isDynamicLayout ); + makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), ctorDecl, genericSubs, isGeneric, isDynamicLayout ); + makeStructFunctionBody( aggregateDecl->get_members().begin(), aggregateDecl->get_members().end(), copyCtorDecl, genericSubs, isGeneric, isDynamicLayout ); // needs to do everything in reverse, so pass "forward" as false - makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dtorDecl, genericSubs, isGeneric, false ); + makeStructFunctionBody( aggregateDecl->get_members().rbegin(), aggregateDecl->get_members().rend(), dtorDecl, genericSubs, isGeneric, isDynamicLayout, false ); if ( ! isGeneric ) assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) ); @@ -414,9 +416,9 @@ // Make function polymorphic in same parameters as generic union, if applicable - bool isGeneric = false; // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for struct) + bool isDynamicLayout = false; // NOTE this flag is an incredibly ugly kludge; we should fix the assignment signature instead (ditto for struct) std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters(); std::list< Expression* > unionParams; // List of matching parameters to put on types for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) { - isGeneric = true; + if ( (*param)->get_kind() == TypeDecl::Any ) isDynamicLayout = true; TypeDecl *typeParam = cloneAndRename( *param, "_autoassign_" + aggregateDecl->get_name() + "_" + (*param)->get_name() ); assignType->get_forall().push_back( typeParam ); @@ -454,7 +456,6 @@ makeUnionFieldsAssignment( srcParam, dstParam, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) ); - if ( isGeneric ) makeUnionFieldsAssignment( srcParam, returnVal, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) ); - - if ( ! isGeneric ) assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) ); + if ( isDynamicLayout ) makeUnionFieldsAssignment( srcParam, returnVal, cloneWithParams( refType, unionParams ), back_inserter( assignDecl->get_statements()->get_kids() ) ); + else assignDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) ); // body of assignment and copy ctor is the same