Changes in src/InitTweak/FixInit.cc [486341f:b16898e]

File:

• src/InitTweak/FixInit.cc (modified) (15 diffs)

src/InitTweak/FixInit.cc

@@ -31 +31 @@
 #include "SynTree/Mutator.h"
 #include "SymTab/Indexer.h"
+#include "SymTab/Autogen.h"
 #include "GenPoly/PolyMutator.h"
 #include "SynTree/AddStmtVisitor.h"
@@ -176 +177 @@
                 };
 
-                class WarnStructMembers : public Visitor {
+                class GenStructMemberCalls : public SymTab::Indexer {
                   public:
-                        typedef Visitor Parent;
-                        /// warn if a user-defined constructor or destructor is missing calls for
-                        /// a struct member or if a member is used before constructed
-                        static void warnings( std::list< Declaration * > & translationUnit );
+                        typedef Indexer Parent;
+                        /// generate default/copy ctor and dtor calls for user-defined struct ctor/dtors
+                        /// for any member that is missing a corresponding ctor/dtor call.
+                        /// error if a member is used before constructed
+                        static void generate( std::list< Declaration * > & translationUnit );
 
                         virtual void visit( FunctionDecl * funcDecl );
@@ -188 +190 @@
                         virtual void visit( ApplicationExpr * appExpr );
 
+                        SemanticError errors;
                   private:
                         void handleFirstParam( Expression * firstParam );
+                        template< typename... Params >
+                        void emit( const Params &... params );
 
                         FunctionDecl * function = 0;
-                        std::set< DeclarationWithType * > unhandled;
+                        std::set< DeclarationWithType * > unhandled, usedUninit;
                         ObjectDecl * thisParam = 0;
+                        bool isCtor = false; // true if current function is a constructor
+                        StructDecl * structDecl = 0;
+                };
+
+                // very simple resolver-like mutator class - used to
+                // resolve UntypedExprs that are found within newly
+                // generated constructor/destructor calls
+                class MutatingResolver : public Mutator {
+                  public:
+                        MutatingResolver( SymTab::Indexer & indexer ) : indexer( indexer ) {}
+
+                        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl );
+
+                        virtual Expression* mutate( UntypedExpr *untypedExpr );
+                        private:
+                        SymTab::Indexer & indexer;
                 };
         } // namespace
@@ -209 +230 @@
                 FixCopyCtors::fixCopyCtors( translationUnit );
 
-                WarnStructMembers::warnings( translationUnit );
+                GenStructMemberCalls::generate( translationUnit );
         }
 
@@ -254 +275 @@
                 }
 
