Changeset f80e0218 for src/SymTab/Indexer.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/SymTab/Indexer.cc (modified) (25 diffs)

src/SymTab/Indexer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indexer.cc -- 
+// Indexer.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:31:29 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Apr 22 15:25:43 2016
 // Update Count     : 11
 //
@@ -59 +59 @@
                 }
         }
-        
+
         template< typename Decl >
         void dump( const std::unordered_map< std::string, Decl* > &table, std::ostream &os ) {
@@ -66 +66 @@
                 } // for
         }
-        
+
         struct Indexer::Impl {
                 Impl( unsigned long _scope ) : refCount(1), scope( _scope ), size( 0 ), base(),
@@ -76 +76 @@
                 unsigned long size;       ///< Number of elements stored in this table
                 const Indexer base;       ///< Base indexer this extends
-                
+
                 IdTable idTable;          ///< Identifier namespace
                 TypeTable typeTable;      ///< Type namespace
@@ -213 +213 @@
         void Indexer::visit( StructDecl *aggregateDecl ) {
                 // make up a forward declaration and add it before processing the members
-                StructDecl fwdDecl( aggregateDecl->get_name() );
+                // needs to be on the heap because addStruct saves the pointer
+                StructDecl &fwdDecl = *new StructDecl( aggregateDecl->get_name() );
                 cloneAll( aggregateDecl->get_parameters(), fwdDecl.get_parameters() );
                 debugPrint( "Adding fwd decl for struct " << fwdDecl.get_name() << std::endl );
                 addStruct( &fwdDecl );
-  
+
                 enterScope();
                 acceptAll( aggregateDecl->get_parameters(), *this );
                 acceptAll( aggregateDecl->get_members(), *this );
                 leaveScope();
-  
+
                 debugPrint( "Adding struct " << aggregateDecl->get_name() << std::endl );
                 // this addition replaces the forward declaration
@@ -234 +235 @@
                 debugPrint( "Adding fwd decl for union " << fwdDecl.get_name() << std::endl );
                 addUnion( &fwdDecl );
-  
+
                 enterScope();
                 acceptAll( aggregateDecl->get_parameters(), *this );
                 acceptAll( aggregateDecl->get_members(), *this );
                 leaveScope();
-  
+
                 debugPrint( "Adding union " << aggregateDecl->get_name() << std::endl );
                 addUnion( aggregateDecl );
@@ -256 +257 @@
                 acceptAll( aggregateDecl->get_members(), *this );
                 leaveScope();
-  
+
                 debugPrint( "Adding context " << aggregateDecl->get_name() << std::endl );
                 addTrait( aggregateDecl );
@@ -438 +439 @@
         }
 
-        
+
 
         void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const {
                 std::unordered_set< std::string > foundMangleNames;
-                
+
                 Indexer::Impl *searchTables = tables;
                 while ( searchTables ) {
@@ -452 +453 @@
                                         // mark the mangled name as found, skipping this insertion if a declaration for that name has already been found
                                         if ( foundMangleNames.insert( decl->first ).second == false ) continue;
-                                        
+
                                         out.push_back( decl->second );
                                 }
                         }
-                        
+
                         // get declarations from base indexers
                         searchTables = searchTables->base.tables;
@@ -511 +512 @@
         }
 
-        bool Indexer::hasIncompatibleCDecl( const std::string &id, const std::string &mangleName ) const {
+        bool Indexer::hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
                 if ( ! tables ) return false;
+                if ( tables->scope < scope ) return false;
 
                 IdTable::const_iterator decls = tables->idTable.find( id );
@@ -518 +520 @@
                         const MangleTable &mangleTable = decls->second;
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
-                                // check for C decls with the same name, skipping 
+                                // check for C decls with the same name, skipping
                                 // those with a compatible type (by mangleName)
                                 if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
@@ -524 +526 @@
                 }
 
-                return tables->base.hasIncompatibleCDecl( id, mangleName );
-        }
-        
+                return tables->base.hasIncompatibleCDecl( id, mangleName, scope );
+        }
+
         NamedTypeDecl *Indexer::lookupTypeAtScope( const std::string &id, unsigned long scope ) const {
                 if ( ! tables ) return 0;
@@ -534 +536 @@
                 return ret != tables->typeTable.end() ? ret->second : tables->base.lookupTypeAtScope( id, scope );
         }
-        
+
         StructDecl *Indexer::lookupStructAtScope( const std::string &id, unsigned long scope ) const {
                 if ( ! tables ) return 0;
@@ -542 +544 @@
                 return ret != tables->structTable.end() ? ret->second : tables->base.lookupStructAtScope( id, scope );
         }
