Changes in src/GenPoly/InstantiateGeneric.cc [1c1395d:02fdb8e]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (6 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu Aug 04 18:33:00 2016
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 16 10:17:00 2020
-// Update Count     : 2
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Thu Aug 04 18:33:00 2016
+// Update Count     : 1
 //
 #include "InstantiateGeneric.h"
@@ -172 +172 @@
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
                 /// Set of types which are dtype-only generic (and therefore have static layout)
-                std::set<AggregateDecl *> dtypeStatics;
+                ScopedSet< AggregateDecl* > dtypeStatics;
                 /// Namer for concrete types
                 UniqueName typeNamer;
@@ -297 +297 @@
         }
 
-        template< typename AggrInst >
-        static AggrInst * asForward( AggrInst * decl ) {
-                if ( !decl->body ) {
-                        return nullptr;
-                }
-                decl = decl->clone();
-                decl->body = false;
-                deleteAll( decl->members );
-                decl->members.clear();
-                return decl;
-        }
-
         void GenericInstantiator::stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) {
                 substituteMembers( base->get_members(), baseParams, typeSubs );
@@ -385 +373 @@
                                 concDecl->set_body( inst->get_baseStruct()->has_body() );
                                 substituteMembers( inst->get_baseStruct()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                // Forward declare before recursion. (TODO: Only when needed, #199.)
-                                insert( inst, typeSubs, concDecl );
-                                if ( StructDecl *forwardDecl = asForward( concDecl ) ) {
-                                        declsToAddBefore.push_back( forwardDecl );
-                                }
+                                insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *visitor ); // recursively instantiate members
                                 declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
@@ -439 +423 @@
                                 concDecl->set_body( inst->get_baseUnion()->has_body() );
                                 substituteMembers( inst->get_baseUnion()->get_members(), *inst->get_baseParameters(), typeSubs, concDecl->get_members() );
-                                // Forward declare before recursion. (TODO: Only when needed, #199.)
-                                insert( inst, typeSubs, concDecl );
-                                if ( UnionDecl *forwardDecl = asForward( concDecl ) ) {
-                                        declsToAddBefore.push_back( forwardDecl );
-                                }
+                                insert( inst, typeSubs, concDecl ); // must insert before recursion
                                 concDecl->acceptMutator( *visitor ); // recursively instantiate members
                                 declsToAddBefore.push_back( concDecl ); // must occur before declaration is added so that member instantiations appear first
@@ -505 +485 @@
         void GenericInstantiator::beginScope() {
                 instantiations.beginScope();
+                dtypeStatics.beginScope();
         }
 
         void GenericInstantiator::endScope() {
                 instantiations.endScope();
+                dtypeStatics.endScope();
         }