Changeset 2be1023 for src/SymTab/Autogen.cc

Timestamp:

Jul 18, 2016, 4:13:51 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5f98ce5

Parents:

956a9c7

Message:

rework ctor/dtor generation to work properly with multidimensional arrays

File:

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

src/SymTab/Autogen.cc

@@ -62 +62 @@
 
         template< typename OutputIterator >
-        void makeScalarFunction( Expression *src, ObjectDecl *dstParam, DeclarationWithType *member, std::string fname, OutputIterator out ) {
-                ObjectDecl *obj = dynamic_cast<ObjectDecl *>( member );
-                // unnamed bit fields are not copied as they cannot be accessed
-                if ( isUnnamedBitfield( obj ) ) return;
-
-                // want to be able to generate assignment, ctor, and dtor generically,
-                // so fname is either ?=?, ?{}, or ^?{}
-                UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
-
-                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
-
-                // do something special for unnamed members
-                Expression *dstselect = new AddressExpr( new MemberExpr( member, derefExpr ) );
-                fExpr->get_args().push_back( dstselect );
-
-                if ( src ) {
-                        fExpr->get_args().push_back( src );
-                }
-
-                Statement * callStmt = new ExprStmt( noLabels, fExpr );
-                if ( (fname == "?{}" || fname == "^?{}") && ( !obj || ( obj && obj->get_bitfieldWidth() == NULL ) ) ) {
-                        // implicitly generated ctor/dtor calls should be wrapped
-                        // so that later passes are aware they were generated.
-                        // xxx - don't mark as an implicit ctor/dtor if obj is a bitfield,
-                        // because this causes the address to be taken at codegen, which is illegal in C.
-                        callStmt = new ImplicitCtorDtorStmt( callStmt );
-                }
-                *out++ = callStmt;
-        }
-
-        template< typename OutputIterator >
         void makeUnionFieldsAssignment( ObjectDecl *srcParam, ObjectDecl *dstParam, UnionInstType *unionType, OutputIterator out ) {
                 UntypedExpr *copy = new UntypedExpr( new NameExpr( "__builtin_memcpy" ) );
@@ -220 +188 @@
 
                 // assign to destination (and return value if generic)
-                if ( ArrayType *array = dynamic_cast< ArrayType * >( field->get_type() ) ) {
-                        UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                        derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
-                        Expression *dstselect = new MemberExpr( field, derefExpr );
-
-                        makeArrayFunction( src, dstselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward );
-                        if ( isGeneric && returnVal ) {
-                                UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) );
-                                derefRet->get_args().push_back( new VariableExpr( returnVal ) );
-                                Expression *retselect = new MemberExpr( field, derefRet );
-
-                                makeArrayFunction( src, retselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward );
-                        }
-                } 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() ) );
+                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
+                Expression *dstselect = new MemberExpr( field, derefExpr );
+                genImplicitCall( src, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
+
+                if ( isGeneric && returnVal ) {
+                        UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) );
+                        derefRet->get_args().push_back( new VariableExpr( returnVal ) );
+                        Expression *retselect = new MemberExpr( field, derefRet );
+                        genImplicitCall( src, retselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
                 } // if
         }