Changes in src/InitTweak/FixInit.cc [0661678:edbdbe6]

File:

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

src/InitTweak/FixInit.cc

@@ -619 +619 @@
 
                 Expression * FixCopyCtors::mutate( StmtExpr * stmtExpr ) {
-                        // function call temporaries should be placed at statement-level, rather than nested inside of a new statement expression,
-                        // since temporaries can be shared across sub-expressions, e.g.
-                        //   [A, A] f();
-                        //   g([A] x, [A] y);
-                        //   f(g());
-                        // f is executed once, so the return temporary is shared across the tuple constructors for x and y.
-                        std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                        for ( Statement *& stmt : stmts ) {
-                                stmt = stmt->acceptMutator( *this );
-                        } // for
-                        // stmtExpr = safe_dynamic_cast< StmtExpr * >( Parent::mutate( stmtExpr ) );
+                        stmtExpr = safe_dynamic_cast< StmtExpr * >( Parent::mutate( stmtExpr ) );
                         assert( stmtExpr->get_result() );
                         Type * result = stmtExpr->get_result();
@@ -896 +886 @@
                         Parent::visit( compoundStmt );
 
-                        // add destructors for the current scope that we're exiting, unless the last statement is a return, which
-                        // causes unreachable code warnings
+                        // add destructors for the current scope that we're exiting
                         std::list< Statement * > & statements = compoundStmt->get_kids();
-                        if ( ! statements.empty() && ! dynamic_cast< ReturnStmt * >( statements.back() ) ) {
-                                insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
-                        }
+                        insertDtors( reverseDeclOrder.front().begin(), reverseDeclOrder.front().end(), back_inserter( statements ) );
                         reverseDeclOrder.pop_front();
                 }