Index: src/Parser/LinkageSpec.cc =================================================================== --- src/Parser/LinkageSpec.cc (revision 1521de201ad0ad0256fa61a3b50dbb0f9d74824b) +++ src/Parser/LinkageSpec.cc (revision f28a53ae77ea9022223845a27da5cf0c3fc5293a) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:22:09 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat May 16 13:23:21 2015 -// Update Count : 2 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Aug 19 15:53:05 2015 +// Update Count : 5 // @@ -79,4 +79,19 @@ } + +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 ) { Index: src/Parser/LinkageSpec.h =================================================================== --- src/Parser/LinkageSpec.h (revision 1521de201ad0ad0256fa61a3b50dbb0f9d74824b) +++ src/Parser/LinkageSpec.h (revision f28a53ae77ea9022223845a27da5cf0c3fc5293a) @@ -9,7 +9,7 @@ // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:24:28 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sat May 16 13:26:14 2015 -// Update Count : 3 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Aug 18 14:11:55 2015 +// Update Count : 5 // @@ -34,4 +34,5 @@ static bool isGeneratable( Type ); static bool isOverloadable( Type ); + static bool isOverridable( Type ); static bool isBuiltin( Type ); }; Index: src/SymTab/IdTable.cc =================================================================== --- src/SymTab/IdTable.cc (revision 1521de201ad0ad0256fa61a3b50dbb0f9d74824b) +++ src/SymTab/IdTable.cc (revision f28a53ae77ea9022223845a27da5cf0c3fc5293a) @@ -9,7 +9,7 @@ // 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 Oct 07 12:21:13 2015 +// Update Count : 73 // @@ -37,4 +37,5 @@ 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(); @@ -52,4 +53,9 @@ 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 ); @@ -60,18 +66,36 @@ 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 ( decl->get_linkage() != LinkageSpec::C || ResolvExpr::typesCompatible( decl->get_type(), entry.top().first->get_type(), Indexer() ) ) { + // 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( decl ) && dynamic_cast( old ) ) + || (dynamic_cast( decl ) && dynamic_cast( 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? 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 ); + 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 } 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* >( entry.top().first ); - if ( newobj && oldobj && newobj->get_init() && oldobj->get_init() ) { - throw SemanticError( "duplicate definition for ", 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 ); } // if } // if @@ -80,8 +104,9 @@ } // if } else { + // new scope level - shadow existing definition declTable[ manglename ].push( DeclEntry( decl, scopeLevel ) ); } // if } // 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 ) { Index: src/SymTab/Mangler.cc =================================================================== --- src/SymTab/Mangler.cc (revision 1521de201ad0ad0256fa61a3b50dbb0f9d74824b) +++ src/SymTab/Mangler.cc (revision f28a53ae77ea9022223845a27da5cf0c3fc5293a) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Sun May 17 21:40:29 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jun 8 15:12:12 2015 -// Update Count : 8 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Aug 19 15:52:24 2015 +// Update Count : 19 // @@ -30,5 +30,5 @@ namespace SymTab { - Mangler::Mangler() : nextVarNum( 0 ), isTopLevel( true ) { + Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) { } @@ -41,4 +41,5 @@ nextVarNum = rhs.nextVarNum; isTopLevel = rhs.isTopLevel; + mangleOverridable = rhs.mangleOverridable; } @@ -59,4 +60,16 @@ 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; } @@ -214,5 +227,5 @@ 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; + Mangler sub_mangler( mangleOverridable ); sub_mangler.nextVarNum = nextVarNum; sub_mangler.isTopLevel = false; Index: src/SymTab/Mangler.h =================================================================== --- src/SymTab/Mangler.h (revision 1521de201ad0ad0256fa61a3b50dbb0f9d74824b) +++ src/SymTab/Mangler.h (revision f28a53ae77ea9022223845a27da5cf0c3fc5293a) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Sun May 17 21:44:03 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jun 8 14:47:14 2015 -// Update Count : 5 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Aug 19 15:48:46 2015 +// Update Count : 14 // @@ -25,5 +25,5 @@ public: template< typename SynTreeClass > - static std::string mangle( SynTreeClass *decl ); // interface to clients + static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true ); // interface to clients /// using Visitor::visit; @@ -50,6 +50,7 @@ int nextVarNum; bool isTopLevel; + bool mangleOverridable; - Mangler(); + Mangler( bool mangleOverridable ); Mangler( const Mangler & ); @@ -61,6 +62,6 @@ template< typename SynTreeClass > - std::string Mangler::mangle( SynTreeClass *decl ) { - Mangler mangler; + std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) { + Mangler mangler( mangleOverridable ); maybeAccept( decl, mangler ); return mangler.get_mangleName();