Changeset 6dfa2e1

Timestamp:

Dec 22, 2017, 1:49:14 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:

05a0ff2

Parents:

9fe33947

Message:

Do not attempt to construct/destruct StmtExprs? of non-constructable types

File:

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

src/InitTweak/FixInit.cc

@@ -480 +480 @@
                                 static UniqueName retNamer("_tmp_stmtexpr_ret");
 
-                                // create variable that will hold the result of the stmt expr
                                 result = result->clone();
                                 env->apply( result );
+                                if ( ! InitTweak::isConstructable( result ) ) {
+                                        delete result;
+                                        return;
+                                }
+
+                                // create variable that will hold the result of the stmt expr
                                 ObjectDecl * ret = ObjectDecl::newObject( retNamer.newName(), result, nullptr );
                                 ret->type->set_const( false );
@@ -611 +616 @@
                                 // must have a non-empty body, otherwise it wouldn't have a result
                                 assert( ! stmts.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->returnDecls.front() ) ) );
+                                assertf( ! stmtExpr->returnDecls.empty() || stmtExpr->dtors.empty(), "StmtExpr returns non-void, but no return decls: %s", toString( stmtExpr ).c_str() );
+                                // if there is a return decl, add a use as the last statement; will not have return decl on non-constructable returns
+                                if ( ! stmtExpr->returnDecls.empty() ) {
+                                        stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->returnDecls.front() ) ) );
+                                }
                                 stmtExpr->returnDecls.clear();
                                 stmtExpr->dtors.clear();