Changeset b82d140

Timestamp:

Nov 10, 2020, 12:44:44 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

080b0a1, 883c4d9, f33eab7

Parents:

82a2fed (diff), cdacb73 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• benchmark/rmit.py (modified) (2 diffs)
• libcfa/src/stdlib.hfa (modified) (1 diff)
• src/AST/Convert.cpp (modified) (2 diffs)
• src/AST/Decl.hpp (modified) (1 diff)
• src/AST/Init.hpp (modified) (4 diffs)
• src/AST/Pass.impl.hpp (modified) (2 diffs)
• src/AST/Pass.proto.hpp (modified) (1 diff)
• src/AST/Type.cpp (modified) (1 diff)
• src/CodeGen/CodeGenerator.cc (modified) (1 diff)
• src/CodeGen/FixMain.cc (modified) (2 diffs)
• src/CodeGen/FixNames.cc (modified) (2 diffs)
• src/InitTweak/GenInit.cc (modified) (6 diffs)
• src/InitTweak/GenInit.h (modified) (1 diff)
• src/InitTweak/InitTweak.cc (modified) (5 diffs)
• src/InitTweak/InitTweak.h (modified) (2 diffs)
• src/ResolvExpr/ResolveTypeof.cc (modified) (2 diffs)
• src/ResolvExpr/ResolveTypeof.h (modified) (2 diffs)
• src/ResolvExpr/Resolver.cc (modified) (12 diffs)
• src/ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)
• src/SymTab/Autogen.cc (modified) (2 diffs)
• src/SymTab/Autogen.h (modified) (1 diff)
• src/SymTab/Validate.cc (modified) (4 diffs)
• tests/alloc.cfa (modified) (3 diffs)
• tests/malloc.cfa (modified) (1 diff)

benchmark/rmit.py

@@ -173 +173 @@
         # ================================================================================
         # Prepare to run
-        print(actions)
 
         # find expected time
@@ -226 +225 @@
                         d = [r[0], r[1]]
                         for k in headers[2:]:
-                                d.append(r[2][k])
+                                try:
+                                        d.append(r[2][k])
+                                except:
+                                        d.append(0.0)
 
                         data.append(d)

libcfa/src/stdlib.hfa

@@ -101 +101 @@
                 return (T *)pvalloc( sizeof(T) );                               // C pvalloc
         } // pvalloc
+
+        void free( T * addr ) {
+                free( (void *) addr );                                                  // C free
+        } // free
+} // distribution
+
+static inline forall( ttype TT | { void free( TT ); } ) {
+        // T* does not take void* and vice-versa
+
+        void free( void * addr, TT rest ) {
+                free( addr );
+                free( rest );
+        } // free
+
+        forall( dtype T | sized(T) )
+        void free( T * addr, TT rest ) {
+                free( addr );
+                free( rest );
+        } // free
 } // distribution
 

src/AST/Convert.cpp

@@ -2764 +2764 @@
                         old->location,
                         GET_ACCEPT_1(value, Expr),
-                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::NoConstruct
                 );
         }
@@ -2773 +2773 @@
                         GET_ACCEPT_V(initializers, Init),
                         GET_ACCEPT_V(designations, Designation),
-                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::DoConstruct
+                        (old->get_maybeConstructed()) ? ast::MaybeConstruct : ast::NoConstruct
                 );
         }

src/AST/Decl.hpp

@@ -79 +79 @@
         ptr<Expr> asmName;
         bool isDeleted = false;
+        bool isTypeFixed = false;
 
         DeclWithType( const CodeLocation& loc, const std::string& name, Storage::Classes storage,

src/AST/Init.hpp

@@ -50 +50 @@
 
 /// Flag for whether to construct from initialzier
-enum ConstructFlag { DoConstruct, MaybeConstruct };
+enum ConstructFlag { NoConstruct, MaybeConstruct };
 
 /// Object initializer base class
@@ -71 +71 @@
         ptr<Expr> value;
 
-        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = DoConstruct )
+        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = NoConstruct )
         : Init( loc, mc ), value( val ) {}
 
@@ -90 +90 @@
 
         ListInit( const CodeLocation & loc, std::vector<ptr<Init>> && is,
-                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = DoConstruct );
+                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = NoConstruct );
 
         using iterator = std::vector<ptr<Init>>::iterator;
@@ -118 +118 @@
         ConstructorInit( 
                 const CodeLocation & loc, const Stmt * ctor, const Stmt * dtor, const Init * init )
-        : Init( loc, DoConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}
+        : Init( loc, MaybeConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}
 
         const Init * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Pass.impl.hpp

@@ -423 +423 @@
                 }
                 catch( SemanticErrorException &e ) {
-                        errors.append( e );
+                        if (__pass::onError (visitor.core, *i, 0))
+                                errors.append( e );
                 }
 
