Changeset edbdbe6

Timestamp:

May 11, 2017, 5:39:06 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

65aca88, ce206b4

Parents:

9738e74

Message:

fix splice to use the correct list

File:

• src/InitTweak/FixInit.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -656 +656 @@
                                 unqExpr->set_result( maybeClone( unqExpr->get_expr()->get_result() ) );
                                 if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
-                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                                        stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
                                 }
                                 if ( addDeref.count( unqExpr->get_id() ) ) {
@@ -668 +668 @@
                         stmtsToAdd.splice( stmtsToAdd.end(), fixer.stmtsToAdd );
                         unqMap[unqExpr->get_id()] = unqExpr;
+                        if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
+                                stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                        } else { // remember dtors for last instance of unique expr
+                                dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
+                        }
                         if ( UntypedExpr * deref = dynamic_cast< UntypedExpr * >( unqExpr->get_expr() ) ) {
-                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
-                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
-                                } else { // remember dtors for last instance of unique expr
-                                        dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
-                                }
                                 // unique expression is now a dereference, because the inner expression is an lvalue returning function call.
                                 // Normalize the expression by dereferencing the unique expression, rather than the inner expression