Changes in src/ResolvExpr/Resolver.cc [bd87b138:2efe4b8]

File:

• src/ResolvExpr/Resolver.cc (modified) (16 diffs)

src/ResolvExpr/Resolver.cc

@@ -22 +22 @@
 #include "Alternative.h"                 // for Alternative, AltList
 #include "AlternativeFinder.h"           // for AlternativeFinder, resolveIn...
+#include "Common/GC.h"                   // for new_generation, collect_young
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
@@ -59 +60 @@
                 void previsit( TypeDecl *typeDecl );
                 void previsit( EnumDecl * enumDecl );
-                void previsit( StaticAssertDecl * assertDecl );
 
                 void previsit( ArrayType * at );
@@ -139 +139 @@
                                         castExpr->arg = nullptr;
                                         std::swap( expr->env, castExpr->env );
-                                        delete castExpr;
                                 }
                         }
@@ -148 +147 @@
                 void findUnfinishedKindExpression(Expression * untyped, Alternative & alt, const SymTab::Indexer & indexer, const std::string & kindStr, std::function<bool(const Alternative &)> pred, bool adjust = false, bool prune = true, bool failFast = true) {
                         assertf( untyped, "expected a non-null expression." );
+
+                        auto guard = new_generation();  // set up GC generation for this top-level expression
+
                         TypeEnvironment env;
                         AlternativeFinder finder( indexer, env );
@@ -175 +177 @@
                         findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) );
                         if ( winners.size() == 0 ) {
-                                SemanticError( untyped, toString( "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), "expression: ") );
+                                SemanticError( untyped, toString( 
+                                        "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), 
+                                        "expression: ") );
                         } else if ( winners.size() != 1 ) {
                                 std::ostringstream stream;
-                                stream << "Cannot choose between " << winners.size() << " alternatives for " << kindStr << (kindStr != "" ? " " : "") << "expression\n";
+                                stream << "Cannot choose between " << winners.size() << " alternatives for " 
+                                        << kindStr << (kindStr != "" ? " " : "") << "expression\n";
                                 untyped->print( stream );
                                 stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
+                                
                                 SemanticError( untyped->location, stream.str() );
                         }
@@ -188 +194 @@
                         Alternative & choice = winners.front();
                         if ( findDeletedExpr( choice.expr ) ) {
-                                SemanticError( choice.expr, "Unique best alternative includes deleted identifier in " );
+                                trace( choice.expr );
+                                SemanticError( choice.expr, 
+                                        "Unique best alternative includes deleted identifier in " );
                         }
                         alt = std::move( choice );
+                        trace( alt );
                 }
 
@@ -199 +208 @@
                         findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, adjust, prune, failFast );
                         finishExpr( choice.expr, choice.env, untyped->env );
-                        delete untyped;
                         untyped = choice.expr;
                         choice.expr = nullptr;
@@ -222 +230 @@
                 assertf( expr, "expected a non-null expression." );
 
-                static CastExpr untyped( nullptr ); // cast to void
+                auto untyped = new CastExpr{ expr }; // cast to void
 
                 // set up and resolve expression cast to void
-                untyped.arg = expr;
                 Alternative choice;
-                findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, true );
+                findUnfinishedKindExpression( untyped, choice, indexer, "", standardAlternativeFilter, true );
                 CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( choice.expr );
                 env = std::move( choice.env );
 
                 // clean up resolved expression
-                Expression * ret = castExpr->arg;
-                castExpr->arg = nullptr;
-
-                // unlink the arg so that it isn't deleted twice at the end of the program
-                untyped.arg = nullptr;
-                return ret;
+                return castExpr->arg;
         }
 
@@ -245 +247 @@
                 Expression * newExpr = resolveInVoidContext( untyped, indexer, env );
                 finishExpr( newExpr, env, untyped->env );
-                delete untyped;
                 untyped = newExpr;
         }
@@ -364 +365 @@
         }
 
-        void Resolver::previsit( StaticAssertDecl * assertDecl ) {
-                findIntegralExpression( assertDecl->condition, indexer );
-        }
-
         void Resolver::previsit( ExprStmt *exprStmt ) {
                 visit_children = false;
@@ -423 +420 @@
                         caseStmt->condition = castExpr->arg;
                         castExpr->arg = nullptr;
-                        delete castExpr;
                 }
         }
@@ -705 +701 @@
                 std::swap( initExpr->env, newExpr->env );
                 std::swap( initExpr->inferParams, newExpr->inferParams ) ;
-                delete initExpr;
 
                 // get the actual object's type (may not exactly match what comes back from the resolver due to conversions)
@@ -723 +718 @@
                                                         ce->set_arg( nullptr );
                                                         std::swap( ce->env, newExpr->env );
-                                                        delete ce;
                                                 }
                                         }
@@ -774 +768 @@
                 // could not find valid constructor, or found an intrinsic constructor
                 // fall back on C-style initializer
-                delete ctorInit->get_ctor();
-                ctorInit->set_ctor( NULL );
-                delete ctorInit->get_dtor();
-                ctorInit->set_dtor( NULL );
+                ctorInit->set_ctor( nullptr );
+                ctorInit->set_dtor( nullptr );
                 maybeAccept( ctorInit->get_init(), *visitor );
         }
@@ -803 +795 @@
 
                 // found a constructor - can get rid of C-style initializer
-                delete ctorInit->init;
                 ctorInit->init = nullptr;
 
@@ -810 +801 @@
                 // to clean up generated code.
                 if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) {
-                        delete ctorInit->ctor;
                         ctorInit->ctor = nullptr;
                 }
 
                 if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) {
-                        delete ctorInit->dtor;
                         ctorInit->dtor = nullptr;
                 }