@@ -683 +684 @@
                 // Do not enter (or leave) a new scope if atFunctionTop. Remember to save the result.
                 auto guard1 = makeFuncGuard( [this, enterScope = !this->atFunctionTop]() {
-                        if ( enterScope ) __pass::symtab::enter(core, 0);
+                        if ( enterScope ) {
+                                __pass::symtab::enter(core, 0);
+                                __pass::scope::enter(core, 0);
+                        }
                 }, [this, leaveScope = !this->atFunctionTop]() {
-                        if ( leaveScope ) __pass::symtab::leave(core, 0);
+                        if ( leaveScope ) {
+                                __pass::symtab::leave(core, 0);
+                                __pass::scope::leave(core, 0);
+                        }
                 });
                 ValueGuard< bool > guard2( atFunctionTop );

src/AST/Pass.proto.hpp

@@ -266 +266 @@
         static void endTrace(core_t &, long) {}
 
+        // Allows visitor to handle an error on top-level declarations, and possibly suppress the error.
+        // If onError() returns false, the error will be ignored. By default, it returns true.
+
+        template< typename core_t >
+        static bool onError (core_t &, ptr<Decl> &, long) { return true; }
+
+        template< typename core_t >
+        static auto onError (core_t & core, ptr<Decl> & decl, int) -> decltype(core.onError(decl)) {
+                return core.onError(decl); 
+        }
+
         // Another feature of the templated visitor is that it calls beginScope()/endScope() for compound statement.
         // All passes which have such functions are assumed desire this behaviour

src/AST/Type.cpp

@@ -211 +211 @@
         for ( const Type * ty : types ) {
                 members.emplace_back( new ObjectDecl{
-                        CodeLocation{}, "", ty, new ListInit( CodeLocation{}, {}, {}, MaybeConstruct ),
+                        CodeLocation{}, "", ty, new ListInit( CodeLocation{}, {}, {}, NoConstruct ),
                         Storage::Classes{}, Linkage::Cforall } );
         }

src/CodeGen/CodeGenerator.cc

@@ -120 +120 @@
                 // GCC builtins should always be printed unmangled
                 if ( options.pretty || decl->linkage.is_gcc_builtin ) return decl->name;
