Changeset 353d168 for src/SymTab

Timestamp:

Aug 19, 2015, 3:59:45 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

Location:

src/SymTab

Files:

• IdTable.cc (modified) (4 diffs)
• Indexer.cc (modified) (4 diffs)
• Indexer.h (modified) (2 diffs)
• Mangler.cc (modified) (5 diffs)
• Mangler.h (modified) (4 diffs)
• Validate.cc (modified) (7 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 ) {

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun  5 08:05:17 2015
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 05 13:52:42 2015
+// Update Count     : 10
 //
 
@@ -26 +26 @@
 
 namespace SymTab {
+        template< typename Container, typename VisitorType >
+        inline void acceptAllNewScope( Container &container, VisitorType &visitor ) {
+                visitor.enterScope();
+                acceptAll( container, visitor );
+                visitor.leaveScope();
+        }
+
         Indexer::Indexer( bool useDebug ) : doDebug( useDebug ) {}
 
@@ -31 +38 @@
 
         void Indexer::visit( ObjectDecl *objectDecl ) {
+                enterScope();
                 maybeAccept( objectDecl->get_type(), *this );
+                leaveScope();
                 maybeAccept( objectDecl->get_init(), *this );
                 maybeAccept( objectDecl->get_bitfieldWidth(), *this );
@@ -149 +158 @@
                 leaveScope();
         }
+
+
+        void Indexer::visit( ApplicationExpr *applicationExpr ) {
+                acceptAllNewScope( applicationExpr->get_results(), *this );
+                maybeAccept( applicationExpr->get_function(), *this );
+                acceptAll( applicationExpr->get_args(), *this );
+        }
+
+        void Indexer::visit( UntypedExpr *untypedExpr ) {
+                acceptAllNewScope( untypedExpr->get_results(), *this );
+                acceptAll( untypedExpr->get_args(), *this );
+        }
+
+        void Indexer::visit( NameExpr *nameExpr ) {
+                acceptAllNewScope( nameExpr->get_results(), *this );
+        }
+
+        void Indexer::visit( AddressExpr *addressExpr ) {
+                acceptAllNewScope( addressExpr->get_results(), *this );
+                maybeAccept( addressExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( LabelAddressExpr *labAddressExpr ) {
+                acceptAllNewScope( labAddressExpr->get_results(), *this );
+                maybeAccept( labAddressExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( CastExpr *castExpr ) {
+                acceptAllNewScope( castExpr->get_results(), *this );
+                maybeAccept( castExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( UntypedMemberExpr *memberExpr ) {
+                acceptAllNewScope( memberExpr->get_results(), *this );
+                maybeAccept( memberExpr->get_aggregate(), *this );
+        }
+
+        void Indexer::visit( MemberExpr *memberExpr ) {
+                acceptAllNewScope( memberExpr->get_results(), *this );
+                maybeAccept( memberExpr->get_aggregate(), *this );
+        }
+
+        void Indexer::visit( VariableExpr *variableExpr ) {
+                acceptAllNewScope( variableExpr->get_results(), *this );
+        }
+
+        void Indexer::visit( ConstantExpr *constantExpr ) {
+                acceptAllNewScope( constantExpr->get_results(), *this );
+                maybeAccept( constantExpr->get_constant(), *this );
+        }
+
+        void Indexer::visit( SizeofExpr *sizeofExpr ) {
+                acceptAllNewScope( sizeofExpr->get_results(), *this );
+                if ( sizeofExpr->get_isType() ) {
+                        maybeAccept( sizeofExpr->get_type(), *this );
+                } else {
+                        maybeAccept( sizeofExpr->get_expr(), *this );
+                }
+        }
+
+        void Indexer::visit( AttrExpr *attrExpr ) {
+                acceptAllNewScope( attrExpr->get_results(), *this );
+                if ( attrExpr->get_isType() ) {
+                        maybeAccept( attrExpr->get_type(), *this );
+                } else {
+                        maybeAccept( attrExpr->get_expr(), *this );
+                }
+        }
+
+        void Indexer::visit( LogicalExpr *logicalExpr ) {
+                acceptAllNewScope( logicalExpr->get_results(), *this );
+                maybeAccept( logicalExpr->get_arg1(), *this );
+                maybeAccept( logicalExpr->get_arg2(), *this );
+        }
+
+        void Indexer::visit( ConditionalExpr *conditionalExpr ) {
+                acceptAllNewScope( conditionalExpr->get_results(), *this );
+                maybeAccept( conditionalExpr->get_arg1(), *this );
+                maybeAccept( conditionalExpr->get_arg2(), *this );
+                maybeAccept( conditionalExpr->get_arg3(), *this );
+        }
+
+        void Indexer::visit( CommaExpr *commaExpr ) {
+                acceptAllNewScope( commaExpr->get_results(), *this );
+                maybeAccept( commaExpr->get_arg1(), *this );
+                maybeAccept( commaExpr->get_arg2(), *this );
+        }
+
+        void Indexer::visit( TupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
+        }
+
+        void Indexer::visit( SolvedTupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
+        }
+
+        void Indexer::visit( TypeExpr *typeExpr ) {
+                acceptAllNewScope( typeExpr->get_results(), *this );
+                maybeAccept( typeExpr->get_type(), *this );
+        }
+
+        void Indexer::visit( AsmExpr *asmExpr ) {
+                maybeAccept( asmExpr->get_inout(), *this );
+                maybeAccept( asmExpr->get_constraint(), *this );
+                maybeAccept( asmExpr->get_operand(), *this );
+        }
+
+        void Indexer::visit( UntypedValofExpr *valofExpr ) {
+                acceptAllNewScope( valofExpr->get_results(), *this );
+                maybeAccept( valofExpr->get_body(), *this );
+        }
+
 
         void Indexer::visit( ContextInstType *contextInst ) {

src/SymTab/Indexer.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:38:55 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:51:21 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 05 13:51:39 2015
+// Update Count     : 4
 //
 
@@ -43 +43 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+
+                virtual void visit( ApplicationExpr *applicationExpr );
+                virtual void visit( UntypedExpr *untypedExpr );
+                virtual void visit( NameExpr *nameExpr );
+                virtual void visit( CastExpr *castExpr );
+                virtual void visit( AddressExpr *addressExpr );
+                virtual void visit( LabelAddressExpr *labAddressExpr );
+                virtual void visit( UntypedMemberExpr *memberExpr );
+                virtual void visit( MemberExpr *memberExpr );
+                virtual void visit( VariableExpr *variableExpr );
+                virtual void visit( ConstantExpr *constantExpr ); 
+                virtual void visit( SizeofExpr *sizeofExpr );
+                virtual void visit( AttrExpr *attrExpr );
+                virtual void visit( LogicalExpr *logicalExpr );
+                virtual void visit( ConditionalExpr *conditionalExpr );
+                virtual void visit( CommaExpr *commaExpr );
+                virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( SolvedTupleExpr *tupleExpr );
+                virtual void visit( TypeExpr *typeExpr );
+                virtual void visit( AsmExpr *asmExpr );
+                virtual void visit( UntypedValofExpr *valofExpr );
 
                 virtual void visit( ContextInstType *contextInst );

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // 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 +30 @@
 
 namespace SymTab {
-        Mangler::Mangler() : nextVarNum( 0 ), isTopLevel( true ) {
+        Mangler::Mangler( bool mangleOverridable ) : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ) {
         }
 
@@ -41 +41 @@
                 nextVarNum = rhs.nextVarNum;
                 isTopLevel = rhs.isTopLevel;
+                mangleOverridable = rhs.mangleOverridable;
         }
 
@@ -59 +60 @@
                 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 +227 @@
                                 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;

src/SymTab/Mangler.h

@@ -9 +9 @@
 // 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 +25 @@
           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 +50 @@
                 int nextVarNum;
                 bool isTopLevel;
+                bool mangleOverridable;
   
-                Mangler();
+                Mangler( bool mangleOverridable );
                 Mangler( const Mangler & );
   
@@ -61 +62 @@
 
         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();

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 22 13:16:00 2015
-// Update Count     : 194
+// Last Modified On : Wed Aug 05 14:00:24 2015
+// Update Count     : 195
 //
 
@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
-                EliminateTypedef() : scopeLevel( 0 ) {}
+          EliminateTypedef() : scopeLevel( 0 ) {}
+            /// Replaces typedefs by forward declarations
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -542 +543 @@
                 std::list<Statement *> initList;
                 initList.push_back( initStmt );
-
+  
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -617 +618 @@
 
                 // need to remove the prototypes, since this may be nested in a routine
-                for ( int start = 0, end = assigns.size() / 2; start < end; start++ ) {
+                for (int start = 0, end = assigns.size()/2; start < end; start++) {
                         delete assigns.front();
                         assigns.pop_front();
@@ -892 +893 @@
                 TypedefMap oldNames = typedefNames;
                 DeclarationWithType *ret = Mutator::mutate( objDecl );
+                typedefNames = oldNames;
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
                         return new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn() );
@@ -897 +899 @@
                         throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
                 } // if
-                typedefNames = oldNames;
                 return ret;
         }
@@ -960 +961 @@
         }
 
-        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );