Ignore:
Timestamp:
May 11, 2017, 10:08:07 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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:
f5abbd7
Parents:
3476a0d (diff), edbdbe6 (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 plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/InitTweak/FixInit.cc

    r3476a0d rce206b4  
    656656                                unqExpr->set_result( maybeClone( unqExpr->get_expr()->get_result() ) );
    657657                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
    658                                         stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
     658                                        stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
    659659                                }
    660660                                if ( addDeref.count( unqExpr->get_id() ) ) {
     
    669669                        unqMap[unqExpr->get_id()] = unqExpr;
    670670                        if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
    671                                 stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
     671                                stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
    672672                        } else { // remember dtors for last instance of unique expr
    673673                                dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
Note: See TracChangeset for help on using the changeset viewer.