Changeset 2f26687a for src/Tuples

Timestamp:

Mar 14, 2017, 3:17:20 PM (9 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, stuck-waitfor-destruct, with_gc

Children:

1fbab5a

Parents:

88d1066 (diff), 4da6a6c (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/Tuples

Files:

• TupleAssignment.cc (modified) (1 diff)
• TupleExpansion.cc (modified) (1 diff)

src/Tuples/TupleAssignment.cc

@@ -199 +199 @@
                                 Type * type = InitTweak::getPointerBase( castType );
                                 assert( type );
-                                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true);
+                                type->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
                                 type->set_isLvalue( true ); // xxx - might not need this
                                 expr = new CastExpr( expr, castType );

src/Tuples/TupleExpansion.cc

@@ -305 +305 @@
         Type * makeTupleType( const std::list< Expression * > & exprs ) {
                 // produce the TupleType which aggregates the types of the exprs
-                TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true) );
+                TupleType *tupleType = new TupleType( Type::Qualifiers(true, true, true, true, true, true) );
                 Type::Qualifiers &qualifiers = tupleType->get_qualifiers();
                 for ( Expression * expr : exprs ) {