Changes in src/InitTweak/GenInit.cc [490fb92e:16ba4a6f]

File:

• src/InitTweak/GenInit.cc (modified) (6 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 +123 @@
 
         void genInit( std::list< Declaration * > & translationUnit ) {
+                HoistArrayDimension::hoistArrayDimension( translationUnit );
                 fixReturnStatements( translationUnit );
-                HoistArrayDimension::hoistArrayDimension( translationUnit );
-                CtorDtor::generateCtorDtor( translationUnit );
+
+                if (!useNewAST) {
+                        CtorDtor::generateCtorDtor( translationUnit );
+                }
         }
 
@@ -192 +196 @@
 
                         // need to resolve array dimensions in order to accurately determine if constexpr
-                        ResolvExpr::findSingleExpression( arrayType->dimension, Validate::SizeType->clone(), indexer );
-                        // array is variable-length when the dimension is not constexpr
-                        arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
+                        if (!useNewAST) {
+                                ResolvExpr::findSingleExpression( arrayType->dimension, Validate::SizeType->clone(), indexer );
+                                // array is variable-length when the dimension is not constexpr
+                                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.
-                        if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
+                        // xxx - hoisting has no side effects anyways, so don't skip since we delay resolve     
+                        // only skip in the most trivial case, which does not require resolve
+                        if (dynamic_cast<ConstantExpr *>(arrayType->dimension)) return;
+                        // if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
 
                         ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, Validate::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
@@ -245 +254 @@
         }
 
+        // 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"
@@ -274 +284 @@
         void ManagedTypes::beginScope() { managedTypes.beginScope(); }
         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 ) {
@@ -370 +439 @@
         // 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, new ast::VariableExpr{ loc, objDecl }, loc, "?{}", objDecl );
+                srcParam, dstParam, loc, "?{}", objDecl );
         ast::ptr< ast::Stmt > dtor = SymTab::genImplicitCall( 
-                nullParam, new ast::VariableExpr{ loc, objDecl }, loc, "^?{}", objDecl, 
+                nullParam, dstParam, loc, "^?{}", objDecl, 
                 SymTab::LoopBackward );