Changeset 4ffdd63 for src/InitTweak

Timestamp:

Apr 27, 2016, 5:16:22 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:

21ae786

Parents:

c2ce2350

Message:

change FixCopyCtors? to insert comma expressions and UntypedExpr? assignments rather than changing the location of the argument. Remove copyCtors list from ImplicitCopyCtorExpr?

File:

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

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 14:57:13 2016
+// Last Modified On : Wed Apr 27 17:08:44 2016
 // Update Count     : 30
 //
@@ -216 +216 @@
                         if ( function->get_var()->get_linkage() != LinkageSpec::Intrinsic ) {
                                 // replace argument to function call with temporary
-                                arg = new VariableExpr( tmp );
+                                arg = new CommaExpr( cpCtor, new VariableExpr( tmp ) );
                                 impCpCtorExpr->get_tempDecls().push_back( tmp );
-                                impCpCtorExpr->get_copyCtors().push_back( cpCtor );
                                 impCpCtorExpr->get_dtors().push_front( makeCtorDtor( "^?{}", tmp ) );
                         }
@@ -232 +231 @@
                 callExpr->set_env( impCpCtorExpr->get_env()->clone() );
                 for ( Type * result : appExpr->get_results() ) {
-                        ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), new SingleInit( callExpr ) );
+                        ObjectDecl * ret = new ObjectDecl( retNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, 0, result->clone(), 0 );
                         ret->get_type()->set_isConst( false );
                         impCpCtorExpr->get_returnDecls().push_back( ret );
@@ -249 +248 @@
                 assert( impCpCtorExpr );
 
-                std::list< Expression * > & copyCtors = impCpCtorExpr->get_copyCtors();
                 std::list< ObjectDecl * > & tempDecls = impCpCtorExpr->get_tempDecls();
                 std::list< ObjectDecl * > & returnDecls = impCpCtorExpr->get_returnDecls();
@@ -256 +254 @@
                 // add all temporary declarations and their constructors
                 for ( ObjectDecl * obj : tempDecls ) {
-                        assert( ! copyCtors.empty() );
                         stmtsToAdd.push_back( new DeclStmt( noLabels, obj ) );
-                        stmtsToAdd.push_back( new ExprStmt( noLabels, copyCtors.front() ) );
-                        copyCtors.pop_front();
+                }
+                for ( ObjectDecl * obj : returnDecls ) {
+                        stmtsToAdd.push_back( new DeclStmt( noLabels, obj ) );
                 }
 
@@ -274 +272 @@
 
                 // xxx - some of these aren't necessary, and can be removed once this is stable
-                copyCtors.clear();
                 dtors.clear();
                 tempDecls.clear();
@@ -282 +279 @@
 
                 if ( returnDecl ) {
-                        // call is currently attached to first returnDecl
-                        stmtsToAdd.push_back( new DeclStmt( noLabels, returnDecl ) );
-                        return new VariableExpr( returnDecl );
+                        UntypedExpr * assign = new UntypedExpr( new NameExpr( "?=?" ) );
+                        assign->get_args().push_back( new VariableExpr( returnDecl ) );
+                        assign->get_args().push_back( callExpr );
+                        // know the result type of the assignment is the type of the LHS (minus the pointer), so
+                        // add that onto the assignment expression so that later steps have the necessary information
+                        assign->add_result( returnDecl->get_type()->clone() );
+                        // return new CommaExpr( assign, new VariableExpr( returnDecl ) );
+                        return assign;
                 } else {
-                        // add call expression - if no return values, can call directly
-                        assert( callExpr );
                         return callExpr;
                 }