-        
+
         EnumDecl *Indexer::lookupEnumAtScope( const std::string &id, unsigned long scope ) const {
                 if ( ! tables ) return 0;
@@ -550 +552 @@
                 return ret != tables->enumTable.end() ? ret->second : tables->base.lookupEnumAtScope( id, scope );
         }
-        
+
         UnionDecl *Indexer::lookupUnionAtScope( const std::string &id, unsigned long scope ) const {
                 if ( ! tables ) return 0;
@@ -558 +560 @@
                 return ret != tables->unionTable.end() ? ret->second : tables->base.lookupUnionAtScope( id, scope );
         }
-        
+
         TraitDecl *Indexer::lookupTraitAtScope( const std::string &id, unsigned long scope ) const {
                 if ( ! tables ) return 0;
@@ -601 +603 @@
                 return true;
         }
-        
+
         void Indexer::addId( DeclarationWithType *decl ) {
                 makeWritable();
@@ -617 +619 @@
                 DeclarationWithType *existing = lookupIdAtScope( name, mangleName, scope );
                 if ( ! existing || ! addedIdConflicts( existing, decl ) ) {
-                        // this ensures that no two declarations with the same unmangled name both have C linkage
-                        if ( decl->get_linkage() == LinkageSpec::C && hasIncompatibleCDecl( name, mangleName ) ) {
+                        // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
+                        if ( decl->get_linkage() == LinkageSpec::C && hasIncompatibleCDecl( name, mangleName, scope ) ) {
                                 throw SemanticError( "invalid overload of C function ", decl );
-                        } // NOTE this is broken in Richard's original code in such a way that it never triggers (it 
-                          // doesn't check decls that have the same manglename, and all C-linkage decls are defined to 
+                        } // NOTE this is broken in Richard's original code in such a way that it never triggers (it
+                          // doesn't check decls that have the same manglename, and all C-linkage decls are defined to
                           // have their name as their manglename, hence the error can never trigger).
-                          // The code here is closer to correct, but name mangling would have to be completely 
+                          // The code here is closer to correct, but name mangling would have to be completely
                           // isomorphic to C type-compatibility, which it may not be.
-                        
+
                         tables->idTable[ name ][ mangleName ] = decl;
                         ++tables->size;
@@ -640 +642 @@
                 }
         }
-        
+
         void Indexer::addType( NamedTypeDecl *decl ) {
                 makeWritable();
@@ -671 +673 @@
                 addStruct( new StructDecl( id ) );
         }
-        
+
         void Indexer::addStruct( StructDecl *decl ) {
                 makeWritable();
@@ -689 +691 @@
                 }
         }
-        
+
         void Indexer::addEnum( EnumDecl *decl ) {
                 makeWritable();
@@ -711 +713 @@
                 addUnion( new UnionDecl( id ) );
         }
-        
+
         void Indexer::addUnion( UnionDecl *decl ) {
                 makeWritable();
@@ -729 +731 @@
                 }
         }
-        
+
         void Indexer::addTrait( TraitDecl *decl ) {
                 makeWritable();
@@ -750 +752 @@
         void Indexer::enterScope() {
                 ++scope;
-                
+
                 if ( doDebug ) {
                         std::cout << "--- Entering scope " << scope << std::endl;
@@ -783 +785 @@
             using std::cerr;
 
-            cerr << "===idTable===" << std::endl;
-            if ( tables ) dump( tables->idTable, os );
-            cerr << "===typeTable===" << std::endl;
-            if ( tables ) dump( tables->typeTable, os );
-            cerr << "===structTable===" << std::endl;
-            if ( tables ) dump( tables->structTable, os );
-            cerr << "===enumTable===" << std::endl;
-            if ( tables ) dump( tables->enumTable, os );
-            cerr << "===unionTable===" << std::endl;
-            if ( tables ) dump( tables->unionTable, os );
-            cerr << "===contextTable===" << std::endl;
-            if ( tables ) dump( tables->traitTable, os );
+                if ( tables ) {
+                        os << "--- scope " << tables->scope << " ---" << std::endl;
+
+                        os << "===idTable===" << std::endl;
+                        dump( tables->idTable, os );
+                        os << "===typeTable===" << std::endl;
+                        dump( tables->typeTable, os );
+                        os << "===structTable===" << std::endl;
+                        dump( tables->structTable, os );
+                        os << "===enumTable===" << std::endl;
+                        dump( tables->enumTable, os );
+                        os << "===unionTable===" << std::endl;
+                        dump( tables->unionTable, os );
+                        os << "===contextTable===" << std::endl;
+                        dump( tables->traitTable, os );
+
+                        tables->base.print( os, indent );
+                } else {
+                        os << "--- end ---" << std::endl;
+                }
+
         }
 } // namespace SymTab