Changes in src/InitTweak/FixInitNew.cpp [39d8950:ce36b55]

File:

• src/InitTweak/FixInitNew.cpp (modified) (16 diffs)

src/InitTweak/FixInitNew.cpp

@@ -16 +16 @@
 #include "CodeGen/GenType.h"           // for genPrettyType
 #include "CodeGen/OperatorTable.h"
-#include "Common/CodeLocationTools.hpp"
 #include "Common/PassVisitor.h"        // for PassVisitor, WithStmtsToAdd
 #include "Common/SemanticError.h"      // for SemanticError
@@ -86 +85 @@
         /// generate/resolve copy construction expressions for each, and generate/resolve destructors for both
         /// arguments and return value temporaries
-        struct ResolveCopyCtors final : public ast::WithGuards, public ast::WithStmtsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithVisitorRef<ResolveCopyCtors>, public ast::WithConstTranslationUnit {
+        struct ResolveCopyCtors final : public ast::WithGuards, public ast::WithStmtsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithVisitorRef<ResolveCopyCtors> {
                 const ast::Expr * postvisit( const ast::ImplicitCopyCtorExpr * impCpCtorExpr );
                 const ast::StmtExpr * previsit( const ast::StmtExpr * stmtExpr );
@@ -190 +189 @@
         /// for any member that is missing a corresponding ctor/dtor call.
         /// error if a member is used before constructed
-        struct GenStructMemberCalls final : public ast::WithGuards, public ast::WithShortCircuiting, public ast::WithSymbolTable, public ast::WithVisitorRef<GenStructMemberCalls>, public ast::WithConstTranslationUnit {
+        struct GenStructMemberCalls final : public ast::WithGuards, public ast::WithShortCircuiting, public ast::WithSymbolTable, public ast::WithVisitorRef<GenStructMemberCalls> {
                 void previsit( const ast::FunctionDecl * funcDecl );
                 const ast::DeclWithType * postvisit( const ast::FunctionDecl * funcDecl );
@@ -215 +214 @@
 
         /// expands ConstructorExpr nodes into comma expressions, using a temporary for the first argument
-        struct FixCtorExprs final : public ast::WithDeclsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting, public ast::WithConstTranslationUnit {
+        struct FixCtorExprs final : public ast::WithDeclsToAdd<>, public ast::WithSymbolTable, public ast::WithShortCircuiting {
                 const ast::Expr * postvisit( const ast::ConstructorExpr * ctorExpr );
         };
@@ -510 +509 @@
                 // (VariableExpr and already resolved expression)
                 CP_CTOR_PRINT( std::cerr << "ResolvingCtorDtor " << untyped << std::endl; )
-                ast::ptr<ast::Expr> resolved = ResolvExpr::findVoidExpression(untyped, { symtab, transUnit().global } );
+                ast::ptr<ast::Expr> resolved = ResolvExpr::findVoidExpression(untyped, symtab);
                 assert( resolved );
                 if ( resolved->env ) {
@@ -554 +553 @@
                 ast::ptr<ast::Expr> guard = mutArg;
 
-                ast::ptr<ast::ObjectDecl> tmp = new ast::ObjectDecl(loc, "__tmp", mutResult, nullptr );
+                ast::ptr<ast::ObjectDecl> tmp = new ast::ObjectDecl({}, "__tmp", mutResult, nullptr );
 
                 // create and resolve copy constructor
@@ -588 +587 @@
 
         ast::Expr * ResolveCopyCtors::destructRet( const ast::ObjectDecl * ret, const ast::Expr * arg ) {
-                auto global = transUnit().global;
                 // TODO: refactor code for generating cleanup attribute, since it's common and reused in ~3-4 places
                 // check for existing cleanup attribute before adding another(?)
                 // need to add __Destructor for _tmp_cp variables as well
 
-                assertf( global.dtorStruct, "Destructor generation requires __Destructor definition." );
-                assertf( global.dtorStruct->members.size() == 2, "__Destructor definition does not have expected fields." );
-                assertf( global.dtorDestroy, "Destructor generation requires __destroy_Destructor." );
+                assertf( ast::dtorStruct, "Destructor generation requires __Destructor definition." );
+                assertf( ast::dtorStruct->members.size() == 2, "__Destructor definition does not have expected fields." );
+                assertf( ast::dtorStructDestroy, "Destructor generation requires __destroy_Destructor." );
 
                 const CodeLocation loc = ret->location;
@@ -612 +610 @@
                 auto dtorFunc = getDtorFunc( ret, new ast::ExprStmt(loc, dtor ), stmtsToAddBefore );
 
-                auto dtorStructType = new ast::StructInstType( global.dtorStruct );
+                auto dtorStructType = new ast::StructInstType(ast::dtorStruct);
 
                 // what does this do???
@@ -624 +622 @@
                 static UniqueName namer( "_ret_dtor" );
                 auto retDtor = new ast::ObjectDecl(loc, namer.newName(), dtorStructType, new ast::ListInit(loc, { new ast::SingleInit(loc, ast::ConstantExpr::null(loc) ), new ast::SingleInit(loc, new ast::CastExpr( new ast::VariableExpr(loc, dtorFunc ), dtorType ) ) } ) );
-                retDtor->attributes.push_back( new ast::Attribute( "cleanup", { new ast::VariableExpr(loc, global.dtorDestroy ) } ) );
+                retDtor->attributes.push_back( new ast::Attribute( "cleanup", { new ast::VariableExpr(loc, ast::dtorStructDestroy ) } ) );
                 stmtsToAddBefore.push_back( new ast::DeclStmt(loc, retDtor ) );
 
                 if ( arg ) {
-                        auto member = new ast::MemberExpr(loc, global.dtorStruct->members.front().strict_as<ast::DeclWithType>(), new ast::VariableExpr(loc, retDtor ) );
+                        auto member = new ast::MemberExpr(loc, ast::dtorStruct->members.front().strict_as<ast::DeclWithType>(), new ast::VariableExpr(loc, retDtor ) );
                         auto object = new ast::CastExpr( new ast::AddressExpr( new ast::VariableExpr(loc, ret ) ), new ast::PointerType(new ast::VoidType() ) );
                         ast::Expr * assign = createBitwiseAssignment( member, object );
@@ -801 +799 @@
         // to prevent warnings ('_unq0' may be used uninitialized in this function),
         // insert an appropriate zero initializer for UniqueExpr temporaries.
-        ast::Init * makeInit( const ast::Type * t, CodeLocation const & loc ) {
+        ast::Init * makeInit( const ast::Type * t ) {
                 if ( auto inst = dynamic_cast< const ast::StructInstType * >( t ) ) {
                         // initizer for empty struct must be empty
-                        if ( inst->base->members.empty() ) {
-                                return new ast::ListInit( loc, {} );
-                        }
+                        if ( inst->base->members.empty() ) return new ast::ListInit({}, {});
                 } else if ( auto inst = dynamic_cast< const ast::UnionInstType * >( t ) ) {
                         // initizer for empty union must be empty
-                        if ( inst->base->members.empty() ) {
-                                return new ast::ListInit( loc, {} );
-                        }
-                }
-
-                return new ast::ListInit( loc, {
-                        new ast::SingleInit( loc, ast::ConstantExpr::from_int( loc, 0 ) )
-                } );
+                        if ( inst->base->members.empty() ) return new ast::ListInit({}, {});
+                }
+
+                return new ast::ListInit( {}, { new ast::SingleInit( {}, ast::ConstantExpr::from_int({}, 0) ) } );
         }
 
@@ -840 +832 @@
                         } else {
                                 // expr isn't a call expr, so create a new temporary variable to use to hold the value of the unique expression
-                                mutExpr->object = new ast::ObjectDecl( mutExpr->location, toString("_unq", mutExpr->id), mutExpr->result, makeInit( mutExpr->result, mutExpr->location ) );
+                                mutExpr->object = new ast::ObjectDecl( mutExpr->location, toString("_unq", mutExpr->id), mutExpr->result, makeInit( mutExpr->result ) );
                                 mutExpr->var = new ast::VariableExpr( mutExpr->location, mutExpr->object );
                         }
@@ -1180 +1172 @@
                         auto guard = makeFuncGuard( [this]() { symtab.enterScope(); }, [this]() { symtab.leaveScope(); } );
                         symtab.addFunction( function );
-                        auto global = transUnit().global;
 
                         // need to iterate through members in reverse in order for
@@ -1226 +1217 @@
 
                                                         static UniqueName memberDtorNamer = { "__memberDtor" };
-                                                        assertf( global.dtorStruct, "builtin __Destructor not found." );
-                                                        assertf( global.dtorDestroy, "builtin __destroy_Destructor not found." );
+                                                        assertf( ast::dtorStruct, "builtin __Destructor not found." );
+                                                        assertf( ast::dtorStructDestroy, "builtin __destroy_Destructor not found." );
 
                                                         ast::Expr * thisExpr = new ast::CastExpr( new ast::AddressExpr( new ast::VariableExpr(loc, thisParam ) ), new ast::PointerType( new ast::VoidType(), ast::CV::Qualifiers() ) );
@@ -1237 +1228 @@
                                                         auto dtorType = new ast::PointerType( dtorFtype );
 
-                                                        auto destructor = new ast::ObjectDecl(loc, memberDtorNamer.newName(), new ast::StructInstType( global.dtorStruct ), new ast::ListInit(loc, { new ast::SingleInit(loc, thisExpr ), new ast::SingleInit(loc, new ast::CastExpr( dtorExpr, dtorType ) ) } ) );
-                                                        destructor->attributes.push_back( new ast::Attribute( "cleanup", { new ast::VariableExpr( loc, global.dtorDestroy ) } ) );
+                                                        auto destructor = new ast::ObjectDecl(loc, memberDtorNamer.newName(), new ast::StructInstType( ast::dtorStruct ), new ast::ListInit(loc, { new ast::SingleInit(loc, thisExpr ), new ast::SingleInit(loc, new ast::CastExpr( dtorExpr, dtorType ) ) } ) );
+                                                        destructor->attributes.push_back( new ast::Attribute( "cleanup", { new ast::VariableExpr({}, ast::dtorStructDestroy ) } ) );
                                                         mutStmts->push_front( new ast::DeclStmt(loc, destructor ) );
                                                         mutStmts->kids.splice( mutStmts->kids.begin(), stmtsToAdd );
@@ -1332 +1323 @@
 
         const ast::Expr * GenStructMemberCalls::postvisit( const ast::UntypedExpr * untypedExpr ) {
+                // Expression * newExpr = untypedExpr;
                 // xxx - functions returning ast::ptr seems wrong...
-                auto res = ResolvExpr::findVoidExpression( untypedExpr, { symtab, transUnit().global } );
-                // Fix CodeLocation (at least until resolver is fixed).
-                auto fix = localFillCodeLocations( untypedExpr->location, res.release() );
-                return strict_dynamic_cast<const ast::Expr *>( fix );
+                auto res = ResolvExpr::findVoidExpression( untypedExpr, symtab );
+                return res.release();
+                // return newExpr;
         }
 
@@ -1370 +1361 @@
 
                 // resolve assignment and dispose of new env
-                auto resolved = ResolvExpr::findVoidExpression( assign, { symtab, transUnit().global } );
+                auto resolved = ResolvExpr::findVoidExpression( assign, symtab );
                 auto mut = resolved.get_and_mutate();
                 assertf(resolved.get() == mut, "newly resolved expression must be unique");