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

File:

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

src/InitTweak/FixInit.cc

@@ -361 +361 @@
                                         FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
                                         assert( ftype );
-                                        if ( (isConstructor( funcDecl->get_name() ) || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) {
+                                        if ( isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
                                                 Type * t1 = ftype->get_parameters().front()->get_type();
                                                 Type * t2 = ftype->get_parameters().back()->get_type();
@@ -367 +367 @@
 
                                                 if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
-                                                        // optimization: don't need to copy construct in order to call a copy constructor or
-                                                        // assignment operator
+                                                        // optimization: don't need to copy construct in order to call a copy constructor
                                                         return appExpr;
                                                 } // if
@@ -636 +635 @@
                                 assert( ! stmtExpr->get_returnDecls().empty() );
                                 body->get_kids().push_back( new ExprStmt( noLabels, new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
-                        }
-                        stmtExpr->get_returnDecls().clear();
-                        stmtExpr->get_dtors().clear();
+                                stmtExpr->get_returnDecls().clear();
+                                stmtExpr->get_dtors().clear();
+                        }
+                        assert( stmtExpr->get_returnDecls().empty() );
+                        assert( stmtExpr->get_dtors().empty() );
                         return stmtExpr;
                 }
@@ -655 +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() ) ) {
@@ -667 +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() ) ) {
                                 // unique expression is now a dereference, because the inner expression is an lvalue returning function call.
@@ -675 +681 @@
                                 getCallArg( deref, 0 ) = unqExpr;
                                 addDeref.insert( unqExpr->get_id() );
-                                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;
-                                }
                                 return deref;
                         }