Changeset 933f32f for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

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

src/ResolvExpr/TypeEnvironment.cc

@@ -386 +386 @@
         }
 
-        bool TypeEnvironment::bindVarToVar( TypeInstType *var1, TypeInstType *var2, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
+        bool TypeEnvironment::bindVarToVar( TypeInstType *var1, TypeInstType *var2, 
+                        TypeDecl::Data && data, AssertionSet &need, AssertionSet &have, 
+                        const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer ) {
 
                 auto class1 = internal_lookup( var1->get_name() );
@@ -428 +430 @@
                                         class1->set_type( common );
                                 }
+                                class1->data.isComplete |= data.isComplete;
                                 env.erase( class2 );
                         } else return false;
@@ -435 +438 @@
                                 class1->vars.insert( class2->vars.begin(), class2->vars.end() );
                                 class1->allowWidening = widen1;
+                                class1->data.isComplete |= data.isComplete;
                                 env.erase( class2 );
                         } else {
                                 class2->vars.insert( class1->vars.begin(), class1->vars.end() );
                                 class2->allowWidening = widen2;
+                                class2->data.isComplete |= data.isComplete;
                                 env.erase( class1 );
                         } // if
@@ -445 +450 @@
                         class1->vars.insert( var2->get_name() );
                         class1->allowWidening = widen1;
+                        class1->data.isComplete |= data.isComplete;
                 } else if ( class2 != env.end() ) {
                         // var1 unbound, add to class2
                         class2->vars.insert( var1->get_name() );
                         class2->allowWidening = widen2;
+                        class2->data.isComplete |= data.isComplete;
                 } else {
                         // neither var bound, create new class