-                if ( decl->mangleName != "" ) {
+                if ( LinkageSpec::isMangled(decl->linkage) && decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
                         return decl->get_scopedMangleName();

src/CodeGen/FixMain.cc

@@ -26 +26 @@
 #include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
 #include "SynTree/Type.h"          // for FunctionType
+#include "SymTab/Mangler.h"
 
 namespace CodeGen {
@@ -47 +48 @@
                 if( main_signature ) {
                         os << "static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return ";
+                        main_signature->mangleName = SymTab::Mangler::mangle(main_signature.get());
 
                         os << main_signature->get_scopedMangleName() << "(";

src/CodeGen/FixNames.cc

@@ -31 +31 @@
 #include "SynTree/Type.h"          // for Type, BasicType, Type::Qualifiers
 #include "SynTree/Visitor.h"       // for Visitor, acceptAll
+#include "CompilationState.h"
 
 namespace CodeGen {
@@ -102 +103 @@
                 if ( dwt->get_name() != "" ) {
                         if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
-                                dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
+                                if (!useNewAST) {
+                                        dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
+                                }
                                 dwt->set_scopeLevel( scopeLevel );
                         } // if

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

src/InitTweak/GenInit.h

@@ -52 +52 @@
                 GenPoly::ScopedSet< std::string > managedTypes;
         };
+
+        class ManagedTypes_new {
+        public:
+                bool isManaged( const ast::ObjectDecl * objDecl ) const ; // determine if object is managed
+                bool isManaged( const ast::Type * type ) const; // determine if type is managed
+
+                void handleDWT( const ast::DeclWithType * dwt ); // add type to managed if ctor/dtor
+                void handleStruct( const ast::StructDecl * aggregateDecl ); // add type to managed if child is managed
+
+                void beginScope();
+                void endScope();
+        private:
+                GenPoly::ScopedSet< std::string > managedTypes;
+        };
 } // namespace
 

src/InitTweak/InitTweak.cc

@@ -87 +87 @@
                 };
 
+                struct HasDesignations_new : public ast::WithShortCircuiting {
+                        bool result = false;
+
+                        void previsit( const ast::Node * ) {
+                                // short circuit if we already know there are designations
+                                if ( result ) visit_children = false;
+                        }
+
+                        void previsit( const ast::Designation * des ) {
+                                // short circuit if we already know there are designations
+                                if ( result ) visit_children = false;
+                                else if ( ! des->designators.empty() ) {
+                                        result = true;
+                                        visit_children = false;
+                                }
+                        }
+                };
+
+                struct InitDepthChecker_new : public ast::WithGuards {
+                        bool result = true;
+                        const ast::Type * type;
+                        int curDepth = 0, maxDepth = 0;
+                        InitDepthChecker_new( const ast::Type * type ) : type( type ) {
+                                const ast::Type * t = type;
+                                while ( auto at = dynamic_cast< const ast::ArrayType * >( t ) ) {
+                                        maxDepth++;
+                                        t = at->base;
+                                }
+                                maxDepth++;
+                        }
+                        void previsit( ListInit * ) {
+                                curDepth++;
+                                GuardAction( [this]() { curDepth--; } );
+                                if ( curDepth > maxDepth ) result = false;
+                        }
+                };
+
                 struct InitFlattener_old : public WithShortCircuiting {
                         void previsit( SingleInit * singleInit ) {
@@ -122 +159 @@
                 maybeAccept( objDecl->init, checker );
                 return checker.pass.depthOkay;
+        }
+
+        bool isDesignated( const ast::Init * init ) {
+                ast::Pass<HasDesignations_new> finder;
+                maybe_accept( init, finder );
+                return finder.core.result;
+        }
+
+        bool checkInitDepth( const ast::ObjectDecl * objDecl ) {
+                ast::Pass<InitDepthChecker_new> checker( objDecl->type );
+                maybe_accept( objDecl->init.get(), checker );
+                return checker.core.result;
         }
 
@@ -358 +407 @@
                         if ( auto listInit = dynamic_cast< const ast::ListInit * >( init ) ) {
                                 for ( const ast::Init * init : *listInit ) {
-                                        buildCallExpr( callExpr, index, dimension, init, out );
+                                        buildCallExpr( shallowCopy(callExpr), index, dimension, init, out );
                                 }
                         } else {
-                                buildCallExpr( callExpr, index, dimension, init, out );
+                                buildCallExpr( shallowCopy(callExpr), index, dimension, init, out );
                         }
                 } else {
@@ -1027 +1076 @@
         };
 
+        struct ConstExprChecker_new : public ast::WithShortCircuiting {
+                // most expressions are not const expr
+                void previsit( const ast::Expr * ) { result = false; visit_children = false; }
+
+                void previsit( const ast::AddressExpr *addressExpr ) {
+                        visit_children = false;
+                        const ast::Expr * arg = addressExpr->arg;
+
+                        // address of a variable or member expression is constexpr
+                        if ( ! dynamic_cast< const ast::NameExpr * >( arg ) 
+                        && ! dynamic_cast< const ast::VariableExpr * >( arg ) 
+                        && ! dynamic_cast< const ast::MemberExpr * >( arg ) 
+                        && ! dynamic_cast< const ast::UntypedMemberExpr * >( arg ) ) result = false;
+                }
+
+                // these expressions may be const expr, depending on their children
+                void previsit( const ast::SizeofExpr * ) {}
+                void previsit( const ast::AlignofExpr * ) {}
+                void previsit( const ast::UntypedOffsetofExpr * ) {}
+                void previsit( const ast::OffsetofExpr * ) {}
+                void previsit( const ast::OffsetPackExpr * ) {}
+                void previsit( const ast::CommaExpr * ) {}
+                void previsit( const ast::LogicalExpr * ) {}
+                void previsit( const ast::ConditionalExpr * ) {}
+                void previsit( const ast::CastExpr * ) {}
+                void previsit( const ast::ConstantExpr * ) {}
+
+                void previsit( const ast::VariableExpr * varExpr ) {
+                        visit_children = false;
+
+                        if ( auto inst = varExpr->result.as<ast::EnumInstType>() ) {
+                                long long int value;
+                                if ( inst->base->valueOf( varExpr->var, value ) ) {
+                                        // enumerators are const expr
+                                        return;
+                                }
+                        }
+                        result = false;
+                }
+
+                bool result = true;
+        };
+
         bool isConstExpr( Expression * expr ) {
                 if ( expr ) {
@@ -1046 +1138 @@
         }
 
+        bool isConstExpr( const ast::Expr * expr ) {
+                if ( expr ) {
+                        ast::Pass<ConstExprChecker_new> checker;
+                        expr->accept( checker );
+                        return checker.core.result;
+                }
+                return true;
+        }
+
+        bool isConstExpr( const ast::Init * init ) {
+                if ( init ) {
+                        ast::Pass<ConstExprChecker_new> checker;
+                        init->accept( checker );
+                        return checker.core.result;
+                } // if
+                // for all intents and purposes, no initializer means const expr
+                return true;
+        }
+
         bool isConstructor( const std::string & str ) { return str == "?{}"; }
         bool isDestructor( const std::string & str ) { return str == "^?{}"; }

src/InitTweak/InitTweak.h

@@ -59 +59 @@
         /// True if the Initializer contains designations
         bool isDesignated( Initializer * init );
+        bool isDesignated( const ast::Init * init );
 
         /// True if the ObjectDecl's Initializer nesting level is not deeper than the depth of its
         /// type, where the depth of its type is the number of nested ArrayTypes + 1
         bool checkInitDepth( ObjectDecl * objDecl );
+        bool checkInitDepth( const ast::ObjectDecl * objDecl );
 
         /// returns the declaration of the function called by the expr (must be ApplicationExpr or UntypedExpr)
@@ -107 +109 @@
         bool isConstExpr( Expression * expr );
         bool isConstExpr( Initializer * init );
+
+        bool isConstExpr( const ast::Expr * expr );
+        bool isConstExpr( const ast::Init * init );
 
         /// Modifies objDecl to have:

src/ResolvExpr/ResolveTypeof.cc

@@ -29 +29 @@
 #include "SynTree/Mutator.h"     // for Mutator
 #include "SynTree/Type.h"        // for TypeofType, Type
+#include "SymTab/Mangler.h"
+#include "InitTweak/InitTweak.h" // for isConstExpr
 
 namespace SymTab {
@@ -163 +165 @@
 }
 
+struct FixArrayDimension {
+        // should not require a mutable symbol table - prevent pass template instantiation
+        const ast::SymbolTable & _symtab; 
+        FixArrayDimension(const ast::SymbolTable & symtab): _symtab(symtab) {}
+
+        const ast::ArrayType * previsit (const ast::ArrayType * arrayType) {
+                if (!arrayType->dimension) return arrayType;
+                auto mutType = mutate(arrayType);
+                ast::ptr<ast::Type> sizetype = ast::sizeType ? ast::sizeType : new ast::BasicType(ast::BasicType::LongUnsignedInt); 
+                mutType->dimension = findSingleExpression(arrayType->dimension, sizetype, _symtab);
+
+                if (InitTweak::isConstExpr(mutType->dimension)) {
+                        mutType->isVarLen = ast::LengthFlag::FixedLen;
+                }
+                else {
+                        mutType->isVarLen = ast::LengthFlag::VariableLen;
+                }
+                return mutType;
+        }
+};
+
+const ast::Type * fixArrayType( const ast::Type * type, const ast::SymbolTable & symtab) {
+        ast::Pass<FixArrayDimension> visitor {symtab};
+        return type->accept(visitor);
+}
+
+const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ast::SymbolTable & symtab ) {
+        if (!decl->isTypeFixed) { 
+                auto mutDecl = mutate(decl);
+                auto resolvedType = resolveTypeof(decl->type, symtab);
+                resolvedType = fixArrayType(resolvedType, symtab);
+                mutDecl->type = resolvedType;
+
+                // check variable length if object is an array.
+                // xxx - should this be part of fixObjectType?
+
+                /*
+                if (auto arrayType = dynamic_cast<const ast::ArrayType *>(resolvedType)) {
+                        auto dimExpr = findSingleExpression(arrayType->dimension, ast::sizeType, symtab);
+                        if (auto varexpr = arrayType->dimension.as<ast::VariableExpr>()) {// hoisted previously
+                                if (InitTweak::isConstExpr(varexpr->var.strict_as<ast::ObjectDecl>()->init)) {
+                                        auto mutType = mutate(arrayType);
+                                        mutType->isVarLen = ast::LengthFlag::VariableLen;
+                                        mutDecl->type = mutType;
+                                }
+                        }
+                }
+                */
+
+
+                if (!mutDecl->name.empty()) 
+                        mutDecl->mangleName = Mangle::mangle(mutDecl); // do not mangle unnamed variables
+                
+                mutDecl->isTypeFixed = true;
+                return mutDecl;
+        }
+        return decl;
+}
+
 } // namespace ResolvExpr
 

src/ResolvExpr/ResolveTypeof.h

@@ -23 +23 @@
         class Type;
         class SymbolTable;
+        class ObjectDecl;
 }
 
