Changeset 946bcca for src/ResolvExpr

Timestamp:

Mar 17, 2017, 1:14:44 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

14a33790, 7c70089, 89d129c

Parents:

b2f5082 (diff), 615a096 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• CommonType.cc (modified) (10 diffs)
• Unify.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 17:02:51 2016
-// Update Count     : 29
+// Last Modified On : Fri Mar 17 09:14:17 2017
+// Update Count     : 30
 //
 
@@ -772 +772 @@
         bool isLvalue( Expression *expr ) {
                 // xxx - recurse into tuples?
-                return expr->has_result() && expr->get_result()->get_isLvalue();
+                return expr->has_result() && expr->get_result()->get_lvalue();
         }
 

src/ResolvExpr/CommonType.cc ¶

@@ -10 +10 @@
 // Created On       : Sun May 17 06:59:27 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:35:34 2016
-// Update Count     : 3
+// Last Modified On : Thu Mar 16 16:24:31 2017
+// Update Count     : 7
 //
 
@@ -71 +71 @@
                                                         if ( unifyExact( type1, type->get_base(), env, have, need, newOpen, indexer ) ) {
                                                                 result = type1->clone();
-                                                                result->get_qualifiers() = tq1 + tq2;
+                                                                result->get_qualifiers() = tq1 | tq2;
                                                         } // if
                                                         type1->get_qualifiers() = tq1;
@@ -133 +133 @@
                         BasicType::Kind newType = combinedType[ basicType->get_kind() ][ otherBasic->get_kind() ];
                         if ( ( ( newType == basicType->get_kind() && basicType->get_qualifiers() >= otherBasic->get_qualifiers() ) || widenFirst ) && ( ( newType == otherBasic->get_kind() && basicType->get_qualifiers() <= otherBasic->get_qualifiers() ) || widenSecond ) ) {
-                                result = new BasicType( basicType->get_qualifiers() + otherBasic->get_qualifiers(), newType );
+                                result = new BasicType( basicType->get_qualifiers() | otherBasic->get_qualifiers(), newType );
                         } // if
                 } else if ( dynamic_cast< EnumInstType * > ( type2 ) || dynamic_cast< ZeroType* >( type2 ) || dynamic_cast< OneType* >( type2 ) ) {
@@ -139 +139 @@
                         BasicType::Kind newType = combinedType[ basicType->get_kind() ][ BasicType::SignedInt ];
                         if ( ( ( newType == basicType->get_kind() && basicType->get_qualifiers() >= type2->get_qualifiers() ) || widenFirst ) && ( ( newType != basicType->get_kind() && basicType->get_qualifiers() <= type2->get_qualifiers() ) || widenSecond ) ) {
-                                result = new BasicType( basicType->get_qualifiers() + type2->get_qualifiers(), newType );
+                                result = new BasicType( basicType->get_qualifiers() | type2->get_qualifiers(), newType );
                         } // if
                 } // if
@@ -154 +154 @@
                 }
                 result = voidPointer->clone();
-                result->get_qualifiers() += otherPointer->get_qualifiers();
+                result->get_qualifiers() |= otherPointer->get_qualifiers();
         }
 
@@ -176 +176 @@
                                                 result = otherPointer->clone();
                                         } // if
-                                        result->get_qualifiers() = tq1 + tq2;
+                                        result->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cout << "place for ptr-to-type" << std::endl;
@@ -185 +185 @@
                 } else if ( widenSecond && dynamic_cast< ZeroType* >( type2 ) ) {
                         result = pointerType->clone();
-                        result->get_qualifiers() += type2->get_qualifiers();
+                        result->get_qualifiers() |= type2->get_qualifiers();
                 } // if
         }
@@ -230 +230 @@
                                         if ( unifyExact( type->get_base(), type2, env, have, need, newOpen, indexer ) ) {
                                                 result = type2->clone();
-                                                result->get_qualifiers() = tq1 + tq2;
+                                                result->get_qualifiers() = tq1 | tq2;
                                         } // if
                                         type2->get_qualifiers() = tq2;
@@ -250 +250 @@
                                 if ( widenSecond || zeroType->get_qualifiers() <= type2->get_qualifiers() ) {
                                         result = type2->clone();
-                                        result->get_qualifiers() += zeroType->get_qualifiers();
+                                        result->get_qualifiers() |= zeroType->get_qualifiers();
                                 }
                         } else if ( widenSecond && dynamic_cast< OneType* >( type2 ) ) {
                                 result = new BasicType( zeroType->get_qualifiers(), BasicType::SignedInt );
-                                result->get_qualifiers() += type2->get_qualifiers();
+                                result->get_qualifiers() |= type2->get_qualifiers();
                         }
                 }
@@ -264 +264 @@
                                 if ( widenSecond || oneType->get_qualifiers() <= type2->get_qualifiers() ) {
                                         result = type2->clone();
-                                        result->get_qualifiers() += oneType->get_qualifiers();
+                                        result->get_qualifiers() |= oneType->get_qualifiers();
                                 }
                         } else if ( widenSecond && dynamic_cast< ZeroType* >( type2 ) ) {
                                 result = new BasicType( oneType->get_qualifiers(), BasicType::SignedInt );
-                                result->get_qualifiers() += type2->get_qualifiers();
+                                result->get_qualifiers() |= type2->get_qualifiers();
                         }
                 }

src/ResolvExpr/Unify.cc ¶

@@ -10 +10 @@
 // Created On       : Sun May 17 12:27:10 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:59:59 2017
-// Update Count     : 40
+// Last Modified On : Thu Mar 16 16:22:54 2017
+// Update Count     : 42
 //
 
@@ -353 +353 @@
 #endif
                         if ( ( common = commonType( type1, type2, widenMode.widenFirst, widenMode.widenSecond, indexer, env, openVars ) ) ) {
-                                common->get_qualifiers() = tq1 + tq2;
+                                common->get_qualifiers() = tq1 | tq2;
 #ifdef DEBUG
                                 std::cerr << "unifyInexact: common type is ";
@@ -370 +370 @@
                                 if ( ( tq1 > tq2 || widenMode.widenFirst ) && ( tq2 > tq1 || widenMode.widenSecond ) ) {
                                         common = type1->clone();
-                                        common->get_qualifiers() = tq1 + tq2;
+                                        common->get_qualifiers() = tq1 | tq2;
                                         result = true;
                                 } else {