Changeset c76bd34 for src/GenPoly/InstantiateGeneric.cc

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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 into master

File:

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

src/GenPoly/InstantiateGeneric.cc

@@ -172 +172 @@
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
                 /// Set of types which are dtype-only generic (and therefore have static layout)
-                ScopedSet< AggregateDecl* > dtypeStatics;
+                std::set<AggregateDecl *> dtypeStatics;
                 /// Namer for concrete types
                 UniqueName typeNamer;
@@ -505 +505 @@
         void GenericInstantiator::beginScope() {
                 instantiations.beginScope();
-                dtypeStatics.beginScope();
         }
 
         void GenericInstantiator::endScope() {
                 instantiations.endScope();
-                dtypeStatics.endScope();
         }