Changes in src/SymTab/Autogen.cc [49148d5:fa4805f]

File:

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

src/SymTab/Autogen.cc

@@ -125 +125 @@
         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 );
 
@@ -176 +176 @@
                         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 );
                 }
@@ -298 +297 @@
         /// generates a single struct member operation (constructor call, destructor call, assignment call)
         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
         }
 
@@ -456 +467 @@
                                         // 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;
                                 }
@@ -472 +485 @@
         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() ) );
@@ -484 +497 @@
                 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 ( InitTweak::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 ) ) );
                 }
@@ -496 +512 @@
                 // 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 *);