Changeset 839ccbb for src/GenPoly/InstantiateGeneric.cc

Timestamp:

Nov 20, 2015, 4:19:13 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

5189888

Parents:

05587c2 (diff), ed94eac (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.

git-author:

Peter A. Buhr <pabuhr@…> (11/20/15 12:51:58)

git-committer:

Peter A. Buhr <pabuhr@…> (11/20/15 16:19:13)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/GenPoly/InstantiateGeneric.cc

@@ -219 +219 @@
                 StructDecl *concDecl = instantiations.lookup( inst );
                 if ( ! concDecl ) {
+                        assert( inst->get_baseParameters() && "Base struct has parameters" );
                         // set concDecl to new type, insert type declaration into statements to add
                         concDecl = new StructDecl( typeNamer.newName( inst->get_name() ) );
                         substituteMembers( inst->get_baseStruct()->get_members(),
-                                                                inst->get_baseParameters(), inst->get_parameters(),
+                                                                *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
                         addDeclaration( concDecl );
@@ -246 +247 @@
                 if ( ! concDecl ) {
                         // set concDecl to new type, insert type declaration into statements to add
+                        assert( inst->get_baseParameters() && "Base union has parameters" );
                         concDecl = new UnionDecl( typeNamer.newName( inst->get_name() ) );
                         substituteMembers( inst->get_baseUnion()->get_members(),
-                                                                inst->get_baseParameters(), inst->get_parameters(),
+                                                                *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
                         addDeclaration( concDecl );