Changeset 69911c11

Timestamp:

Dec 17, 2015, 12:00:55 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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

Children:

c23f807

Parents:

7754cde

Message:

Restore Mangler to closer to previous behaviour

Location:

src

Files:

• GenPoly/Box.cc (modified) (1 diff)
• GenPoly/GenPoly.cc (modified) (1 diff)
• SymTab/Mangler.cc (modified) (6 diffs)
• SymTab/Mangler.h (modified) (3 diffs)

src/GenPoly/Box.cc

@@ -331 +331 @@
                         std::list< DeclarationWithType* >::const_iterator fnParm = funcType->get_parameters().begin();
                         std::list< Expression* >::const_iterator fnArg = arg;
-                        std::set< std::string > seenTypes; //< sizeofName for generic types we've seen
+                        std::set< std::string > seenTypes; //< names for generic types we've seen
                         for ( ; fnParm != funcType->get_parameters().end() && fnArg != appExpr->get_args().end(); ++fnParm, ++fnArg ) {
                                 Type *parmType = (*fnParm)->get_type();

src/GenPoly/GenPoly.cc

@@ -166 +166 @@
 
         std::string sizeofName( Type *ty ) {
-                return std::string( "_sizeof_" ) + SymTab::Mangler::mangle( ty, false, false );
+                return std::string( "_sizeof_" ) + SymTab::Mangler::mangleType( ty );
         }
 
         std::string alignofName( Type *ty ) {
-                return std::string( "_alignof_" ) + SymTab::Mangler::mangle( ty, false, false );
+                return std::string( "_alignof_" ) + SymTab::Mangler::mangleType( ty );
         }
 } // namespace GenPoly

src/SymTab/Mangler.cc

@@ -30 +30 @@
 
 namespace SymTab {
-        Mangler::Mangler( bool mangleOverridable, bool includeQualifiers )
-                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), includeQualifiers(includeQualifiers) {}
+        std::string Mangler::mangleType( Type *ty ) {
+                Mangler mangler( false, true );
+                maybeAccept( ty, mangler );
+                return mangler.get_mangleName();
+        }
+        
+        Mangler::Mangler( bool mangleOverridable, bool typeMode )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
                 
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
@@ -38 +44 @@
                 isTopLevel = rhs.isTopLevel;
                 mangleOverridable = rhs.mangleOverridable;
-                includeQualifiers = rhs.includeQualifiers;
+                typeMode = rhs.typeMode;
         }
 
@@ -164 +170 @@
                 if ( ! params.empty() ) {
                         mangleName << "_";
-                        std::list< Type* > paramTypes;
                         for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
                                 TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
                                 assert(paramType && "Aggregate parameters should be type expressions");
-                                paramTypes.push_back( paramType->get_type() );
+                                maybeAccept( paramType->get_type(), *this );
                         }
-                        acceptAll( paramTypes, *this );
                         mangleName << "_";
                 }
@@ -179 +183 @@
 
         void Mangler::visit( StructInstType *aggregateUseType ) {
-                mangleGenericRef( aggregateUseType, "s" );
+                if ( typeMode ) mangleGenericRef( aggregateUseType, "s" );
+                else mangleRef( aggregateUseType, "s" );
         }
 
         void Mangler::visit( UnionInstType *aggregateUseType ) {
-                mangleGenericRef( aggregateUseType, "u" );
+                if ( typeMode ) mangleGenericRef( aggregateUseType, "u" );
+                else mangleRef( aggregateUseType, "u" );
         }
 
@@ -233 +239 @@
         void Mangler::printQualifiers( Type *type ) {
                 // skip if not including qualifiers
-                if ( ! includeQualifiers ) return;
+                if ( typeMode ) return;
                 
                 if ( ! type->get_forall().empty() ) {
@@ -253 +259 @@
                                 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, includeQualifiers );
+                                        Mangler sub_mangler( mangleOverridable, typeMode );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;

src/SymTab/Mangler.h

@@ -25 +25 @@
         class Mangler : public Visitor {
           public:
+                /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool includeQualifiers = true ); // interface to clients
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true );
+                /// Mangle a type name; secondary interface
+                static std::string mangleType( Type* ty );
 
                 virtual void visit( ObjectDecl *declaration );
@@ -51 +54 @@
                 bool isTopLevel;                ///< Is the Mangler at the top level
                 bool mangleOverridable;         ///< Specially mangle overridable built-in methods
-                bool includeQualifiers;         ///< Include type qualifiers in mangled name
+                bool typeMode;                  ///< Produce a unique mangled name for a type
   
-                Mangler( bool mangleOverridable, bool includeQualifiers );
+                Mangler( bool mangleOverridable, bool typeMode );
                 Mangler( const Mangler & );
   
@@ -64 +67 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool includeQualifiers ) {
-                Mangler mangler( mangleOverridable, includeQualifiers );
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable ) {
+                Mangler mangler( mangleOverridable, false );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();