Changeset bd7e609

Timestamp:

Oct 19, 2017, 11:13:11 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:

189d800

Parents:

6137fbb

git-author:

Rob Schluntz <rschlunt@…> (10/11/17 16:04:22)

git-committer:

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

Message:

Make ReturnFixer? idempotent and rearrange passes in Validate in anticipation of autogen changes

Location:

src

Files:

• InitTweak/GenInit.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (3 diffs)

src/InitTweak/GenInit.cc

@@ -129 +129 @@
                 // hands off if the function returns a reference - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && isConstructable( returnVals.front()->get_type() ) ) {
+                if ( returnStmt->expr && returnVals.size() == 1 && isConstructable( returnVals.front()->get_type() ) ) {
                         // explicitly construct the return value using the return expression and the retVal object
                         assertf( returnVals.front()->get_name() != "", "Function %s has unnamed return value\n", funcName.c_str() );
 
-                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", dynamic_cast< ObjectDecl *>( returnVals.front() ), returnStmt->get_expr() ) );
+                        ObjectDecl * retVal = strict_dynamic_cast< ObjectDecl * >( returnVals.front() );
+                        if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( returnStmt->expr ) ) {
+                                // return statement has already been mutated - don't need to do it again
+                                if ( varExpr->var == retVal ) return;
+                        }
+                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", retVal, returnStmt->get_expr() ) );
 
                         // return the retVal object

src/SymTab/Validate.cc

@@ -153 +153 @@
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
+                void previsit( StructDecl * aggrDecl );
+                void previsit( UnionDecl * aggrDecl );
         };
 
@@ -270 +272 @@
                 acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist
                 VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
+                ReturnChecker::checkFunctionReturns( translationUnit );
+                InitTweak::fixReturnStatements( translationUnit ); // must happen before autogen
                 Concurrency::applyKeywords( translationUnit );
+                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
                 Concurrency::implementMutexFuncs( translationUnit );
                 Concurrency::implementThreadStarter( translationUnit );
-                ReturnChecker::checkFunctionReturns( translationUnit );
                 mutateAll( translationUnit, compoundliteral );
-                acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines
                 ArrayLength::computeLength( translationUnit );
-                acceptAll( translationUnit, finder );
+                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                 mutateAll( translationUnit, labelAddrFixer );
         }
@@ -620 +623 @@
         }
 
+        void ForallPointerDecay::previsit( StructDecl * aggrDecl ) {
+                forallFixer( aggrDecl->parameters, aggrDecl );
+        }
+
+        void ForallPointerDecay::previsit( UnionDecl * aggrDecl ) {
+                forallFixer( aggrDecl->parameters, aggrDecl );
+        }
+
         void ReturnChecker::checkFunctionReturns( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ReturnChecker> checker;