Ignore:
Timestamp:
May 11, 2017, 4:41:56 PM (5 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:
64bc131, edbdbe6
Parents:
c2d5e28
Message:

Fix for ubuntu 16.04

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/InitTweak/FixInit.cc

    rc2d5e28 r9738e74  
    668668                        stmtsToAdd.splice( stmtsToAdd.end(), fixer.stmtsToAdd );
    669669                        unqMap[unqExpr->get_id()] = unqExpr;
    670                         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() ] );
    672                         } else { // remember dtors for last instance of unique expr
    673                                 dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
    674                         }
    675670                        if ( UntypedExpr * deref = dynamic_cast< UntypedExpr * >( unqExpr->get_expr() ) ) {
     671                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
     672                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
     673                                } else { // remember dtors for last instance of unique expr
     674                                        dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
     675                                }
    676676                                // unique expression is now a dereference, because the inner expression is an lvalue returning function call.
    677677                                // Normalize the expression by dereferencing the unique expression, rather than the inner expression
Note: See TracChangeset for help on using the changeset viewer.