Changeset 3f7e12cb for src/SymTab/Validate.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/SymTab/Validate.cc

@@ -56 +56 @@
 #include "FixFunction.h"               // for FixFunction
 #include "Indexer.h"                   // for Indexer
+#include "InitTweak/GenInit.h"         // for fixReturnStatements
 #include "InitTweak/InitTweak.h"       // for isCtorDtorAssign
 #include "Parser/LinkageSpec.h"        // for C
@@ -150 +151 @@
         /// Replaces array and function types in forall lists by appropriate pointer type and assigns each Object and Function declaration a unique ID.
         struct ForallPointerDecay final {
-                void previsit( ObjectDecl *object );
-                void previsit( FunctionDecl *func );
+                void previsit( ObjectDecl * object );
+                void previsit( FunctionDecl * func );
+                void previsit( StructDecl * aggrDecl );
+                void previsit( UnionDecl * aggrDecl );
         };
 
@@ -265 +268 @@
                 HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
+                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist; before LinkReferenceToTypes because it is an indexer and needs correct types for mangling
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
                 acceptAll( translationUnit, genericParams );  // check as early as possible - can't happen before LinkReferenceToTypes
-                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 );
         }
@@ -368 +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;
@@ -382 +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
@@ -579 +583 @@
 
         /// Fix up assertions - flattens assertion lists, removing all trait instances
-        void forallFixer( Type * func ) {
-                for ( TypeDecl * type : func->get_forall() ) {
+        void forallFixer( std::list< TypeDecl * > & forall, BaseSyntaxNode * node ) {
+                for ( TypeDecl * type : forall ) {
                         std::list< DeclarationWithType * > asserts;
                         asserts.splice( asserts.end(), type->assertions );
@@ -596 +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() ) {
-                                        throw SemanticError( "invalid type void in assertion of function ", func );
+                                if ( fixer.pass.isVoid ) {
+                                        throw SemanticError( "invalid type void in assertion of function ", node );
                                 } // if
                         } // for
@@ -607 +611 @@
 
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
-                forallFixer( object->get_type() );
-                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->get_type() ) ) {
-                        forallFixer( pointer->get_base() );
+                forallFixer( object->type->forall, object );
+                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->type ) ) {
+                        forallFixer( pointer->base->forall, object );
                 } // if
                 object->fixUniqueId();
@@ -615 +619 @@
 
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
-                forallFixer( func->get_type() );
+                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 );
         }
 
@@ -656 +668 @@
                 }
                 filter( translationUnit, isTypedef, true );
-
         }
 
@@ -664 +675 @@
                 TypedefMap::const_iterator def = typedefNames.find( typeInst->get_name() );
                 if ( def != typedefNames.end() ) {
-                        Type *ret = def->second.first->get_base()->clone();
+                        Type *ret = def->second.first->base->clone();
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
                         // place instance parameters on the typedef'd type
-                        if ( ! typeInst->get_parameters().empty() ) {
+                        if ( ! typeInst->parameters.empty() ) {
                                 ReferenceToType *rtt = dynamic_cast<ReferenceToType*>(ret);
                                 if ( ! rtt ) {
-                                        throw SemanticError("cannot apply type parameters to base type of " + typeInst->get_name());
+                                        throw SemanticError("Cannot apply type parameters to base type of " + typeInst->name);
                                 }
                                 rtt->get_parameters().clear();
-                                cloneAll( typeInst->get_parameters(), rtt->get_parameters() );
-                                mutateAll( rtt->get_parameters(), *visitor );  // recursively fix typedefs on parameters
+                                cloneAll( typeInst->parameters, rtt->parameters );
+                                mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
                         } // if
                         delete typeInst;
@@ -680 +691 @@
                 } else {
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->get_name().c_str() );
+                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->name.c_str() );
                         typeInst->set_baseType( base->second );
                 } // if
                 return typeInst;
+        }
+
+        struct VarLenChecker : WithShortCircuiting {
+                void previsit( FunctionType * ) { visit_children = false; }
+                void previsit( ArrayType * at ) {
+                        isVarLen |= at->isVarLen;
+                }
+                bool isVarLen = false;
+        };
+
+        bool isVariableLength( Type * t ) {
+                PassVisitor<VarLenChecker> varLenChecker;
+                maybeAccept( t, varLenChecker );
+                return varLenChecker.pass.isVarLen;
         }
 
@@ -694 +719 @@
                         Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
                         if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
-                                throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
+                                throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
+                        }
+                        // cannot redefine VLA typedefs
+                        if ( isVariableLength( t1 ) || isVariableLength( t2 ) ) {
+                                throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
                         }
                 } else {