Changeset 3c70d38 for translator/SymTab/Validate.cc

Timestamp:

Nov 20, 2014, 9:50:35 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

ea3eb06

Parents:

1db2c5be

Message:

make routine static qualifier conditional, remove and reorder hoisted aggregate, format adjustment

File:

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

translator/SymTab/Validate.cc

@@ -117 +117 @@
         virtual void visit( TypeDecl *typeDecl );
         virtual void visit( ContextDecl *ctxDecl );
+        virtual void visit( FunctionDecl *functionDecl );
 
         virtual void visit( FunctionType *ftype );
@@ -129 +130 @@
         virtual void visit( CaseStmt *caseStmt );
         virtual void visit( CatchStmt *catchStmt );
+
+        AddStructAssignment() : functionNesting( 0 ) {}
       private:
         template< typename StmtClass > void visitStatement( StmtClass *stmt );
@@ -134 +137 @@
         std::list< Declaration * > declsToAdd;
         std::set< std::string > structsDone;
+        unsigned int functionNesting;                   // current level of nested functions
     };
 
@@ -194 +198 @@
     }
 
-    void filter( std::list< Declaration * > &declList, bool (*pred )( Declaration * ), bool doDelete ) {
+    void filter( std::list< Declaration * > &declList, bool (*pred)( Declaration * ), bool doDelete ) {
         std::list< Declaration * >::iterator i = declList.begin();
         while ( i != declList.end() ) {
@@ -216 +220 @@
     void HoistStruct::handleAggregate( AggDecl *aggregateDecl ) {
         if ( inStruct ) {
-            declsToAdd.push_back( aggregateDecl );
+            // Add elements in stack order corresponding to nesting structure.
+            declsToAdd.push_front( aggregateDecl );
             Visitor::visit( aggregateDecl );
         } else {
@@ -222 +227 @@
             Visitor::visit( aggregateDecl );
             inStruct = false;
-            filter( aggregateDecl->get_members(), isStructOrUnion, false );
-        }
+        }
+        // Always remove the hoisted aggregate from the inner structure.
+        filter( aggregateDecl->get_members(), isStructOrUnion, false );
     }
 
@@ -523 +529 @@
     }
 
-    Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType ) {
+    Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
         FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
   
@@ -534 +540 @@
         ObjectDecl *srcParam = new ObjectDecl( "_src", Declaration::NoStorageClass, LinkageSpec::Cforall, 0, refType, 0 );
         assignType->get_parameters().push_back( srcParam );
-  
-        FunctionDecl *assignDecl = new FunctionDecl( "?=?", Declaration::Static, LinkageSpec::AutoGen, assignType, new CompoundStmt( noLabels ), true );
+
+        // Routines at global scope marked "static" to prevent multiple definitions is separate translation units
+        // because each unit generates copies of the default routines for each aggregate.
+        FunctionDecl *assignDecl = new FunctionDecl( "?=?", functionNesting > 0 ? Declaration::NoStorageClass : Declaration::Static, LinkageSpec::AutoGen, assignType, new CompoundStmt( noLabels ), true );
         assignDecl->fixUniqueId();
   
@@ -552 +560 @@
     }
 
-    Declaration *makeUnionAssignment( UnionDecl *aggregateDecl, UnionInstType *refType ) {
+    Declaration *makeUnionAssignment( UnionDecl *aggregateDecl, UnionInstType *refType, unsigned int functionNesting ) {
         FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
   
@@ -564 +572 @@
         assignType->get_parameters().push_back( srcParam );
   
-        FunctionDecl *assignDecl = new FunctionDecl( "?=?", Declaration::Static, LinkageSpec::AutoGen, assignType, new CompoundStmt( noLabels ), true );
+        // Routines at global scope marked "static" to prevent multiple definitions is separate translation units
+        // because each unit generates copies of the default routines for each aggregate.
+        FunctionDecl *assignDecl = new FunctionDecl( "?=?",  functionNesting > 0 ? Declaration::NoStorageClass : Declaration::Static, LinkageSpec::AutoGen, assignType, new CompoundStmt( noLabels ), true );
         assignDecl->fixUniqueId();
   
@@ -582 +592 @@
             StructInstType *structInst = new StructInstType( Type::Qualifiers(), structDecl->get_name() );
             structInst->set_baseStruct( structDecl );
-            declsToAdd.push_back( makeStructAssignment( structDecl, structInst ) );
+            declsToAdd.push_back( makeStructAssignment( structDecl, structInst, functionNesting ) );
             structsDone.insert( structDecl->get_name() );
         }
@@ -591 +601 @@
             UnionInstType *unionInst = new UnionInstType( Type::Qualifiers(), unionDecl->get_name() );
             unionInst->set_baseUnion( unionDecl );
-            declsToAdd.push_back( makeUnionAssignment( unionDecl, unionInst ) );
+            declsToAdd.push_back( makeUnionAssignment( unionDecl, unionInst, functionNesting ) );
         }
     }
@@ -647 +657 @@
     }
 
+    void AddStructAssignment::visit( FunctionDecl *functionDecl ) {
+        maybeAccept( functionDecl->get_functionType(), *this );
+        acceptAll( functionDecl->get_oldDecls(), *this );
+        functionNesting += 1;
+        maybeAccept( functionDecl->get_statements(), *this );
+        functionNesting -= 1;
+    }
+
     void AddStructAssignment::visit( CompoundStmt *compoundStmt ) {
         visitStatement( compoundStmt );