Changeset 5dbb9f3 for src/GenPoly/SpecializeNew.cpp

Timestamp:

Jun 16, 2023, 10:07:59 AM (17 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

0d31434

Parents:

d144c26 (diff), e172f42 (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

File:

• src/GenPoly/SpecializeNew.cpp (modified) (2 diffs)

src/GenPoly/SpecializeNew.cpp

@@ -113 +113 @@
         using namespace ResolvExpr;
         ast::OpenVarSet openVars, closedVars;
-        ast::AssertionSet need, have;
-        findOpenVars( formalType, openVars, closedVars, need, have, FirstClosed );
-        findOpenVars( actualType, openVars, closedVars, need, have, FirstOpen );
+        ast::AssertionSet need, have; // unused
+        ast::TypeEnvironment env; // unused
+        // findOpenVars( formalType, openVars, closedVars, need, have, FirstClosed );
+        findOpenVars( actualType, openVars, closedVars, need, have, env, FirstOpen );
         for ( const ast::OpenVarSet::value_type & openVar : openVars ) {
                 const ast::Type * boundType = subs->lookup( openVar.first );
@@ -125 +126 @@
                         if ( closedVars.find( *inst ) == closedVars.end() ) {
                                 return true;
+                        }
+                        else {
+                                assertf(false, "closed: %s", inst->name.c_str());
                         }
                 // Otherwise, the variable is bound to a concrete type.