@@ -28 +29 @@
         Type *resolveTypeof( Type*, const SymTab::Indexer &indexer );
         const ast::Type * resolveTypeof( const ast::Type *, const ast::SymbolTable & );
+        const ast::ObjectDecl * fixObjectType( const ast::ObjectDecl * decl , const ast::SymbolTable & symtab );
 } // namespace ResolvExpr
 

src/ResolvExpr/Resolver.cc

@@ -26 +26 @@
 #include "RenameVars.h"                  // for RenameVars, global_renamer
 #include "Resolver.h"
+#include "ResolveTypeof.h"
 #include "ResolvMode.h"                  // for ResolvMode
 #include "typeops.h"                     // for extractResultType
 #include "Unify.h"                       // for unify
+#include "CompilationState.h"
 #include "AST/Chain.hpp"
 #include "AST/Decl.hpp"
@@ -45 +47 @@
 #include "SymTab/Autogen.h"              // for SizeType
 #include "SymTab/Indexer.h"              // for Indexer
+#include "SymTab/Mangler.h"              // for Mangler
 #include "SynTree/Declaration.h"         // for ObjectDecl, TypeDecl, Declar...
 #include "SynTree/Expression.h"          // for Expression, CastExpr, InitExpr
@@ -1179 +1182 @@
         } // anonymous namespace
 
