Changeset f232977

Timestamp:

Oct 19, 2017, 11:15:35 AM (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:

b93a3de

Parents:

150ec33

git-author:

Rob Schluntz <rschlunt@…> (10/13/17 16:05:16)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:35)

Message:

Refactor assignment return autogen code

File:

• src/SymTab/Autogen.cc (modified) (5 diffs)

src/SymTab/Autogen.cc ¶

@@ -295 +295 @@
                 for ( FunctionDecl * dcl : newFuncs ) {
                         genFuncBody( dcl );
+                        if ( CodeGen::isAssignment( dcl->name ) ) {
+                                // assignment needs to return a value
+                                FunctionType * assignType = dcl->type;
+                                assert( assignType->parameters.size() == 2 );
+                                assert( assignType->returnVals.size() == 1 );
+                                ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.front() );
+                                dcl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( dstParam ) ) );
+                        }
                         resolve( dcl );
                 }
@@ -349 +357 @@
                 } else {
                         makeFunctionBody( aggregateDecl->members.rbegin(), aggregateDecl->members.rend(), dcl, false );
-                }
-                if ( CodeGen::isAssignment( dcl->name ) ) {
-                        // assignment needs to return a value
-                        FunctionType * assignType = dcl->type;
-                        assert( assignType->parameters.size() == 2 );
-                        assert( assignType->returnVals.size() == 1 );
-                        ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.back() );
-                        ObjectDecl * retParam = strict_dynamic_cast< ObjectDecl * >( assignType->returnVals.front() );
-
-                        dcl->statements->push_back( new ExprStmt( noLabels, new UntypedExpr( new NameExpr("?{}"), { new VariableExpr( retParam ), new VariableExpr( srcParam ) } ) ) );
-                        dcl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( retParam ) ) );
                 }
         }
@@ -483 +480 @@
                         ObjectDecl * dstParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.front() );
                         ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( ftype->parameters.back() );
-
                         makeMemberOp( srcParam, dstParam, back_inserter( funcDecl->statements->kids ) );
-                        if ( CodeGen::isAssignment( funcDecl->name ) ) {
-                                // also generate return statement in assignment
-                                funcDecl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
-                        }
                 } else {
                         // default ctor/dtor body is empty - add unused attribute to parameter to silence warnings
@@ -551 +543 @@
                         callExpr->get_args().push_back( new VariableExpr( srcParam ) );
                         funcDecl->statements->push_back( new ExprStmt( noLabels, callExpr ) );
-                        if ( CodeGen::isAssignment( funcDecl->name ) ) {
-                                // also generate return statement in assignment
-                                funcDecl->statements->push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
-                        }
                 } else {
                         // default ctor/dtor body is empty - add unused attribute to parameter to silence warnings
@@ -580 +568 @@
                 if ( src ) expr->args.push_back( new CastExpr( new VariableExpr( src ), typeDecl->base->clone() ) );
                 dcl->statements->kids.push_back( new ExprStmt( noLabels, expr ) );
-                if ( CodeGen::isAssignment( dcl->get_name() ) ) {
-                        // assignment needs to return a value
-                        FunctionType * assignType = dcl->type;
-                        assert( assignType->parameters.size() == 2 );
-                        ObjectDecl * srcParam = strict_dynamic_cast< ObjectDecl * >( assignType->parameters.back() );
-                        dcl->statements->kids.push_back( new ReturnStmt( noLabels, new VariableExpr( srcParam ) ) );
-                }
         };