-                void WarnStructMembers::warnings( std::list< Declaration * > & translationUnit ) {
-                        if ( true ) { // fix this condition to skip this pass if warnings aren't enabled
-                                WarnStructMembers warner;
-                                acceptAll( translationUnit, warner );
+                void GenStructMemberCalls::generate( std::list< Declaration * > & translationUnit ) {
+                        GenStructMemberCalls warner;
+                        acceptAll( translationUnit, warner );
+
+                        // visitor doesn't throw so that it can collect all errors
+                        if ( ! warner.errors.isEmpty() ) {
+                                throw warner.errors;
                         }
                 }
@@ -528 +552 @@
                                                         FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + dtorCallerNamer.newName(), DeclarationNode::Static, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
                                                         dtorCaller->fixUniqueId();
-                                                        dtorCaller->get_statements()->get_kids().push_back( dtorStmt );
+                                                        dtorCaller->get_statements()->push_back( dtorStmt );
 
                                                         // atexit(dtor_atexit);
@@ -543 +567 @@
                                                         // at global scope and there could be multiple function-scoped
                                                         // static variables with the same name in different functions.
+                                                        // Note: it isn't sufficient to modify only the mangleName, because
+                                                        // then subsequent Indexer passes can choke on seeing the object's name
+                                                        // if another object has the same name and type. An unfortunate side-effect
+                                                        // of renaming the object is that subsequent NameExprs may fail to resolve,
+                                                        // but there shouldn't be any remaining past this point.
                                                         static UniqueName staticNamer( "_static_var" );
-                                                        objDecl->set_mangleName( objDecl->get_mangleName() + staticNamer.newName() );
+                                                        objDecl->set_name( objDecl->get_name() + staticNamer.newName() );
+                                                        objDecl->set_mangleName( SymTab::Mangler::mangle( objDecl ) );
 
                                                         objDecl->set_init( NULL );
@@ -709 +739 @@
                 }
 
-                void WarnStructMembers::visit( FunctionDecl * funcDecl ) {
-                        WarnStructMembers old = *this;
-                        *this = WarnStructMembers();
+                void GenStructMemberCalls::visit( FunctionDecl * funcDecl ) {
+                        ValueGuard< FunctionDecl * > oldFunction( funcDecl );
+                        ValueGuard< std::set< DeclarationWithType * > > oldUnhandled( unhandled );
+                        ValueGuard< std::set< DeclarationWithType * > > oldUsedUninit( usedUninit );
+                        ValueGuard< ObjectDecl * > oldThisParam( thisParam );
+                        ValueGuard< bool > oldIsCtor( isCtor );
+                        ValueGuard< StructDecl * > oldStructDecl( structDecl );
+
+                        // need to start with fresh sets
+                        unhandled.clear();
+                        usedUninit.clear();
 
                         function = funcDecl;
-                        if ( checkWarnings( funcDecl ) ) {
-                                FunctionType * type = funcDecl->get_functionType();
+                        isCtor = isConstructor( function->get_name() );
+                        if ( checkWarnings( function ) ) {
+                                FunctionType * type = function->get_functionType();
                                 assert( ! type->get_parameters().empty() );
                                 thisParam = safe_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
@@ -721 +760 @@
                                 StructInstType * structType = dynamic_cast< StructInstType * >( ptrType->get_base() );
                                 if ( structType ) {
-                                        StructDecl * structDecl = structType->get_baseStruct();
+                                        structDecl = structType->get_baseStruct();
                                         for ( Declaration * member : structDecl->get_members() ) {
                                                 if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
@@ -731 +770 @@
                                 }
                         }
-                        Parent::visit( funcDecl );
-
-                        for ( DeclarationWithType * member : unhandled ) {
-                                // emit a warning for each unhandled member
-                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" );
+                        Parent::visit( function );
+
+                        // remove the unhandled objects from usedUninit, because a call is inserted
+                        // to handle them - only objects that are later constructed are used uninitialized.
+                        std::set< DeclarationWithType * > diff;
+                        std::set_difference( usedUninit.begin(), usedUninit.end(), unhandled.begin(), unhandled.end(), std::inserter( diff, diff.begin() ) );
+                        for ( DeclarationWithType * member : diff ) {
+                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", member->get_name(), " used before being constructed" );
                         }
 
-                        *this = old;
-                }
-
-                void WarnStructMembers::visit( ApplicationExpr * appExpr ) {
+                        if ( ! unhandled.empty() ) {
+                                // need to explicitly re-add function parameters in order to resolve copy constructors
+                                enterScope();
+                                maybeAccept( function->get_functionType(), *this );
+
+                                // need to iterate through members in reverse in order for
+                                // ctor/dtor statements to come out in the right order
+                                for ( Declaration * member : reverseIterate( structDecl->get_members() ) ) {
+                                        DeclarationWithType * field = dynamic_cast< DeclarationWithType * >( member );
+                                        // skip non-DWT members
+                                        if ( ! field ) continue;
+                                        // skip handled members
+                                        if ( ! unhandled.count( field ) ) continue;
+
+                                        // insert and resolve default/copy constructor call for each field that's unhandled
+                                        std::list< Statement * > stmt;
+                                        UntypedExpr * deref = new UntypedExpr( new NameExpr( "*?" ) );
+                                        deref->get_args().push_back( new VariableExpr( thisParam ) );
+
+                                        Expression * arg2 = 0;
+                                        if ( isCopyConstructor( function ) ) {
+                                                // if copy ctor, need to pass second-param-of-this-function.field
+                                                std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
+                                                assert( params.size() == 2 );
+                                                arg2 = new MemberExpr( field, new VariableExpr( params.back() ) );
+                                        }
+                                        InitExpander srcParam( arg2 );
+                                        SymTab::genImplicitCall( srcParam, new MemberExpr( field, deref ), function->get_name(), back_inserter( stmt ), field, isCtor );
+
+                                        assert( stmt.size() <= 1 );
+                                        if ( stmt.size() == 1 ) {
+                                                Statement * callStmt = stmt.front();
+
+                                                MutatingResolver resolver( *this );
+                                                try {
+                                                        callStmt->acceptMutator( resolver );
+                                                        if ( isCtor ) {
+                                                                function->get_statements()->push_front( callStmt );
+                                                        } else {
+                                                                // destructor statements should be added at the end
+                                                                function->get_statements()->push_back( callStmt );
+                                                        }
+                                                } catch ( SemanticError & error ) {
+                                                        emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
+                                                }
+                                        }
+                                }
+                                leaveScope();
+                        }
+                }
+
+                void GenStructMemberCalls::visit( ApplicationExpr * appExpr ) {
                         if ( ! checkWarnings( function ) ) return;
 
@@ -760 +850 @@
                                         handleFirstParam( firstParam );
                                 }
-                        } else if ( fname == "?=?" && isIntrinsicCallExpr( appExpr ) ) {
-                                // forgive use of intrinsic assignment to construct, since instrinsic constructors
-                                // codegen as assignment anyway.
-                                assert( appExpr->get_args().size() == 2 );
-                                handleFirstParam( appExpr->get_args().front() );
                         }
 
@@ -770 +855 @@
                 }
 
-                void WarnStructMembers::handleFirstParam( Expression * firstParam ) {
+                void GenStructMemberCalls::handleFirstParam( Expression * firstParam ) {
                         using namespace std;
                         if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( firstParam ) ) {
@@ -787 +872 @@
                 }
 
-                void WarnStructMembers::visit( MemberExpr * memberExpr ) {
+                void GenStructMemberCalls::visit( MemberExpr * memberExpr ) {
                         if ( ! checkWarnings( function ) ) return;
-                        if ( ! isConstructor( function->get_name() ) ) return;
+                        if ( ! isCtor ) return;
 
                         if ( ApplicationExpr * deref = dynamic_cast< ApplicationExpr * >( memberExpr->get_aggregate() ) ) {
@@ -797 +882 @@
                                                         if ( unhandled.count( memberExpr->get_member() ) ) {
                                                                 // emit a warning because a member was used before it was constructed
-                                                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
+                                                                usedUninit.insert( memberExpr->get_member() );
                                                         }
                                                 }
@@ -805 +890 @@
                         Parent::visit( memberExpr );
                 }
+
+                template< typename Visitor, typename... Params >
+                void error( Visitor & v, const Params &... params ) {
+                        v.errors.append( toString( params... ) );
+                }
+
+                template< typename... Params >
+                void GenStructMemberCalls::emit( const Params &... params ) {
+                        // toggle warnings vs. errors here.
+                        // warn( params... );
+                        error( *this, params... );
+                }
+
+                DeclarationWithType * MutatingResolver::mutate( ObjectDecl *objectDecl ) {
+                        // add object to the indexer assumes that there will be no name collisions
+                        // in generated code. If this changes, add mutate methods for entities with
+                        // scope and call {enter,leave}Scope explicitly.
+                        objectDecl->accept( indexer );
+                        return objectDecl;
+                }
+
+                Expression* MutatingResolver::mutate( UntypedExpr *untypedExpr ) {
+                        return safe_dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untypedExpr, indexer ) );
+                }
         } // namespace
 } // namespace InitTweak