Changes in src/InitTweak/GenInit.cc [09867ec:07de76b]

File:

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

src/InitTweak/GenInit.cc

@@ -26 +26 @@
 #include "AST/Node.hpp"
 #include "AST/Stmt.hpp"
-#include "CompilationState.h"
 #include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"        // for PassVisitor, WithGuards, WithShort...
@@ -122 +121 @@
         };
 
-        struct HoistArrayDimension_NoResolve final : public WithDeclsToAdd, public WithShortCircuiting, public WithGuards {
-                /// hoist dimension from array types in object declaration so that it uses a single
-                /// const variable of type size_t, so that side effecting array dimensions are only
-                /// computed once.
-                static void hoistArrayDimension( std::list< Declaration * > & translationUnit );
-
-                void premutate( ObjectDecl * objectDecl );
-                DeclarationWithType * postmutate( ObjectDecl * objectDecl );
-                void premutate( FunctionDecl *functionDecl );
-                // should not traverse into any of these declarations to find objects
-                // that need to be constructed or destructed
-                void premutate( AggregateDecl * ) { visit_children = false; }
-                void premutate( NamedTypeDecl * ) { visit_children = false; }
-                void premutate( FunctionType * ) { visit_children = false; }
-
-                void hoist( Type * type );
-
-                Type::StorageClasses storageClasses;
-                bool inFunction = false;
-        };
-
         void genInit( std::list< Declaration * > & translationUnit ) {
-                if (!useNewAST) {
-                        HoistArrayDimension::hoistArrayDimension( translationUnit );
-                }
-                else {
-                        HoistArrayDimension_NoResolve::hoistArrayDimension( translationUnit );
-                }
                 fixReturnStatements( translationUnit );
-
-                if (!useNewAST) {
-                        CtorDtor::generateCtorDtor( translationUnit );
-                }
+                HoistArrayDimension::hoistArrayDimension( translationUnit );
+                CtorDtor::generateCtorDtor( translationUnit );
         }
 
@@ -226 +196 @@
                         arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
                         // don't need to hoist dimension if it's definitely pure - only need to if there's potential for side effects.
-                        // xxx - hoisting has no side effects anyways, so don't skip since we delay resolve
-                        // still try to detect constant expressions
                         if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
 
@@ -242 +210 @@
 
         void HoistArrayDimension::premutate( FunctionDecl * ) {
-                GuardValue( inFunction );
-                inFunction = true;
-        }
-
-        // precompute array dimension expression, because constructor generation may duplicate it,
-        // which would be incorrect if it is a side-effecting computation.
-        void HoistArrayDimension_NoResolve::hoistArrayDimension( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<HoistArrayDimension_NoResolve> hoister;
-                mutateAll( translationUnit, hoister );
-        }
-
-        void HoistArrayDimension_NoResolve::premutate( ObjectDecl * objectDecl ) {
-                GuardValue( storageClasses );
-                storageClasses = objectDecl->get_storageClasses();
-        }
-
-        DeclarationWithType * HoistArrayDimension_NoResolve::postmutate( ObjectDecl * objectDecl ) {
-                hoist( objectDecl->get_type() );
-                return objectDecl;
-        }
-
-        void HoistArrayDimension_NoResolve::hoist( Type * type ) {
-                // if in function, generate const size_t var
-                static UniqueName dimensionName( "_array_dim" );
-
-                // C doesn't allow variable sized arrays at global scope or for static variables, so don't hoist dimension.
-                if ( ! inFunction ) return;
-                if ( storageClasses.is_static ) return;
-
-                if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
-                        if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
-                        // don't need to hoist dimension if it's definitely pure - only need to if there's potential for side effects.
-                        // xxx - hoisting has no side effects anyways, so don't skip since we delay resolve
-                        // still try to detect constant expressions
-                        if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
-
-                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, Validate::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
-                        arrayDimension->get_type()->set_const( true );
-
-                        arrayType->set_dimension( new VariableExpr( arrayDimension ) );
-                        declsToAddBefore.push_back( arrayDimension );
-
-                        hoist( arrayType->get_base() );
-                        return;
-                }
-        }
-
-        void HoistArrayDimension_NoResolve::premutate( FunctionDecl * ) {
                 GuardValue( inFunction );
                 inFunction = true;
@@ -325 +245 @@
         }
 
