Changeset e35f30a for src/SymTab

Timestamp:

Nov 8, 2017, 1:54:16 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3f7e12cb, 4ee36bf0, bd41764

Parents:

c6747a1

git-author:

Rob Schluntz <rschlunt@…> (11/08/17 13:54:06)

git-committer:

Rob Schluntz <rschlunt@…> (11/08/17 13:54:16)

Message:

Fix generic type name mangling, add mangleGenericParams mode to name mangler [fixes #41]

Location:

src/SymTab

Files:

• Mangler.cc (modified) (3 diffs)
• Mangler.h (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -32 +32 @@
 namespace SymTab {
         std::string Mangler::mangleType( Type * ty ) {
-                Mangler mangler( false, true );
+                Mangler mangler( false, true, true );
                 maybeAccept( ty, mangler );
                 return mangler.get_mangleName();
         }
 
-        Mangler::Mangler( bool mangleOverridable, bool typeMode )
-                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
+        std::string Mangler::mangleConcrete( Type* ty ) {
+                Mangler mangler( false, false, false );
+                maybeAccept( ty, mangler );
+                return mangler.get_mangleName();
+        }
+
+        Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
 
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
@@ -166 +172 @@
 
                 mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
-        }
-
-        void Mangler::mangleGenericRef( ReferenceToType * refType, std::string prefix ) {
-                printQualifiers( refType );
-
-                std::ostringstream oldName( mangleName.str() );
-                mangleName.clear();
-
-                mangleName << prefix << refType->get_name();
-
-                std::list< Expression* >& params = refType->get_parameters();
-                if ( ! params.empty() ) {
-                        mangleName << "_";
-                        for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
-                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
-                                assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
-                                maybeAccept( paramType->get_type(), *this );
+
+                if ( mangleGenericParams ) {
+                        std::list< Expression* >& params = refType->get_parameters();
+                        if ( ! params.empty() ) {
+                                mangleName << "_";
+                                for ( std::list< Expression* >::const_iterator param = params.begin(); param != params.end(); ++param ) {
+                                        TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                                        assertf(paramType, "Aggregate parameters should be type expressions: %s", toString(*param).c_str());
+                                        maybeAccept( paramType->get_type(), *this );
+                                }
+                                mangleName << "_";
                         }
-                        mangleName << "_";
                 }
-
-                oldName << mangleName.str().length() << mangleName.str();
-                mangleName.str( oldName.str() );
         }
 
         void Mangler::visit( StructInstType * aggregateUseType ) {
-                if ( typeMode ) mangleGenericRef( aggregateUseType, "s" );
-                else mangleRef( aggregateUseType, "s" );
+                mangleRef( aggregateUseType, "s" );
         }
 
         void Mangler::visit( UnionInstType * aggregateUseType ) {
-                if ( typeMode ) mangleGenericRef( aggregateUseType, "u" );
-                else mangleRef( aggregateUseType, "u" );
+                mangleRef( aggregateUseType, "u" );
         }
 
@@ -285 +279 @@
                                 varNums[ (*i)->name ] = std::pair< int, int >( nextVarNum++, (int)(*i)->get_kind() );
                                 for ( std::list< DeclarationWithType* >::iterator assert = (*i)->assertions.begin(); assert != (*i)->assertions.end(); ++assert ) {
-                                        Mangler sub_mangler( mangleOverridable, typeMode );
+                                        Mangler sub_mangler( mangleOverridable, typeMode, mangleGenericParams );
                                         sub_mangler.nextVarNum = nextVarNum;
                                         sub_mangler.isTopLevel = false;

src/SymTab/Mangler.h

@@ -30 +30 @@
                 /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
-            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false );
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false, bool mangleGenericParams = true );
                 /// Mangle a type name; secondary interface
                 static std::string mangleType( Type* ty );
+                /// Mangle ignoring generic type parameters
+                static std::string mangleConcrete( Type* ty );
+
 
                 virtual void visit( ObjectDecl *declaration );
@@ -62 +65 @@
                 bool mangleOverridable;         ///< Specially mangle overridable built-in methods
                 bool typeMode;                  ///< Produce a unique mangled name for a type
+                bool mangleGenericParams;       ///< Include generic parameters in name mangling if true
 
-                Mangler( bool mangleOverridable, bool typeMode );
+                Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
                 Mangler( const Mangler & );
 
                 void mangleDecl( DeclarationWithType *declaration );
                 void mangleRef( ReferenceToType *refType, std::string prefix );
-                void mangleGenericRef( ReferenceToType *refType, std::string prefix );
 
                 void printQualifiers( Type *type );
@@ -74 +77 @@
 
         template< typename SynTreeClass >
-        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode ) {
-                Mangler mangler( mangleOverridable, typeMode );
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode, bool mangleGenericParams ) {
+                Mangler mangler( mangleOverridable, typeMode, mangleGenericParams );
                 maybeAccept( decl, mangler );
                 return mangler.get_mangleName();