-                ast::ptr< ast::Expr > findSingleExpression(
-                        const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab
-                ) {
-                        assert( untyped && type );
-                        ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
-                        ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, symtab );
-                        removeExtraneousCast( newExpr, symtab );
-                        return newExpr;
-                }
+        ast::ptr< ast::Expr > findSingleExpression(
+                const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab
+        ) {
+                assert( untyped && type );
+                ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
+                ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, symtab );
+                removeExtraneousCast( newExpr, symtab );
+                return newExpr;
+        }
 
         namespace {
+                bool structOrUnion( const Candidate & i ) {
+                        const ast::Type * t = i.expr->result->stripReferences();
+                        return dynamic_cast< const ast::StructInstType * >( t ) || dynamic_cast< const ast::UnionInstType * >( t );
+                }
                 /// Predicate for "Candidate has integral type"
                 bool hasIntegralType( const Candidate & i ) {
@@ -1237 +1244 @@
                 ast::ptr< ast::Type > functionReturn = nullptr;
                 ast::CurrentObject currentObject;
+                // for work previously in GenInit
+                static InitTweak::ManagedTypes_new managedTypes;
+
                 bool inEnumDecl = false;
 
@@ -1244 +1254 @@
                 Resolver_new( const ast::SymbolTable & syms ) { symtab = syms; }
 
-                void previsit( const ast::FunctionDecl * );
+                const ast::FunctionDecl * previsit( const ast::FunctionDecl * );
                 const ast::FunctionDecl * postvisit( const ast::FunctionDecl * );
-                void previsit( const ast::ObjectDecl * );
+                const ast::ObjectDecl * previsit( const ast::ObjectDecl * );
+                void previsit( const ast::AggregateDecl * );
+                void previsit( const ast::StructDecl * );
                 void previsit( const ast::EnumDecl * );
                 const ast::StaticAssertDecl * previsit( const ast::StaticAssertDecl * );
@@ -1267 +1279 @@
                 const ast::CatchStmt *       postvisit( const ast::CatchStmt * );
                 const ast::WaitForStmt *     previsit( const ast::WaitForStmt * );
+                const ast::WithStmt *        previsit( const ast::WithStmt * );
 
                 const ast::SingleInit *      previsit( const ast::SingleInit * );
                 const ast::ListInit *        previsit( const ast::ListInit * );
                 const ast::ConstructorInit * previsit( const ast::ConstructorInit * );
+
+                void resolveWithExprs(std::vector<ast::ptr<ast::Expr>> & exprs, std::list<ast::ptr<ast::Stmt>> & stmtsToAdd);
+
+                void beginScope() { managedTypes.beginScope(); }
+                void endScope() { managedTypes.endScope(); }
+                bool onError(ast::ptr<ast::Decl> & decl);
         };
         // size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
+
+        InitTweak::ManagedTypes_new Resolver_new::managedTypes;
 
         void resolve( ast::TranslationUnit& translationUnit ) {
@@ -1297 +1318 @@
         }
 
-        void Resolver_new::previsit( const ast::FunctionDecl * functionDecl ) {
+        namespace {
+                const ast::Attribute * handleAttribute(const CodeLocation & loc, const ast::Attribute * attr, const ast::SymbolTable & symtab) {
+                        std::string name = attr->normalizedName();
+                        if (name == "constructor" || name == "destructor") {
+                                if (attr->params.size() == 1) {
+                                        auto arg = attr->params.front();
+                                        auto resolved = ResolvExpr::findSingleExpression( arg, new ast::BasicType( ast::BasicType::LongLongSignedInt ), symtab );
+                                        auto result = eval(arg);
+
+                                        auto mutAttr = mutate(attr);
+                                        mutAttr->params.front() = resolved;
+                                        if (! result.second) {
+                                                SemanticWarning(loc, Warning::GccAttributes,
+                                                        toCString( name, " priorities must be integers from 0 to 65535 inclusive: ", arg ) );
+                                        }
+                                        else {
+                                                auto priority = result.first;
+                                                if (priority < 101) {
+                                                        SemanticWarning(loc, Warning::GccAttributes,
+                                                                toCString( name, " priorities from 0 to 100 are reserved for the implementation" ) );
+                                                } else if (priority < 201 && ! buildingLibrary()) {
+                                                        SemanticWarning(loc, Warning::GccAttributes,
+                                                                toCString( name, " priorities from 101 to 200 are reserved for the implementation" ) );
+                                                }
+                                        }
+                                        return mutAttr;
+                                } else if (attr->params.size() > 1) {
+                                        SemanticWarning(loc, Warning::GccAttributes, toCString( "too many arguments to ", name, " attribute" ) );
+                                } else {
+                                        SemanticWarning(loc, Warning::GccAttributes, toCString( "too few arguments to ", name, " attribute" ) );
+                                }
+                        }
+                        return attr;
+                }
+        }
+
+        const ast::FunctionDecl * Resolver_new::previsit( const ast::FunctionDecl * functionDecl ) {
                 GuardValue( functionReturn );
+
+                assert (functionDecl->unique());
+                if (!functionDecl->has_body() && !functionDecl->withExprs.empty()) {
+                        SemanticError(functionDecl->location, functionDecl, "Function without body has with declarations");
+                }
+
+                if (!functionDecl->isTypeFixed) {
+                        auto mutDecl = mutate(functionDecl);
+                        auto mutType = mutDecl->type.get_and_mutate();
+
+                        for (auto & attr: mutDecl->attributes) {
+                                attr = handleAttribute(mutDecl->location, attr, symtab);
+                        }
+
+                        // handle assertions. (seems deep)
+
+                        symtab.enterScope();
+                        for (auto & typeParam : mutType->forall) {
+                                auto mutParam = typeParam.get_and_mutate();
+                                symtab.addType(mutParam);
+                                for (auto & asst : mutParam->assertions) {
+                                        asst = fixObjectType(asst.strict_as<ast::ObjectDecl>(), symtab);
+                                        symtab.addId(asst);
+                                }
+                                typeParam = mutParam;
+                        }
+
+                        // temporarily adds params to symbol table.
+                        // actual scoping rules for params and withexprs differ - see Pass::visit(FunctionDecl)
+
+                        std::vector<ast::ptr<ast::Type>> paramTypes;
+                        std::vector<ast::ptr<ast::Type>> returnTypes;
+
+                        for (auto & param : mutDecl->params) {
+                                param = fixObjectType(param.strict_as<ast::ObjectDecl>(), symtab);
+                                symtab.addId(param);
+                                paramTypes.emplace_back(param->get_type());
+                        }
+                        for (auto & ret : mutDecl->returns) {
+                                ret = fixObjectType(ret.strict_as<ast::ObjectDecl>(), symtab);
+                                returnTypes.emplace_back(ret->get_type());
+                        }
+                        // since function type in decl is just a view of param types, need to update that as well
+                        mutType->params = std::move(paramTypes);
+                        mutType->returns = std::move(returnTypes);
+
+                        std::list<ast::ptr<ast::Stmt>> newStmts;
+                        resolveWithExprs (mutDecl->withExprs, newStmts);
+
+                        if (mutDecl->stmts) {
+                                auto mutStmt = mutDecl->stmts.get_and_mutate();
+                                mutStmt->kids.splice(mutStmt->kids.begin(), std::move(newStmts));
+                                mutDecl->stmts = mutStmt;
+                        }
+
+                        symtab.leaveScope();
+
+                        mutDecl->mangleName = Mangle::mangle(mutDecl);
+                        mutDecl->isTypeFixed = true;
+                        functionDecl = mutDecl;
+                }
+                managedTypes.handleDWT(functionDecl);
+
                 functionReturn = extractResultType( functionDecl->type );
+                return functionDecl;
         }
 
@@ -1330 +1451 @@
         }
 
-        void Resolver_new::previsit( const ast::ObjectDecl * objectDecl ) {
+        const ast::ObjectDecl * Resolver_new::previsit( const ast::ObjectDecl * objectDecl ) {
                 // To handle initialization of routine pointers [e.g. int (*fp)(int) = foo()],
                 // class-variable `initContext` is changed multiple times because the LHS is analyzed
@@ -1338 +1459 @@
                 // selecting the RHS.
                 GuardValue( currentObject );
-                currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };
+
                 if ( inEnumDecl && dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() ) ) {
                         // enumerator initializers should not use the enum type to initialize, since the
                         // enum type is still incomplete at this point. Use `int` instead.
+                        objectDecl = fixObjectType(objectDecl, symtab);
                         currentObject = ast::CurrentObject{
                                 objectDecl->location, new ast::BasicType{ ast::BasicType::SignedInt } };
                 }
+                else {
+                        if (!objectDecl->isTypeFixed) {
+                                auto newDecl = fixObjectType(objectDecl, symtab);
+                                auto mutDecl = mutate(newDecl);
+                                
+                                // generate CtorInit wrapper when necessary.
+                                // in certain cases, fixObjectType is called before reaching
+                                // this object in visitor pass, thus disabling CtorInit codegen.
+                                // this happens on aggregate members and function parameters.
+                                if ( InitTweak::tryConstruct( mutDecl ) && ( managedTypes.isManaged( mutDecl ) || ((! isInFunction() || mutDecl->storage.is_static ) && ! InitTweak::isConstExpr( mutDecl->init ) ) ) ) {
+                                        // constructed objects cannot be designated
+                                        if ( InitTweak::isDesignated( mutDecl->init ) ) SemanticError( mutDecl, "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n" );
+                                        // constructed objects should not have initializers nested too deeply
+                                        if ( ! InitTweak::checkInitDepth( mutDecl ) ) SemanticError( mutDecl, "Managed object's initializer is too deep " );
+
+                                        mutDecl->init = InitTweak::genCtorInit( mutDecl->location, mutDecl );
+                                }
+
+                                objectDecl = mutDecl;
+                        }
+                        currentObject = ast::CurrentObject{ objectDecl->location, objectDecl->get_type() };
+                }
+                
+                return objectDecl;
+        }
+
+        void Resolver_new::previsit( const ast::AggregateDecl * _aggDecl ) {
+                auto aggDecl = mutate(_aggDecl);
+                assertf(aggDecl == _aggDecl, "type declarations must be unique");
+
+                for (auto & member: aggDecl->members) {
+                        // nested type decls are hoisted already. no need to do anything
+                        if (auto obj = member.as<ast::ObjectDecl>()) {
+                                member = fixObjectType(obj, symtab);
+                        }
+                }
+        }
+
+        void Resolver_new::previsit( const ast::StructDecl * structDecl ) {
+                previsit(static_cast<const ast::AggregateDecl *>(structDecl));
+                managedTypes.handleStruct(structDecl);
         }
 
