Changeset 2efe4b8 for src/ResolvExpr/Resolver.cc

Timestamp:

Apr 25, 2018, 3:42:34 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

1cdfa82

Parents:

5af7306

Message:

Assorted GC bugfixes

File:

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

src/ResolvExpr/Resolver.cc

@@ -148 +148 @@
                         assertf( untyped, "expected a non-null expression." );
 
-                        new_generation();  // set up GC young generation for this top-level expression
+                        auto guard = new_generation();  // set up GC generation for this top-level expression
 
                         TypeEnvironment env;
@@ -177 +177 @@
                         findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) );
                         if ( winners.size() == 0 ) {
-                                collect_young();
                                 SemanticError( untyped, toString( 
                                         "No reasonable alternatives for ", kindStr, (kindStr != "" ? " " : ""), 
@@ -189 +188 @@
                                 printAlts( winners, stream, 1 );
                                 
-                                collect_young();
                                 SemanticError( untyped->location, stream.str() );
                         }
@@ -196 +194 @@
                         Alternative & choice = winners.front();
                         if ( findDeletedExpr( choice.expr ) ) {
-                                collect_young( choice.expr );
+                                trace( choice.expr );
                                 SemanticError( choice.expr, 
                                         "Unique best alternative includes deleted identifier in " );
                         }
                         alt = std::move( choice );
-                        collect_young( alt );
+                        trace( alt );
                 }