Changeset 1a59641 for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Jul 27, 2018, 2:41:34 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

6fa409e

Parents:

5a3e1f1

Message:

Fix open var handling in BF assn resolution; memory usage reasonable again

File:

• src/ResolvExpr/TypeEnvironment.cc (modified) (3 diffs)

src/ResolvExpr/TypeEnvironment.cc

@@ -36 +36 @@
 
 namespace ResolvExpr {
-        #if 0
+        #ifdef EXPENSIVE_ENV_VALIDATION
         #define PRE_POST_VALIDATE auto dbg = ValidateGuard{this, __func__};
         #define PRE_POST_VALIDATE_NOM auto dbg = ValidateGuard{this};
@@ -411 +411 @@
         }
 
-        bool TypeEnvironment::combine( const TypeEnvironment& o, const SymTab::Indexer& indexer ) {
+        bool TypeEnvironment::combine( const TypeEnvironment& o, OpenVarSet& openVars, 
+                        const SymTab::Indexer& indexer ) {
                 // short-circuit for empty cases
                 if ( o.isEmpty() ) return true;
@@ -657 +658 @@
                                 Type* common = nullptr;
                                 AssertionSet need, have;
-                                OpenVarSet openVars;
                                 if ( unifyInexact( ebound.type->clone(), nbound.type->clone(), *this, need, have, 
                                                 openVars, WidenMode{ ebound.allowWidening, nbound.allowWidening },