Changes in src/SymTab/Validate.cc [b95fe40:5c4d27f]

File:

• src/SymTab/Validate.cc (modified) (5 diffs)

src/SymTab/Validate.cc

@@ -124 +124 @@
 
         /// Associates forward declarations of aggregates with their definitions
-        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
+        struct LinkReferenceToTypes final : public WithIndexer {
                 LinkReferenceToTypes( const Indexer *indexer );
                 void postvisit( TypeInstType *typeInst );
@@ -137 +137 @@
                 void postvisit( UnionDecl *unionDecl );
                 void postvisit( TraitDecl * traitDecl );
-
-                void previsit( StructDecl *structDecl );
-                void previsit( UnionDecl *unionDecl );
-
-                void renameGenericParams( std::list< TypeDecl * > & params );
 
           private:
@@ -152 +147 @@
                 ForwardStructsType forwardStructs;
                 ForwardUnionsType forwardUnions;
-                /// true if currently in a generic type body, so that type parameter instances can be renamed appropriately
-                bool inGeneric = false;
         };
 
@@ -568 +561 @@
         }
 
-        void LinkReferenceToTypes::renameGenericParams( std::list< TypeDecl * > & params ) {
-                // rename generic type parameters uniquely so that they do not conflict with user-defined function forall parameters, e.g.
-                //   forall(otype T)
-                //   struct Box {
-                //     T x;
-                //   };
-                //   forall(otype T)
-                //   void f(Box(T) b) {
-                //     ...
-                //   }
-                // The T in Box and the T in f are different, so internally the naming must reflect that.
-                GuardValue( inGeneric );
-                inGeneric = ! params.empty();
-                for ( TypeDecl * td : params ) {
-                        td->name = "__" + td->name + "_generic_";
-                }
-        }
-
-        void LinkReferenceToTypes::previsit( StructDecl * structDecl ) {
-                renameGenericParams( structDecl->parameters );
-        }
-
-        void LinkReferenceToTypes::previsit( UnionDecl * unionDecl ) {
-                renameGenericParams( unionDecl->parameters );
-        }
-
         void LinkReferenceToTypes::postvisit( StructDecl *structDecl ) {
                 // visit struct members first so that the types of self-referencing members are updated properly
@@ -621 +588 @@
 
         void LinkReferenceToTypes::postvisit( TypeInstType *typeInst ) {
-                // ensure generic parameter instances are renamed like the base type
-                if ( inGeneric && typeInst->baseType ) typeInst->name = typeInst->baseType->name;
                 if ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {