Changeset 108f3cdb for src

Timestamp:

Sep 12, 2017, 10:45:01 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

93389c1

Parents:

1395748

Message:

Fix generation of assignment and autogenerate constructors and destructors for opaque type declarations

Location:

src

Files:

• Common/utility.h (modified) (1 diff)
• ResolvExpr/CastCost.cc (modified) (1 diff)
• ResolvExpr/ConversionCost.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (8 diffs)

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 {
+        T & ref;
+        Func f;
+
+        struct iterator {
+                typedef decltype(begin(ref)) Iter;
+                Iter it;
+                Func f;
+                iterator( Iter it, 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( T & ref, 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( Args &&... args ) {
+        return lambda_iterate_t<Args...>(std::forward<Args>( args )...);
+}
+
+
+
 // Local Variables: //
 // tab-width: 4 //

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 );
+                }
         }