@@ -1351 +1514 @@
                 GuardValue( inEnumDecl );
                 inEnumDecl = true;
-        }
+                // don't need to fix types for enum fields
+        }
+
 
         const ast::StaticAssertDecl * Resolver_new::previsit(
@@ -1780 +1945 @@
         }
 
+        const ast::WithStmt * Resolver_new::previsit( const ast::WithStmt * withStmt ) {
+                auto mutStmt = mutate(withStmt);
+                resolveWithExprs(mutStmt->exprs, stmtsToAddBefore);
+                return mutStmt;
+        }
+
+        void Resolver_new::resolveWithExprs(std::vector<ast::ptr<ast::Expr>> & exprs, std::list<ast::ptr<ast::Stmt>> & stmtsToAdd) {
+                for (auto & expr : exprs) {
+                        // only struct- and union-typed expressions are viable candidates
+                        expr = findKindExpression( expr, symtab, structOrUnion, "with expression" );
+
+                        // if with expression might be impure, create a temporary so that it is evaluated once
+                        if ( Tuples::maybeImpure( expr ) ) {
+                                static UniqueName tmpNamer( "_with_tmp_" );
+                                const CodeLocation loc = expr->location;
+                                auto tmp = new ast::ObjectDecl(loc, tmpNamer.newName(), expr->result, new ast::SingleInit(loc, expr ) );
+                                expr = new ast::VariableExpr( loc, tmp );
+                                stmtsToAdd.push_back( new ast::DeclStmt(loc, tmp ) );
+                                if ( InitTweak::isConstructable( tmp->type ) ) {
+                                        // generate ctor/dtor and resolve them
+                                        tmp->init = InitTweak::genCtorInit( loc, tmp );
+                                }
+                                // since tmp is freshly created, this should modify tmp in-place
+                                tmp->accept( *visitor );
+                        }
+                }
+        }
 
 
@@ -1875 +2067 @@
         }
 
