Changeset b03eed6 for src/Parser/DeclarationNode.cc

Timestamp:

Apr 19, 2018, 5:54:41 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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, with_gc

Children:

8633f060

Parents:

e16294d (diff), da9d79b (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/Parser/DeclarationNode.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -924 +924 @@
                                 delete newType->aggInst.aggregate->enumeration.constants;
                                 newType->aggInst.aggregate->enumeration.constants = nullptr;
+                                newType->aggInst.aggregate->enumeration.body = false;
                         } else {
                                 assert( newType->aggInst.aggregate->kind == TypeData::Aggregate );
                                 delete newType->aggInst.aggregate->aggregate.fields;
                                 newType->aggInst.aggregate->aggregate.fields = nullptr;
+                                newType->aggInst.aggregate->aggregate.body = false;
                         } // if
                         // don't hoist twice