Changes in src/SymTab/Validate.cc [bd7e609:60c3b06c]

File:

• src/SymTab/Validate.cc (modified) (6 diffs)

src/SymTab/Validate.cc

@@ -153 +153 @@
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
-                void previsit( StructDecl * aggrDecl );
-                void previsit( UnionDecl * aggrDecl );
         };
 
@@ -272 +270 @@
                 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 );
                 ArrayLength::computeLength( translationUnit );
-                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
+                acceptAll( translationUnit, finder );
                 mutateAll( translationUnit, labelAddrFixer );
         }
@@ -372 +369 @@
                         DWTIterator begin( dwts.begin() ), end( dwts.end() );
                         if ( begin == end ) return;
-                        PassVisitor<FixFunction> fixer;
+                        FixFunction fixer;
                         DWTIterator i = begin;
                         *i = (*i)->acceptMutator( fixer );
-                        if ( fixer.pass.isVoid ) {
+                        if ( fixer.get_isVoid() ) {
                                 DWTIterator j = i;
                                 ++i;
@@ -386 +383 @@
                                 ++i;
                                 for ( ; i != end; ++i ) {
-                                        PassVisitor<FixFunction> fixer;
+                                        FixFunction fixer;
                                         *i = (*i)->acceptMutator( fixer );
-                                        if ( fixer.pass.isVoid ) {
+                                        if ( fixer.get_isVoid() ) {
                                                 throw SemanticError( "invalid type void in function type ", func );
                                         } // if
@@ -600 +597 @@
                         // apply FixFunction to every assertion to check for invalid void type
                         for ( DeclarationWithType *& assertion : type->assertions ) {
-                                PassVisitor<FixFunction> fixer;
+                                FixFunction fixer;
                                 assertion = assertion->acceptMutator( fixer );
-                                if ( fixer.pass.isVoid ) {
+                                if ( fixer.get_isVoid() ) {
                                         throw SemanticError( "invalid type void in assertion of function ", node );
                                 } // if
@@ -621 +618 @@
                 forallFixer( func->type->forall, func );
                 func->fixUniqueId();
-        }
-
-        void ForallPointerDecay::previsit( StructDecl * aggrDecl ) {
-                forallFixer( aggrDecl->parameters, aggrDecl );
-        }
-
-        void ForallPointerDecay::previsit( UnionDecl * aggrDecl ) {
-                forallFixer( aggrDecl->parameters, aggrDecl );
         }