Changeset f0743a7


Ignore:
Timestamp:
Nov 29, 2017, 4:33:51 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/AlternativeFinder.cc

    r6090518 rf0743a7  
    897897                // sum cost and accumulate actuals
    898898                std::list<Expression*>& args = appExpr->get_args();
    899                 Cost cost = Cost::zero;
     899                Cost cost = func.cost;
    900900                const ArgPack* pack = &result;
    901901                while ( pack->expr ) {
  • src/SynTree/Expression.cc

    r6090518 rf0743a7  
    356356        Type * res = member->get_type()->clone();
    357357        sub.apply( res );
    358         set_result( res );
    359         get_result()->set_lvalue( true );
     358        result = res;
     359        result->set_lvalue( true );
     360        result->get_qualifiers() |= aggregate->result->get_qualifiers();
    360361}
    361362
Note: See TracChangeset for help on using the changeset viewer.