Changes in / [fae2cf8:9ff8310]

Location:

src

Files:

• CodeGen/GenType.cc (modified) (2 diffs)
• InitTweak/FixInit.cc (modified) (1 diff)

src/CodeGen/GenType.cc

@@ -237 +237 @@
         void GenType::visit( TupleType * tupleType ) {
                 assertf( ! genC, "Tuple types should not reach code generation." );
+                Visitor::visit( tupleType );
                 unsigned int i = 0;
                 std::ostringstream os;
@@ -244 +245 @@
                         os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
                 }
-                os << "] ";
+                os << "]";
                 typeString = os.str() + typeString;
         }

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();