Changeset f0743a7

Timestamp:

Nov 29, 2017, 4:33:51 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

dd9b59e

Parents:

6090518 (diff), 389528b0 (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

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -897 +897 @@
                 // sum cost and accumulate actuals
                 std::list<Expression*>& args = appExpr->get_args();
-                Cost cost = Cost::zero;
+                Cost cost = func.cost;
                 const ArgPack* pack = &result;
                 while ( pack->expr ) {

src/SynTree/Expression.cc

@@ -356 +356 @@
         Type * res = member->get_type()->clone();
         sub.apply( res );
-        set_result( res );
-        get_result()->set_lvalue( true );
+        result = res;
+        result->set_lvalue( true );
+        result->get_qualifiers() |= aggregate->result->get_qualifiers();
 }