-        // why is this not just on FunctionDecl?
         void ManagedTypes::handleDWT( DeclarationWithType * dwt ) {
                 // if this function is a user-defined constructor or destructor, mark down the type as "managed"
@@ -356 +275 @@
         void ManagedTypes::endScope() { managedTypes.endScope(); }
 
-        bool ManagedTypes_new::isManaged( const ast::Type * type ) const {
-                // references are never constructed
-                if ( dynamic_cast< const ast::ReferenceType * >( type ) ) return false;
-                if ( auto tupleType = dynamic_cast< const ast::TupleType * > ( type ) ) {
-                        // tuple is also managed if any of its components are managed
-                        for (auto & component : tupleType->types) {
-                                if (isManaged(component)) return true;
-                        }
-                }
-                // need to clear and reset qualifiers when determining if a type is managed
-                // ValueGuard< Type::Qualifiers > qualifiers( type->get_qualifiers() );
-                auto tmp = shallowCopy(type);
-                tmp->qualifiers = {};
-                // delete tmp at return
-                ast::ptr<ast::Type> guard = tmp;
-                // a type is managed if it appears in the map of known managed types, or if it contains any polymorphism (is a type variable or generic type containing a type variable)
-                return managedTypes.find( Mangle::mangle( tmp, {Mangle::NoOverrideable | Mangle::NoGenericParams | Mangle::Type} ) ) != managedTypes.end() || GenPoly::isPolyType( tmp );
-        }
-
-        bool ManagedTypes_new::isManaged( const ast::ObjectDecl * objDecl ) const {
-                const ast::Type * type = objDecl->type;
-                while ( auto at = dynamic_cast< const ast::ArrayType * >( type ) ) {
-                        // must always construct VLAs with an initializer, since this is an error in C
-                        if ( at->isVarLen && objDecl->init ) return true;
-                        type = at->base;
-                }
-                return isManaged( type );
-        }
-
-        void ManagedTypes_new::handleDWT( const ast::DeclWithType * dwt ) {
-                // if this function is a user-defined constructor or destructor, mark down the type as "managed"
-                if ( ! dwt->linkage.is_overrideable && CodeGen::isCtorDtor( dwt->name ) ) {
-                        auto & params = GenPoly::getFunctionType( dwt->get_type())->params;
-                        assert( ! params.empty() );
-                        // Type * type = InitTweak::getPointerBase( params.front() );
-                        // assert( type );
-                        managedTypes.insert( Mangle::mangle( params.front(), {Mangle::NoOverrideable | Mangle::NoGenericParams | Mangle::Type} ) );
-                }
-        }
-
-        void ManagedTypes_new::handleStruct( const ast::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 ( auto & member : aggregateDecl->members ) {
-                        if ( auto field = member.as<ast::ObjectDecl>() ) {
-                                if ( isManaged( field ) ) {
-                                        // generic parameters should not play a role in determining whether a generic type is constructed - construct all generic types, so that
-                                        // polymorphic constructors make generic types managed types
-                                        ast::StructInstType inst( aggregateDecl );
-                                        managedTypes.insert( Mangle::mangle( &inst, {Mangle::NoOverrideable | Mangle::NoGenericParams | Mangle::Type} ) );
-                                        break;
-                                }
-                        }
-                }
-        }
-
-        void ManagedTypes_new::beginScope() { managedTypes.beginScope(); }
-        void ManagedTypes_new::endScope() { managedTypes.endScope(); }
-
         ImplicitCtorDtorStmt * genCtorDtor( const std::string & fname, ObjectDecl * objDecl, Expression * arg ) {
                 // call into genImplicitCall from Autogen.h to generate calls to ctor/dtor
@@ -423 +283 @@
                 assert( stmts.size() <= 1 );
                 return stmts.size() == 1 ? strict_dynamic_cast< ImplicitCtorDtorStmt * >( stmts.front() ) : nullptr;
-
-        }
-
-        ast::ptr<ast::Stmt> genCtorDtor (const CodeLocation & loc, const std::string & fname, const ast::ObjectDecl * objDecl, const ast::Expr * arg) {
-                assertf(objDecl, "genCtorDtor passed null objDecl");
-                InitExpander_new srcParam(arg);
-                return SymTab::genImplicitCall(srcParam, new ast::VariableExpr(loc, objDecl), loc, fname, objDecl);
         }
 
@@ -510 +363 @@
         // constructable object
         InitExpander_new srcParam{ objDecl->init }, nullParam{ (const ast::Init *)nullptr };
-        ast::ptr< ast::Expr > dstParam = new ast::VariableExpr(loc, objDecl);
         
         ast::ptr< ast::Stmt > ctor = SymTab::genImplicitCall( 
-                srcParam, dstParam, loc, "?{}", objDecl );
+                srcParam, new ast::VariableExpr{ loc, objDecl }, loc, "?{}", objDecl );
         ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall( 
-                nullParam, dstParam, loc, "^?{}", objDecl, 
+                nullParam, new ast::VariableExpr{ loc, objDecl }, loc, "^?{}", objDecl, 
                 SymTab::LoopBackward );