Changeset 6840e7c for src/SymTab/Validate.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

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