Changeset 4ee1efb for src/SymTab

Timestamp:

Oct 26, 2017, 11:23:26 AM (7 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:

136ccd7

Parents:

0b9be4d (diff), 598f50e (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.

git-author:

Rob Schluntz <rschlunt@…> (10/26/17 10:43:08)

git-committer:

Rob Schluntz <rschlunt@…> (10/26/17 11:23:26)

Message:

Merge branch 'fix-missing-cast-warning' into cleanup-dtors

Location:

src/SymTab

Files:

• Autogen.cc (modified) (1 diff)
• FixFunction.cc (modified) (1 diff)
• FixFunction.h (modified) (1 diff)
• Validate.cc (modified) (4 diffs)

src/SymTab/Autogen.cc

@@ -314 +314 @@
         void FuncGenerator::generatePrototypes( std::list< FunctionDecl * > & newFuncs ) {
                 bool concurrent_type = isConcurrentType();
-                for ( const FuncData & data : data ) {
+                for ( const FuncData & d : data ) {
                         // generate a function (?{}, ?=?, ^?{}) based on the current FuncData.
-                        FunctionType * ftype = data.genType( type, true );
+                        FunctionType * ftype = d.genType( type, true );
 
                         // destructor for concurrent type must be mutex
-                        if ( concurrent_type && CodeGen::isDestructor( data.fname ) ) {
+                        if ( concurrent_type && CodeGen::isDestructor( d.fname ) ) {
                                 ftype->parameters.front()->get_type()->set_mutex( true );
                         }
 
-                        newFuncs.push_back( genFunc( data.fname, ftype, functionNesting ) );
+                        newFuncs.push_back( genFunc( d.fname, ftype, functionNesting ) );
                 }
         }

src/SymTab/FixFunction.cc

@@ -50 +50 @@
 
         void FixFunction::premutate(FunctionDecl *) { visit_children = false; }
+        void FixFunction::premutate(ArrayType *) { visit_children = false; }
         void FixFunction::premutate(BasicType *) { visit_children = false; }
         void FixFunction::premutate(PointerType *) { visit_children = false; }

src/SymTab/FixFunction.h

@@ -31 +31 @@
                 Type * postmutate(ArrayType * arrayType);
 
+                void premutate(ArrayType * arrayType);
                 void premutate(VoidType * voidType);
                 void premutate(BasicType * basicType);

src/SymTab/Validate.cc

@@ -668 +668 @@
                 }
                 filter( translationUnit, isTypedef, true );
-
         }
 
@@ -676 +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;
@@ -692 +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;
         }
 
@@ -706 +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 {