Changeset 7641b6c

Timestamp:

Dec 18, 2017, 2:14:26 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:

b8b075cd

Parents:

9058414

Message:

Run ResolveCopyCtors? on StmtExpr? generated as part of a TupleAssignExpr? to generate result temporary and ctor/dtor

File:

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

src/InitTweak/FixInit.cc ¶

@@ -382 +382 @@
                         } // if
                         delete stmt;
+                        if ( TupleAssignExpr * assign = dynamic_cast< TupleAssignExpr * >( resolved ) ) {
+                                // fix newly generated StmtExpr
+                                postvisit( assign->stmtExpr );
+                        }
                         return resolved;
                 }
@@ -479 +483 @@
                                 env->apply( result );
                                 ObjectDecl * ret = ObjectDecl::newObject( retNamer.newName(), result, nullptr );
-                                ret->get_type()->set_const( false );
-                                stmtExpr->get_returnDecls().push_front( ret );
+                                ret->type->set_const( false );
+                                stmtExpr->returnDecls.push_front( ret );
 
                                 // must have a non-empty body, otherwise it wouldn't have a result
-                                CompoundStmt * body = stmtExpr->get_statements();
+                                CompoundStmt * body = stmtExpr->statements;
                                 assert( ! body->get_kids().empty() );
                                 // must be an ExprStmt, otherwise it wouldn't have a result
                                 ExprStmt * last = strict_dynamic_cast< ExprStmt * >( body->get_kids().back() );
-                                last->set_expr( makeCtorDtor( "?{}", ret, last->get_expr() ) );
-
-                                stmtExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                                last->expr = makeCtorDtor( "?{}", ret, last->get_expr() );
+
+                                stmtExpr->dtors.push_front( makeCtorDtor( "^?{}", ret ) );
                         } // if
                 }
@@ -606 +610 @@
                                 // must have a non-empty body, otherwise it wouldn't have a result
                                 assert( ! stmts.empty() );
-                                assert( ! stmtExpr->get_returnDecls().empty() );
+                                assertf( ! stmtExpr->get_returnDecls().empty(), "StmtExpr returns non-void, but no return decls: %s", toString( stmtExpr ).c_str() );
                                 stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
                                 stmtExpr->get_returnDecls().clear();