+        // suppress error on autogen functions and mark invalid autogen as deleted.
+        bool Resolver_new::onError(ast::ptr<ast::Decl> & decl) {
+                if (auto functionDecl = decl.as<ast::FunctionDecl>()) {
+                        // xxx - can intrinsic gen ever fail?
+                        if (functionDecl->linkage == ast::Linkage::AutoGen) { 
+                                auto mutDecl = mutate(functionDecl);
+                                mutDecl->isDeleted = true;
+                                mutDecl->stmts = nullptr;
+                                decl = mutDecl;
+                                return false;
+                        }
+                }
+                return true;
+        }
+
 } // namespace ResolvExpr
 

src/ResolvExpr/SatisfyAssertions.cpp

@@ -247 +247 @@
                                 auto it = inferred.find( slot );
                                 if ( it == inferred.end() ) {
-                                        std::cerr << "missing assertion " << slot << std::endl;
+                                        // std::cerr << "missing assertion " << slot << std::endl;
                                         missingSlots.push_back(slot);
                                         continue;

src/SymTab/Autogen.cc

@@ -38 +38 @@
 #include "SynTree/Type.h"          // for FunctionType, Type, TypeInstType
 #include "SynTree/Visitor.h"       // for maybeAccept, Visitor, acceptAll
+#include "CompilationState.h"
 
 class Attribute;
@@ -346 +347 @@
         void FuncGenerator::resolve( FunctionDecl * dcl ) {
                 try {
-                        ResolvExpr::resolveDecl( dcl, indexer );
+                        if (!useNewAST) // attempt to delay resolver call
+                                ResolvExpr::resolveDecl( dcl, indexer );
                         if ( functionNesting == 0 ) {
                                 // forward declare if top-level struct, so that

src/SymTab/Autogen.h

@@ -167 +167 @@
                 fExpr->args.emplace_back( dstParam );
 
-                const ast::Stmt * listInit = srcParam.buildListInit( fExpr );
+                ast::ptr<ast::Stmt> listInit = srcParam.buildListInit( fExpr );
 
                 // fetch next set of arguments

src/SymTab/Validate.cc

@@ -64 +64 @@
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "CompilationState.h"          // skip some passes in new-ast build
 #include "Concurrency/Keywords.h"      // for applyKeywords
 #include "FixFunction.h"               // for FixFunction
@@ -368 +369 @@
                                 mutateAll( translationUnit, compoundliteral );
                         });
-                        Stats::Time::TimeBlock("Resolve With Expressions", [&]() {
-                                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
-                        });
+                        if (!useNewAST) {
+                                Stats::Time::TimeBlock("Resolve With Expressions", [&]() {
+                                        ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
+                                });
+                        }
                 }
                 {
                         Stats::Heap::newPass("validate-F");
                         Stats::Time::BlockGuard guard("validate-F");
-                        Stats::Time::TimeCall("Fix Object Type",
-                                FixObjectType::fix, translationUnit);
+                        if (!useNewAST) {
+                                Stats::Time::TimeCall("Fix Object Type",
+                                        FixObjectType::fix, translationUnit);
+                        }
                         Stats::Time::TimeCall("Array Length",
                                 ArrayLength::computeLength, translationUnit);
@@ -383 +388 @@
                         Stats::Time::TimeCall("Fix Label Address",
                                 mutateAll<LabelAddressFixer>, translationUnit, labelAddrFixer);
-                        Stats::Time::TimeCall("Handle Attributes",
-                                Validate::handleAttributes, translationUnit);
+                        if (!useNewAST) {
+                                Stats::Time::TimeCall("Handle Attributes",
+                                        Validate::handleAttributes, translationUnit);
+                        }
                 }
         }
