Changes in src/SymTab/IdTable.cc [843054c2:4aa0858]

File:

• src/SymTab/IdTable.cc (modified) (4 diffs)

src/SymTab/IdTable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 17:04:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 17:07:43 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 19 15:47:58 2015
+// Update Count     : 38
 //
 
@@ -52 +52 @@
                 if ( decl->get_linkage() == LinkageSpec::C ) {
                         manglename = name;
+                } else if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
+                        // mangle the name without including the appropriate suffix
+                        // this will make it so that overridable routines are placed
+                        // into the same "bucket" as their user defined versions.
+                        manglename = Mangler::mangle( decl, false );
                 } else {
                         manglename = Mangler::mangle( decl );
@@ -64 +69 @@
                         std::stack< DeclEntry >& entry = it->second;
                         if ( ! entry.empty() && entry.top().second == scopeLevel ) {
+                                // typesCompatible doesn't really do the right thing here. When checking compatibility of function types,
+                                // we should ignore outermost pointer qualifiers, except _Atomic?
+
                                 if ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) {
                                         FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( decl );
                                         FunctionDecl *old = dynamic_cast< FunctionDecl* >( entry.top().first );
-                                        if ( newentry && old && newentry->get_statements() && old->get_statements() ) {
-                                                throw SemanticError( "duplicate function definition for ", decl );
+                                        if ( LinkageSpec::isOverridable( old->get_linkage() ) ) {
+                                                // new definition shadows the autogenerated one, even at the same scope
+                                                declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) );
+                                        } else if ( newentry && old && newentry->get_statements() && old->get_statements() ) {
+                                                throw SemanticError( "duplicate function definition for 1 ", decl );
                                         } else {
+                                                // two objects with the same mangled name defined in the same scope.
+                                                // both objects must be marked extern for this to be okay
                                                 ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( decl );
                                                 ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( entry.top().first );
-                                                if ( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) {
+                                                if ( newobj && oldobj && newobj->get_storageClass() != DeclarationNode::Extern && oldobj->get_storageClass() != DeclarationNode::Extern ) {
                                                         throw SemanticError( "duplicate definition for ", decl );
                                                 } // if
                                         } // if
                                 } else {
-                                        throw SemanticError( "duplicate definition for ", decl );
+                                        // C definitions with the same name but incompatible types
+                                        throw SemanticError( "duplicate definition for 2 ", decl );
                                 } // if
                         } else {
@@ -84 +98 @@
                 } // if
                 // ensure the set of routines with C linkage cannot be overloaded
+                // this ensures that no two declarations with the same unmangled name both have C linkage
                 for ( InnerTableType::iterator i = declTable.begin(); i != declTable.end(); ++i ) {
                         if ( ! i->second.empty() && i->second.top().first->get_linkage() == LinkageSpec::C && declTable.size() > 1 ) {