Changes in src/InitTweak/GenInit.cc [1ba88a0:f9cebb5]

File:

• src/InitTweak/GenInit.cc (modified) (9 diffs)

src/InitTweak/GenInit.cc

@@ -25 +25 @@
 #include "SynTree/Mutator.h"
 #include "SymTab/Autogen.h"
-#include "SymTab/Mangler.h"
 #include "GenPoly/PolyMutator.h"
 #include "GenPoly/DeclMutator.h"
-#include "GenPoly/ScopedSet.h"
 
 namespace InitTweak {
@@ -57 +55 @@
         class CtorDtor : public GenPoly::PolyMutator {
           public:
-                typedef GenPoly::PolyMutator Parent;
-                using Parent::mutate;
                 /// create constructor and destructor statements for object declarations.
                 /// the actual call statements will be added in after the resolver has run
@@ -69 +65 @@
                 // should not traverse into any of these declarations to find objects
                 // that need to be constructed or destructed
-                virtual Declaration* mutate( StructDecl *aggregateDecl );
+                virtual Declaration* mutate( StructDecl *aggregateDecl ) { return aggregateDecl; }
                 virtual Declaration* mutate( UnionDecl *aggregateDecl ) { return aggregateDecl; }
                 virtual Declaration* mutate( EnumDecl *aggregateDecl ) { return aggregateDecl; }
@@ -78 +74 @@
                 virtual Type * mutate( FunctionType *funcType ) { return funcType; }
 
-                virtual CompoundStmt * mutate( CompoundStmt * compoundStmt );
-
-          private:
-                // set of mangled type names for which a constructor or destructor exists in the current scope.
-                // these types require a ConstructorInit node to be generated, anything else is a POD type and thus
-                // should not have a ConstructorInit generated.
-
-                bool isManaged( ObjectDecl * objDecl ) const ; // determine if object is managed
-                void handleDWT( DeclarationWithType * dwt ); // add type to managed if ctor/dtor
-                GenPoly::ScopedSet< std::string > managedTypes;
-                bool inFunction = false;
+          protected:
         };
 
@@ -156 +142 @@
 
         DeclarationWithType* ReturnFixer::mutate( FunctionDecl *functionDecl ) {
-                ValueGuard< std::list<DeclarationWithType*> > oldReturnVals( returnVals );
-                ValueGuard< std::string > oldFuncName( funcName );
+                std::list<DeclarationWithType*> oldReturnVals = returnVals;
+                std::string oldFuncName = funcName;
 
                 FunctionType * type = functionDecl->get_functionType();
@@ -163 +149 @@
                 funcName = functionDecl->get_name();
                 DeclarationWithType * decl = Mutator::mutate( functionDecl );
+                returnVals = oldReturnVals;
+                funcName = oldFuncName;
                 return decl;
         }
@@ -209 +197 @@
 
         DeclarationWithType * HoistArrayDimension::mutate( FunctionDecl *functionDecl ) {
-                ValueGuard< bool > oldInFunc( inFunction );
+                bool oldInFunc = inFunction;
                 inFunction = true;
                 DeclarationWithType * decl = Parent::mutate( functionDecl );
+                inFunction = oldInFunc;
                 return decl;
         }
@@ -220 +209 @@
         }
 
-        bool CtorDtor::isManaged( ObjectDecl * objDecl ) const {
-                Type * type = objDecl->get_type();
-                while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
-                        type = at->get_base();
-                }
-                return managedTypes.find( SymTab::Mangler::mangle( type ) ) != managedTypes.end();
-        }
-
-        void CtorDtor::handleDWT( DeclarationWithType * dwt ) {
-                // if this function is a user-defined constructor or destructor, mark down the type as "managed"
-                if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && isCtorDtor( dwt->get_name() ) ) {
-                        std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
-                        assert( ! params.empty() );
-                        PointerType * type = safe_dynamic_cast< PointerType * >( params.front()->get_type() );
-                        managedTypes.insert( SymTab::Mangler::mangle( type->get_base() ) );
-                }
-        }
-
         DeclarationWithType * CtorDtor::mutate( ObjectDecl * objDecl ) {
-                handleDWT( objDecl );
-                // hands off if @=, extern, builtin, etc.
-                // if global but initializer is not constexpr, always try to construct, since this is not legal C
-                if ( ( tryConstruct( objDecl ) && isManaged( objDecl ) ) || (! inFunction && ! isConstExpr( objDecl->get_init() ) ) ) {
-                        // constructed objects cannot be designated
-                        if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.", objDecl );
-                        // xxx - constructed objects should not have initializers nested too deeply
-
+                // hands off if designated, if @=, or if extern
+                if ( tryConstruct( objDecl ) ) {
                         // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor
                         // for each constructable object
@@ -276 +241 @@
                         }
                 }
-                return Parent::mutate( objDecl );
+                return Mutator::mutate( objDecl );
         }
 
         DeclarationWithType * CtorDtor::mutate( FunctionDecl *functionDecl ) {
-                ValueGuard< bool > oldInFunc = inFunction;
-                inFunction = true;
-
-                handleDWT( functionDecl );
-
-                managedTypes.beginScope();
-                // go through assertions and recursively add seen ctor/dtors
-                for ( TypeDecl * tyDecl : functionDecl->get_functionType()->get_forall() ) {
-                        for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) {
-                                assertion = assertion->acceptMutator( *this );
-                        }
-                }
                 // parameters should not be constructed and destructed, so don't mutate FunctionType
                 mutateAll( functionDecl->get_oldDecls(), *this );
                 functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
-
-                managedTypes.endScope();
                 return functionDecl;
         }
-
-        Declaration* CtorDtor::mutate( StructDecl *aggregateDecl ) {
-                // don't construct members, but need to take note if there is a managed member,
-                // because that means that this type is also managed
-                for ( Declaration * member : aggregateDecl->get_members() ) {
-                        if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
-                                if ( isManaged( field ) ) {
-                                        managedTypes.insert( SymTab::Mangler::mangle( aggregateDecl ) );
-                                        break;
-                                }
-                        }
-                }
-                return aggregateDecl;
-        }
-
-        CompoundStmt * CtorDtor::mutate( CompoundStmt * compoundStmt ) {
-                managedTypes.beginScope();
-                CompoundStmt * stmt = Parent::mutate( compoundStmt );
-                managedTypes.endScope();
-                return stmt;
-        }
-
 } // namespace InitTweak