@@ -1340 +1347 @@
 
         void ArrayLength::previsit( ArrayType * type ) {
-                if ( type->dimension ) {
-                        // need to resolve array dimensions early so that constructor code can correctly determine
-                        // if a type is a VLA (and hence whether its elements need to be constructed)
-                        ResolvExpr::findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
-
-                        // must re-evaluate whether a type is a VLA, now that more information is available
-                        // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
-                        type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                if (!useNewAST) {
+                        if ( type->dimension ) {
+                                // need to resolve array dimensions early so that constructor code can correctly determine
+                                // if a type is a VLA (and hence whether its elements need to be constructed)
+                                ResolvExpr::findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
+
+                                // must re-evaluate whether a type is a VLA, now that more information is available
+                                // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
+                                type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                        }
                 }
         }

tests/alloc.cfa

@@ -208 +208 @@
 
 
+        int const_count, dest_count;
         struct Struct { int x; double y; };
+        void  ?{}( Struct & a ) {                                       // construct
+                a.[ x, y ] = [ -1, -1.0 ];
+        }
+        void  ?{}( Struct & a, int x, double y ) {      // initialize
+                a.[ x, y ] = [ x, y ];
+                const_count++;
+        }
+        void ^?{}( Struct & a ) {  dest_count++; }      // destruct
         Struct st, st1, sta[dim], sta1[dim], * stp, * stp1;
 
@@ -329 +338 @@
         printf( "\n" );
 
+        const_count = dest_count = 0;
         stp = new( 42, 42.5 );
+        assert( const_count == 1 && dest_count == 0 );                                          // assertion for testing
         stp1 = new( 42, 42.5 );
+        assert( const_count == 2 && dest_count == 0 );                                          // assertion for testing
+
         printf( "CFA new initialize\n%d %g %d %g\n", stp->x, stp->y, stp1->x, stp1->y );
         delete( stp, stp1 );
+        assert( const_count == 2 && dest_count == 2 );                                          // assertion for testing
 
         // new, array types
         stp = anew( dim, 42, 42.5 );
+        assert( const_count == 2 + dim && dest_count == 2 );                            // assertion for testing
         printf( "CFA array new initialize\n" );
         for ( i; dim ) { printf( "%d %g, ", stp[i].x, stp[i].y ); }
         printf( "\n" );
+
         stp1 = anew( dim, 42, 42.5 );
+        assert( const_count == 2 + 2 * dim && dest_count == 2 );                        // assertion for testing
         for ( i; dim ) { printf( "%d %g, ", stp1[i].x, stp1[i].y ); }
         printf( "\n" );
         adelete( stp, stp1 );
+        assert( const_count == 2 + 2 * dim && dest_count == 2 + 2 * dim);       // assertion for testing
 
         // extras
@@ -354 +372 @@
         *ip = 0xdeadbeef;
         printf( "CFA deep malloc %#x\n", *ip );
-        free( ip );
+
+        dp = alloc(5.0`fill); // just for testing multiple free
+        assert(*dp == 5.0);
+        free( ip, dp );
 
 #ifdef ERR1

tests/malloc.cfa

@@ -319 +319 @@
         free(ip);
 
-        free( 0p ); // sanity check
+        free( (void*) 0p ); // sanity check
         free( NULL ); // sanity check