Changeset f18a711

Timestamp:

Aug 10, 2016, 2:29:40 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

3078643

Parents:

ce76eb9

Message:

Fix bug in replacing dtype-only generics with stripped versions

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• InstantiateGeneric.cc (modified) (6 diffs)

src/GenPoly/Box.cc

@@ -2054 +2054 @@
 
                         DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
-                        ScrubTyVars::scrubDynamic( decl, scopeTyVars );
+                        ScrubTyVars::scrub( decl, scopeTyVars );
 
                         scopeTyVars.endScope();

src/GenPoly/InstantiateGeneric.cc

@@ -173 +173 @@
                 void insert( UnionInstType *inst, const std::list< TypeExpr* > &typeSubs, UnionDecl *decl ) { instantiations.insert( inst->get_baseUnion(), typeSubs, decl ); }
 
-                /// If this is an instance of a type already determined to be dtype-static, strips the instances's type parameters and returns true
-                bool stripInstParams( AggregateDecl *base, ReferenceToType *inst );
-        
                 /// Strips a dtype-static aggregate decl of its type parameters, marks it as stripped
                 void stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs );
@@ -240 +237 @@
         }
 
-        bool GenericInstantiator::stripInstParams( AggregateDecl *base, ReferenceToType *inst ) {
-                if ( dtypeStatics.find( base ) == dtypeStatics.end() ) return false;
-
+        /// Strips the instances's type parameters
+        void stripInstParams( ReferenceToType *inst ) {
                 deleteAll( inst->get_parameters() );
                 inst->get_parameters().clear();
-
-                return true;
         }
         
@@ -268 +262 @@
 
                 // check for an already-instantiatiated dtype-static type
-                if ( stripInstParams( inst->get_baseStruct(), inst ) ) return inst;
+                if ( dtypeStatics.find( inst->get_baseStruct() ) != dtypeStatics.end() ) {
+                        stripInstParams( inst );
+                        return inst;
+                }
                 
                 // check if type can be concretely instantiated; put substitutions into typeSubs
@@ -277 +274 @@
                 case genericType::dtypeStatic:
                         stripDtypeParams( inst->get_baseStruct(), *inst->get_baseParameters(), typeSubs );
+                        stripInstParams( inst );
                         break;
                 
@@ -316 +314 @@
 
                 // check for an already-instantiatiated dtype-static type
-                if ( stripInstParams( inst->get_baseUnion(), inst ) ) return inst;
+                if ( dtypeStatics.find( inst->get_baseUnion() ) != dtypeStatics.end() ) {
+                        stripInstParams( inst );
+                        return inst;
+                }
 
                 // check if type can be concretely instantiated; put substitutions into typeSubs
@@ -325 +326 @@
                 case genericType::dtypeStatic:
                         stripDtypeParams( inst->get_baseUnion(), *inst->get_baseParameters(), typeSubs );
+                        stripInstParams( inst );
                         break;