Changeset 121ac13 for src/SymTab

Timestamp:

Nov 6, 2017, 10:28:17 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

bbeb908

Parents:

59a0bde (diff), 9f4524b (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

Location:

src/SymTab

Files:

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

src/SymTab/Autogen.cc

@@ -696 +696 @@
                         if ( TypeInstType * ty = dynamic_cast< TypeInstType * >( t ) ) {
                                 if ( ! done.count( ty->get_baseType() ) ) {
-                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Dtype, true );
                                         TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?=?", Type::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,

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/Mangler.cc

@@ -214 +214 @@
                         numStream << varNum->second.first;
                         switch ( (TypeDecl::Kind )varNum->second.second ) {
-                          case TypeDecl::Any:
-                                mangleName << "t";
-                                break;
                           case TypeDecl::Dtype:
                                 mangleName << "d";
@@ -274 +271 @@
                         for ( Type::ForallList::iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 switch ( (*i)->get_kind() ) {
-                                  case TypeDecl::Any:
-                                        tcount++;
-                                        break;
                                   case TypeDecl::Dtype:
                                         dcount++;

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 {