Changeset 65aca88

Timestamp:

May 12, 2017, 4:49:38 PM (7 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:

ce8c12f, fae2cf8

Parents:

edbdbe6

Message:

fix destruction of tuple-typed argument temporaries

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;
@@ -245 +244 @@
                         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 ) {
-                        stmtExpr = safe_dynamic_cast< StmtExpr * >( Parent::mutate( 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 ) );
                         assert( stmtExpr->get_result() );
                         Type * result = stmtExpr->get_result();