Changeset 8a930c03 for src/ResolvExpr/SatisfyAssertions.cpp

Timestamp:

Jun 12, 2023, 12:05:58 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

fec8bd1

Parents:

2b78949 (diff), 38e266ca (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/ResolvExpr/SatisfyAssertions.cpp (modified) (3 diffs)

src/ResolvExpr/SatisfyAssertions.cpp

@@ -215 +215 @@
                         findOpenVars( adjType, newOpen, closed, newNeed, have, FirstOpen );
                         if ( allowConversion ) {
-                                if ( auto c = commonType( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true}, sat.symtab ) ) {
+                                if ( auto c = commonType( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true} ) ) {
                                         // set up binding slot for recursive assertions
                                         ast::UniqueId crntResnSlot = 0;
@@ -229 +229 @@
                         }
                         else {
-                                if ( unifyExact( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true}, sat.symtab ) ) {
+                                if ( unifyExact( toType, adjType, newEnv, newNeed, have, newOpen, WidenMode {true, true} ) ) {
                                         // set up binding slot for recursive assertions
                                         ast::UniqueId crntResnSlot = 0;
@@ -392 +392 @@
                         mergeOpenVars( open, i.match.open );
 
-                        if ( ! env.combine( i.match.env, open, symtab ) ) return false;
+                        if ( ! env.combine( i.match.env, open ) ) return false;
 
                         crnt.emplace_back( i );