Ignore:
Timestamp:
Aug 23, 2016, 10:30:02 AM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
f39096c
Parents:
837a17c (diff), bd9f8be (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

Conflicts:

src/SynTree/Expression.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/CodeGen/CodeGenerator.cc

    r837a17c rdadc1b5  
    311311                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
    312312                                                        assert( type );
    313                                                         newExpr->get_results().push_back( type );
     313                                                        newExpr->get_results().push_back( type->clone() );
    314314                                                        *arg = newExpr;
    315315                                                } // if
Note: See TracChangeset for help on using the changeset viewer.