Changes in / [50eac1b:9909842]

Location:

src

Files:

• Parser/LinkageSpec.cc (modified) (2 diffs)
• Parser/LinkageSpec.h (modified) (2 diffs)
• SymTab/IdTable.cc (modified) (5 diffs)
• SymTab/Mangler.cc (modified) (5 diffs)
• SymTab/Mangler.h (modified) (4 diffs)

src/Parser/LinkageSpec.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:53:05 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat May 16 13:23:21 2015
+// Update Count     : 2
 // 
 
@@ -79 +79 @@
 }
 
-
-bool LinkageSpec::isOverridable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case AutoGen:
-                return true;
-          case Cforall:
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
-}
-
 bool LinkageSpec::isBuiltin( Type t ) {
         switch ( t ) {

src/Parser/LinkageSpec.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Aug 18 14:11:55 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat May 16 13:26:14 2015
+// Update Count     : 3
 //
 
@@ -34 +34 @@
         static bool isGeneratable( Type );
         static bool isOverloadable( Type );
-        static bool isOverridable( Type );
         static bool isBuiltin( Type );
 };

src/SymTab/IdTable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 17:04:02 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Oct 07 12:21:13 2015
-// Update Count     : 73
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun May 17 17:07:43 2015
+// Update Count     : 3
 //
 
@@ -37 +37 @@
                         for ( InnerTableType::iterator inner = outer->second.begin(); inner != outer->second.end(); ++inner ) {
                                 std::stack< DeclEntry >& entry = inner->second;
-                                // xxx - should be while?
                                 if ( ! entry.empty() && entry.top().second == scopeLevel ) {
                                         entry.pop();
@@ -53 +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 );
@@ -66 +60 @@
 
                 if ( it == declTable.end() ) {
-                        // first time this name mangling has been defined
                         declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) );
                 } else {
                         std::stack< DeclEntry >& entry = it->second;
                         if ( ! entry.empty() && entry.top().second == scopeLevel ) {
-                                // if we're giving the same name mangling to things of
-                                //  different types then there is something wrong
-                                Declaration *old = entry.top().first;
-                                assert( (dynamic_cast<ObjectDecl*>( decl ) && dynamic_cast<ObjectDecl*>( old ) )
-                                  || (dynamic_cast<FunctionDecl*>( decl ) && dynamic_cast<FunctionDecl*>( old ) ) );
-
-                                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 ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) {
-                                        // 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 *oldentry = dynamic_cast< FunctionDecl* >( old );
-                                        if ( newentry && oldentry ) {
-                                                if ( newentry->get_statements() && oldentry->get_statements() ) {
-                                                        throw SemanticError( "duplicate function definition for 1 ", decl );
-                                                } // if
+                                        FunctionDecl *old = dynamic_cast< FunctionDecl* >( entry.top().first );
+                                        if ( newentry && old && newentry->get_statements() && old->get_statements() ) {
+                                                throw SemanticError( "duplicate function definition for ", decl );
                                         } else {
-                                                // two objects with the same mangled name defined in the same scope.
-                                                // both objects must be marked extern or both must be intrinsic for this to be okay
-                                                // xxx - perhaps it's actually if either is intrinsic then this is okay?
-                                                //       might also need to be same storage class?
                                                 ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( decl );
-                                                ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( old );
-                                                if (newobj->get_storageClass() != DeclarationNode::Extern && oldobj->get_storageClass() != DeclarationNode::Extern ) {
-                                                        throw SemanticError( "duplicate definition for 3 ", decl );
+                                                ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( entry.top().first );
+                                                if ( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) {
+                                                        throw SemanticError( "duplicate definition for ", decl );
                                                 } // if
                                         } // if
@@ -104 +80 @@
                                 } // if
                         } else {
-                                // new scope level - shadow existing definition
                                 declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) );
                         } // if
                 } // if
-                // this ensures that no two declarations with the same unmangled name both have C linkage
+                // ensure the set of routines with C linkage cannot be overloaded
                 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 ) {

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:52:24 2015
-// Update Count     : 19
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun  8 15:12:12 2015
+// Update Count     : 8
 //
 
@@ -30 +30 @@
 
 namespace SymTab {
-        Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) {
+        Mangler::Mangler() : nextVarNum( 0 ), isTopLevel( true ) {
         }
 
@@ -41 +41 @@
                 nextVarNum = rhs.nextVarNum;
                 isTopLevel = rhs.isTopLevel;
-                mangleOverridable = rhs.mangleOverridable;
         }
 
@@ -60 +59 @@
                 mangleName << "__";
                 maybeAccept( declaration->get_type(), *this );
-                if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {
-                        // want to be able to override autogenerated and intrinsic routines,
-                        // so they need a different name mangling
-                        if ( declaration->get_linkage() == LinkageSpec::AutoGen ) {
-                                mangleName << "autogen__";
-                        } else if ( declaration->get_linkage() == LinkageSpec::Intrinsic ) {
-                                mangleName << "intrinsic__";
-                        } else {
-                                // if we add another kind of overridable function, this has to change
-                                assert( false );
-                        } // if
-                }
                 isTopLevel = wasTopLevel;
         }
@@ -227 +214 @@
                                 varNums[ (*i )->get_name() ] = std::pair< int, int >( nextVarNum++, (int )(*i )->get_kind() );
                                 for ( std::list< DeclarationWithType* >::iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) {
-                                        Mangler sub_mangler( mangleOverridable );
+                                        Mangler sub_mangler;
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;

src/SymTab/Mangler.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:44:03 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:48:46 2015
-// Update Count     : 14
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun  8 14:47:14 2015
+// Update Count     : 5
 //
 
@@ -25 +25 @@
           public:
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true ); // interface to clients
+            static std::string mangle( SynTreeClass *decl ); // interface to clients
 
 ///   using Visitor::visit;
@@ -50 +50 @@
                 int nextVarNum;
                 bool isTopLevel;
-                bool mangleOverridable;
   
-                Mangler( bool mangleOverridable );
+                Mangler();
                 Mangler( const Mangler & );
   
@@ -62 +61 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
-                Mangler mangler( mangleOverridable );
+        std::string Mangler::mangle( SynTreeClass *decl ) {
+                Mangler mangler;
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();