Changeset 5b40f30 for src/InitTweak

Timestamp:

Mar 15, 2016, 3:16:53 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

dac0aa9

Parents:

972e6f7

Message:

generate correct empty list initializer, ensure function return value is not incorrectly destructed before it is returned, do not add src parameter to autogenerated routines when they take a single argument

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (2 diffs)
• RemoveInit.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -48 +48 @@
         }
 
-        // in the case where an object has an initializer and a polymorphic type, insert an assignment immediately after the
-        // declaration. This will (seemingly) cause the later phases to do the right thing with the assignment
         ObjectDecl *FixInit::mutate( ObjectDecl *objDecl ) {
                 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
@@ -79 +77 @@
                                 if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( exprStmt->get_expr() ) ) {
                                         if ( VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() ) ) {
+                                                // check for Intrinsic only - don't want to remove all overridable dtors because autogenerated dtor
+                                                // will call all member dtors, and some members may have a user defined dtor.
                                                 if ( function->get_var()->get_name() == "^?{}" && function->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
                                                         statements.erase(it++);

src/InitTweak/RemoveInit.cc

@@ -29 +29 @@
         namespace {
                 const std::list<Label> noLabels;
+                const std::list<Expression *> noDesignators;
         }
 
@@ -112 +113 @@
                 // hands off if the function returns an lvalue - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                // xxx - this should construct rather than assign
                 if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_isLvalue()  ) {
-                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, returnVals.front()->get_type()->clone(), 0 );
+                        // ensure return value is not destructed by explicitly creating
+                        // an empty SingleInit node wherein maybeConstruct is false
+                        ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, returnVals.front()->get_type()->clone(), new ListInit( std::list<Initializer*>(), noDesignators, false ) );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, newObj ) );
 
-                        UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                        assign->get_args().push_back( new AddressExpr (new NameExpr( newObj->get_name() ) ) );
-                        assign->get_args().push_back( returnStmt->get_expr() );
-                        stmtsToAdd.push_back(new ExprStmt(noLabels, assign));
+                        // and explicitly create the constructor expression separately
+                        UntypedExpr *construct = new UntypedExpr( new NameExpr( "?{}" ) );
+                        construct->get_args().push_back( new AddressExpr (new NameExpr( newObj->get_name() ) ) );
+                        construct->get_args().push_back( returnStmt->get_expr() );
+                        stmtsToAdd.push_back(new ExprStmt(noLabels, construct));
 
                         returnStmt->set_expr( new VariableExpr( newObj ) );