Changeset 216597d for src/ResolvExpr/Unify.cc

Timestamp:

Sep 10, 2019, 9:01:44 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

aced69a, c2051e10

Parents:

0bf5340 (diff), 3ce2425 (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/Unify.cc (modified) (4 diffs)

src/ResolvExpr/Unify.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 43
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Sep  4 10:00:00 2019
+// Update Count     : 44
 //
 
@@ -278 +278 @@
 #endif
                         if ( ( common = commonType( type1, type2, widen.first, widen.second, indexer, env, openVars ) ) ) {
-                                common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
 #ifdef DEBUG
                                 std::cerr << "unifyInexact: common type is ";
@@ -295 +295 @@
                                 if ( ( tq1 > tq2 || widen.first ) && ( tq2 > tq1 || widen.second ) ) {
                                         common = type1->clone();
-                                        common->get_qualifiers() = tq1 | tq2;
+                                        common->tq = tq1.unify( tq2 );
                                         result = true;
                                 } else {
@@ -302 +302 @@
                         } else {
                                 common = type1->clone();
-                                common->get_qualifiers() = tq1 | tq2;
+                                common->tq = tq1.unify( tq2 );
                                 result = true;
                         } // if