Changeset b13fc10 for src/GenPoly/InstantiateGeneric.cc

Timestamp:

May 3, 2017, 3:15:09 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

9643b31

Parents:

1ed841f (diff), dba6db9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/GenPoly/InstantiateGeneric.cc

@@ -233 +233 @@
                                 } else {
                                         // normalize possibly dtype-static parameter type
-                                        out.push_back( new TypeExpr{ 
+                                        out.push_back( new TypeExpr{
                                                 ScrubTyVars::scrubAll( paramType->get_type()->clone() ) } );
                                         gt |= genericType::concrete;
@@ -369 +369 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -423 +424 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
+                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );